Commit Graph

46 Commits

Author SHA1 Message Date
Richard Alam
4cb7faaa49 - update localization 2014-08-24 11:02:00 -07:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio
Most of the client implementation is going to be rewritten on next commits.
2014-04-23 16:13:40 -03:00
Richard Alam
ac111de364 Merge remote branch 'bbb/v0.81-javau51-update' into merge-java-7u51-branch 2014-02-19 20:09:56 +00:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
Richard Alam
1430eff18d - update locales to show java7u51 2014-02-06 16:53:26 -05:00
Felipe Cecagno
3070127a8e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
2014-01-15 17:53:10 -02:00
Tiago Daniel Jacobs
0679568656 Fixed copyright string in pt_BR 2014-01-14 23:51:44 -02:00
Felipe Cecagno
3440ed0fe3 Merge branch 'v0.81' into record-button
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2014-01-14 14:05:41 -02:00
Tiago Daniel Jacobs
8c912df459 Implemented lock settings in bbb-client and bbb-apps. 2014-01-09 03:52:03 -02:00
Gustavo
9e61cc334a update locales 2013-10-30 20:53:29 +00:00
Gustavo
805f93ec54 update locales and add welsh 2013-10-09 20:18:43 +00:00
Felipe Cecagno
aa597fe985 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	record-and-playback/core/lib/recordandplayback.rb
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/events.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
2013-09-24 15:03:44 -03:00
Felipe Cecagno
33d98bbff2 implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons 2013-09-23 18:33:30 -03:00
Gustavo
d8e1bce801 Update locales 2013-09-23 20:46:29 +00:00
Felipe Cecagno
81e3d93bb7 Merge branch 'master' into global-audio-0.81
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/kk_KZ/bbbResources.properties
	bigbluebutton-client/locale/km_KH/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
2013-08-21 15:59:33 -03:00
jent46
65cdcc4789 locales updated 2013-08-14 12:45:18 -07:00
Hugo Lazzari
ee31721d40 Add new locale resources to pt-br and en-us 2013-07-09 09:57:25 -03:00
Hugo Lazzari
46522fc943 Begin the global-audio with bbb 0.81 2013-07-08 10:55:53 -03:00
Markos Calderon
5ed910cde5 Updating localization files 2013-07-04 12:18:57 -05:00
Markos Calderon
d9d044f227 update localization files 2013-06-04 14:11:30 -05:00
Markos Calderon
34616c04d8 Merge branch 'layout-module' of https://github.com/mconf/bigbluebutton into mconf-layout-module
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
2013-03-08 17:04:02 -05:00
Felipe Cecagno
2b73621596 changed the window title from Listeners to Speakers (since those participants are speakers now) 2013-02-01 13:17:00 -02:00
Hugo Lazzari
2c6caa0601 translated specific strings to pt_BR 2013-01-07 10:05:48 -02:00
Felipe Cecagno
166673e196 translated specific strings to pt_BR 2013-01-04 17:11:35 -02:00
jtrobinson
50a2e83153 Fixed permission issue 2012-08-22 16:23:18 +00:00
Richard Alam
17bba97d40 - add catalan locale
- update version to 0.8
2012-06-18 12:56:30 +00:00
Richard Alam
4f0b930553 - update locales 2012-05-28 19:37:12 +00:00
Richard Alam
93349e84e6 - update locale version to 0.8-beta4 and (c) to 2012 2012-03-01 19:00:50 +00:00
Richard Alam
34a57089a4 update locale strings to latest from mygengo 2011-12-20 15:49:45 +00:00
Richard Alam
cf8efce46e - updating locales files from mygengo 2011-11-09 11:04:08 -05:00
Localization Server
07e6d4570e Updating locale 2011-10-17 00:20:01 +00:00
Localization Server
31993cc824 Updating locale 2011-10-17 00:00:02 +00:00
Localization Server
f3f95bc9ef Updating locale 2011-10-16 23:40:02 +00:00
Richard Alam
f524cfda17 - change locale version 0.8-beta2 2011-10-02 13:53:24 -07:00
Localization Server
47e33e1bd9 Updating locale 2011-09-19 18:00:22 +00:00
Localization Server
079e7d12f5 Updating locale 2011-09-12 17:00:03 +00:00
Localization Server
ca86fe1b77 Updating locale 2011-06-13 14:00:02 +00:00
Localization Server
74cfd9153f Updating locale 2011-05-25 14:37:34 +00:00
Marco Calderon
5a58b9ba11 - added indonesian and portuguese (brazil) locales 2011-03-06 07:35:59 +00:00
Richard Alam
ccce72a9b2 - upgrade checking of locales to 0.71 2010-11-03 13:49:11 -04:00
Jeremy Thomerson
a70047d4aa resources from djp 2010-07-14 09:13:57 -05:00
Richard Alam
36431188c0 - update locales 2010-06-25 13:21:04 -04:00
DJP
090ae1afd6 New pt_BR locale courtesy of Marcio Moraes
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4038 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-28 17:57:04 +00:00