Commit Graph

62 Commits

Author SHA1 Message Date
Felipe Cecagno
a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-config/web/default.pdf
2014-11-22 20:28:39 -02:00
Richard Alam
e4868682e0 - update locales 2014-10-29 22:20:11 +00:00
Felipe Cecagno
3db4ead6e4 Merge branch '090-listen-only-by-default' into mconf-live0.6.1
Conflicts:
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-10-15 00:22:27 -03:00
Richard Alam
da59fb35e4 - updating locales 2014-10-12 07:12:50 -07:00
Richard Alam
a3f594172f - update locales from transifex 2014-10-07 09:29:31 -07:00
Felipe Cecagno
59debc5d1e Merge branch '090-mconf-branding' into mconf-live0.6.1 2014-10-05 23:32:43 -03:00
Felipe Cecagno
015d708d7c Merge branch 'mconf-branding-0.81' into 090-mconf-branding
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"

Conflicts:
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/BigBlueButton.mxml
	record-and-playback/presentation/playback/presentation/playback.html
2014-10-05 19:36:43 -03:00
Richard Alam
6ca675fd83 - update locales 2014-09-11 12:16:08 -07:00
Richard Alam
0d3e23db21 - update locales 2014-09-02 12:01:20 -07:00
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
Richard Alam
1430eff18d - update locales to show java7u51 2014-02-06 16:53:26 -05:00
Gustavo
9e61cc334a update locales 2013-10-30 20:53:29 +00:00
Gustavo Salazar
d673e6e484 update locales 2013-10-02 12:12:40 -07:00
Gustavo
d8e1bce801 Update locales 2013-09-23 20:46:29 +00:00
jent46
8561c02d18 update locales 2013-09-02 10:44:52 -07:00
jent46}
6d8d8962e5 update languages (fr_FR,he_IL,id_ID,vi_VN) 2013-08-20 16:34:42 -05:00
jent46
65cdcc4789 locales updated 2013-08-14 12:45:18 -07: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
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
01a7a4be94 - updating locales 2012-04-16 14:39:04 +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
49b59cc189 - update with new locales 2012-03-01 18:32:27 +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
ec0e781802 Updating locale 2011-08-24 14:00:02 +00:00
Localization Server
738dc0016b Updating locale 2011-08-24 12:20:01 +00:00
Localization Server
76d315e5af Updating locale 2011-07-26 14:20:01 +00:00
Localization Server
b357dc56cb Updating locale 2011-07-26 10:00:03 +00:00
Localization Server
430cb4cdc2 Updating locale 2011-07-26 08:20:02 +00:00
Localization Server
8b890735ba Updating locale 2011-07-25 15:20:02 +00:00
Localization Server
f74febcd35 Updating locale 2011-07-13 10:20:02 +00:00
Localization Server
f59b9115d2 Updating locale 2011-07-13 09:20:02 +00:00
Localization Server
74cfd9153f Updating locale 2011-05-25 14:37:34 +00:00
Richard Alam
2cf40cb77a - add back deleted locale key and translations 2010-11-04 19:07:21 -04:00
Richard Alam
ccce72a9b2 - upgrade checking of locales to 0.71 2010-11-03 13:49:11 -04:00
deniszgonjanin
e7bf2f4e06 Updated localizations for 0.71 2010-10-18 18:26:28 +00:00
deniszgonjanin
ec4370732d New Greek and French translations 2010-09-08 05:17:00 +00:00
Jeremy Thomerson
ff3339494e from DJP - updated french translation 2010-07-08 11:35:53 -05:00
Richard Alam
36431188c0 - update locales 2010-06-25 13:21:04 -04:00