BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a45bbfb29a
bigbluebutton-Github/bigbluebutton-client/locale
History
Felipe Cecagno a45bbfb29a Merge branch '090-multinotes' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
2014-12-02 20:04:23 -02:00
..
ar_SY Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
az_AZ - update locales 2014-10-29 22:20:11 +00:00
bg_BG Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
bn_BN Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
bn_IN - update locales 2014-10-29 22:20:11 +00:00
ca_ES - update locales 2014-10-29 22:20:11 +00:00
cs_CZ - update locales 2014-10-29 22:20:11 +00:00
cy_GB Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
da_DK - update locales 2014-10-29 22:20:11 +00:00
de_DE Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
el_GR - update locales 2014-10-29 22:20:11 +00:00
en_US Merge branch '090-multinotes' into mconf-live0.6.1 2014-12-02 20:04:23 -02:00
es_ES Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
es_LA - update localization 2014-08-24 11:02:00 -07:00
et_EE Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
eu_ES - update locales 2014-10-29 22:20:11 +00:00
eu_EU Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
fa_IR Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
ff_SN - update localization 2014-08-24 11:02:00 -07:00
fi_FI - update locales 2014-10-29 22:20:11 +00:00
fr_CA Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
fr_FR Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
he_IL - update locales 2014-10-29 22:20:11 +00:00
hr_HR - update locales 2014-10-29 22:20:11 +00:00
hu_HU Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
hy_AM Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
id_ID - update locales 2014-10-29 22:20:11 +00:00
it_IT Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
ja_JP - update locales 2014-10-29 22:20:11 +00:00
kk_KZ - update locales 2014-10-29 22:20:11 +00:00
km_KH - update locales 2014-10-29 22:20:11 +00:00
ko_KR - update locales 2014-10-29 22:20:11 +00:00
lt_LT - update locales 2014-10-29 22:20:11 +00:00
lv_LV - update locales 2014-10-29 22:20:11 +00:00
ml_IN - update locales 2014-10-29 22:20:11 +00:00
mn_MN - update locales 2014-10-29 22:20:11 +00:00
ms_MY Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
nb_NO Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
ne_NE Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
ne_NP - update locales 2014-10-29 22:20:11 +00:00
nl_NL - update locales 2014-10-29 22:20:11 +00:00
no_NO Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
pl_PL - update locales 2014-10-29 22:20:11 +00:00
pt_BR Merge branch '090-multinotes' into mconf-live0.6.1 2014-12-02 20:04:23 -02:00
pt_PT - update locales 2014-10-29 22:20:11 +00:00
ro_RO - update locales 2014-10-29 22:20:11 +00:00
ru_RU Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
si_LK - update locales 2014-10-29 22:20:11 +00:00
sk_SK - update locales 2014-10-29 22:20:11 +00:00
sl_SI - update locales 2014-10-29 22:20:11 +00:00
sl_SL Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
sr_RS - update locales 2014-10-29 22:20:11 +00:00
sr_SR Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
sv_SE - update locales 2014-10-29 22:20:11 +00:00
th_TH - update locales 2014-10-29 22:20:11 +00:00
tr_TR - update locales 2014-10-29 22:20:11 +00:00
uk_UA Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 2014-11-22 20:28:39 -02:00
vi_VN - update locales 2014-10-29 22:20:11 +00:00
zh_CN - update locales 2014-10-29 22:20:11 +00:00
zh_TW - update locales 2014-10-29 22:20:11 +00:00