bigbluebutton-Github/bigbluebutton-client/locale
Richard Alam 5742f2764a Merge remote branch 'ajay/bbb-whiteboard-additions' into merge-whiteboard-features
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/IWhiteboardRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Page.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/ShapeGraphic.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text_icon.png
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardCanvasEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2012-07-16 18:08:21 +00: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 - add catalan locale 2012-06-18 12:56:30 +00:00
el_GR - add catalan locale 2012-06-18 12:56:30 +00:00
en_US Merge remote branch 'ajay/bbb-whiteboard-additions' into merge-whiteboard-features 2012-07-16 18:08:21 +00:00
es_ES - add catalan locale 2012-06-18 12:56:30 +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 - add catalan locale 2012-06-18 12:56:30 +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 Updating locale 2011-11-01 22:40:01 +00:00
ne_NE - add catalan locale 2012-06-18 12:56:30 +00:00
nl_NL - add catalan locale 2012-06-18 12:56:30 +00:00
no_NO - add catalan locale 2012-06-18 12:56:30 +00:00
pl_PL - add catalan locale 2012-06-18 12:56:30 +00:00
pt_BR - add catalan locale 2012-06-18 12:56:30 +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 - add catalan locale 2012-06-18 12:56:30 +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