bigbluebutton-Github/bigbluebutton-client/locale
Chad Pilkey 0c6e5a0632 Merge remote branch 'origin/master' into poll-access
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/managers/UserManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	record-and-playback/presentation/playback/presentation/acornmediaplayer/acornmediaplayer.base.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/jquery.acornmediaplayer.js
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/acorn.access.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/barebones/acorn.barebones.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/acorn.darkglass.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-caption.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume.png
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
2012-10-29 16:03:09 -04:00
..
ar_SY - add catalan locale 2012-06-18 12:56:30 +00:00
az_AZ - add catalan locale 2012-06-18 12:56:30 +00:00
bg_BG - add catalan locale 2012-06-18 12:56:30 +00:00
bn_BN - add catalan locale 2012-06-18 12:56:30 +00:00
ca_ES - add catalan locale 2012-06-18 12:56:30 +00:00
cs_CZ - add catalan locale 2012-06-18 12:56:30 +00:00
da_DK - add catalan locale 2012-06-18 12:56:30 +00:00
de_DE Fixed permission issue 2012-08-22 16:23:18 +00:00
el_GR - add catalan locale 2012-06-18 12:56:30 +00:00
en_US Merge remote branch 'origin/master' into poll-access 2012-10-29 16:03:09 -04:00
es_ES Fixed permission issue 2012-08-22 16:23:18 +00:00
es_LA - add catalan locale 2012-06-18 12:56:30 +00:00
et_EE - update locale version to 0.8-beta4 and (c) to 2012 2012-03-01 19:00:50 +00:00
eu_EU - add catalan locale 2012-06-18 12:56:30 +00:00
fa_IR Fixed permission issue 2012-08-22 16:23:18 +00:00
fi_FI - add catalan locale 2012-06-18 12:56:30 +00:00
fr_CA - add catalan locale 2012-06-18 12:56:30 +00:00
fr_FR - add catalan locale 2012-06-18 12:56:30 +00:00
he_IL - add catalan locale 2012-06-18 12:56:30 +00:00
hr_HR - add catalan locale 2012-06-18 12:56:30 +00:00
hu_HU - add catalan locale 2012-06-18 12:56:30 +00:00
id_ID - add catalan locale 2012-06-18 12:56:30 +00:00
it_IT - add catalan locale 2012-06-18 12:56:30 +00:00
ja_JP - add catalan locale 2012-06-18 12:56:30 +00:00
kk_KZ - add catalan locale 2012-06-18 12:56:30 +00:00
km_KH - updating locales 2012-04-16 14:39:04 +00:00
ko_KR - add catalan locale 2012-06-18 12:56:30 +00:00
lt_LT - add catalan locale 2012-06-18 12:56:30 +00:00
lv_LV - add catalan locale 2012-06-18 12:56:30 +00:00
mn_MN - add catalan locale 2012-06-18 12:56:30 +00:00
nb_NO Fixed permission issue 2012-08-22 16:23:18 +00:00
ne_NE Update bigbluebutton-client/locale/ne_NE/bbbResources.properties 2012-07-23 04:24:58 -07:00
nl_NL - add catalan locale 2012-06-18 12:56:30 +00:00
no_NO Fixed permission issue 2012-08-22 16:23:18 +00:00
pl_PL - add catalan locale 2012-06-18 12:56:30 +00:00
pt_BR Fixed permission issue 2012-08-22 16:23:18 +00:00
pt_PT - add catalan locale 2012-06-18 12:56:30 +00:00
ro_RO - add catalan locale 2012-06-18 12:56:30 +00:00
ru_RU Fixed permission issue 2012-08-22 16:23:18 +00:00
si_LK - add catalan locale 2012-06-18 12:56:30 +00:00
sk_SK - add catalan locale 2012-06-18 12:56:30 +00:00
sl_SL - add catalan locale 2012-06-18 12:56:30 +00:00
sr_RS - add catalan locale 2012-06-18 12:56:30 +00:00
sr_SR - add catalan locale 2012-06-18 12:56:30 +00:00
sv_SE - add catalan locale 2012-06-18 12:56:30 +00:00
th_TH - add catalan locale 2012-06-18 12:56:30 +00:00
tr_TR - add catalan locale 2012-06-18 12:56:30 +00:00
uk_UA - add catalan locale 2012-06-18 12:56:30 +00:00
vi_VN - add catalan locale 2012-06-18 12:56:30 +00:00
zh_CN - add catalan locale 2012-06-18 12:56:30 +00:00
zh_TW - add catalan locale 2012-06-18 12:56:30 +00:00