bigbluebutton-Github/bigbluebutton-client/locale
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
..
ar_SY Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
az_AZ - updating locales 2014-10-12 07:12:50 -07:00
bg_BG Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
bn_BN Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
bn_IN - updating locales 2014-10-12 07:12:50 -07:00
ca_ES - updating locales 2014-10-12 07:12:50 -07:00
cs_CZ - updating locales 2014-10-12 07:12:50 -07:00
cy_GB Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
da_DK - updating locales 2014-10-12 07:12:50 -07:00
de_DE Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
el_GR - updating locales 2014-10-12 07:12:50 -07:00
en_US Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
es_ES Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
es_LA - update localization 2014-08-24 11:02:00 -07:00
et_EE Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
eu_ES - updating locales 2014-10-12 07:12:50 -07:00
eu_EU Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
fa_IR Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
ff_SN - update localization 2014-08-24 11:02:00 -07:00
fi_FI - updating locales 2014-10-12 07:12:50 -07:00
fr_CA Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
fr_FR Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
he_IL - updating locales 2014-10-12 07:12:50 -07:00
hr_HR - updating locales 2014-10-12 07:12:50 -07:00
hu_HU Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
hy_AM Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
id_ID - updating locales 2014-10-12 07:12:50 -07:00
it_IT Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
ja_JP - updating locales 2014-10-12 07:12:50 -07:00
kk_KZ - updating locales 2014-10-12 07:12:50 -07:00
km_KH - updating locales 2014-10-12 07:12:50 -07:00
ko_KR - updating locales 2014-10-12 07:12:50 -07:00
lt_LT - updating locales 2014-10-12 07:12:50 -07:00
lv_LV - updating locales 2014-10-12 07:12:50 -07:00
ml_IN - updating locales 2014-10-12 07:12:50 -07:00
mn_MN - updating locales 2014-10-12 07:12:50 -07:00
ms_MY Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03: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 - updating locales 2014-10-12 07:12:50 -07:00
nl_NL - updating locales 2014-10-12 07:12:50 -07:00
no_NO Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
pl_PL - updating locales 2014-10-12 07:12:50 -07:00
pt_BR Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
pt_PT - updating locales 2014-10-12 07:12:50 -07:00
ro_RO - updating locales 2014-10-12 07:12:50 -07:00
ru_RU Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
si_LK - updating locales 2014-10-12 07:12:50 -07:00
sk_SK - updating locales 2014-10-12 07:12:50 -07:00
sl_SI - updating locales 2014-10-12 07:12:50 -07:00
sl_SL Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
sr_RS - updating locales 2014-10-12 07:12:50 -07:00
sr_SR Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
sv_SE - updating locales 2014-10-12 07:12:50 -07:00
th_TH - updating locales 2014-10-12 07:12:50 -07:00
tr_TR - updating locales 2014-10-12 07:12:50 -07:00
uk_UA Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-15 00:22:27 -03:00
vi_VN - updating locales 2014-10-12 07:12:50 -07:00
zh_CN - updating locales 2014-10-12 07:12:50 -07:00
zh_TW - updating locales 2014-10-12 07:12:50 -07:00