bigbluebutton-Github/bigbluebutton-html5/private/locales
prlanzarin f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
..
bg_BG.json add traslations from Trasifex 2017-10-11 12:06:33 -07:00
de.json Updated locales. 2017-10-20 15:17:52 +00:00
en.json Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 2017-11-11 03:41:37 +00:00
es_ES.json Updated locales. 2017-10-20 15:17:52 +00:00
fr.json add traslations from Trasifex 2017-10-11 12:06:33 -07:00
id.json add traslations from Trasifex 2017-10-11 12:06:33 -07:00
ja_JP.json add traslations from Trasifex 2017-10-11 12:06:33 -07:00
ja.json add traslations from Trasifex 2017-10-11 12:06:33 -07:00
km.json Updated the Khmer labels (doesn't break anymore). 2017-10-19 20:29:30 +00:00
lv.json add traslations from Trasifex 2017-10-11 12:06:33 -07:00
pt_BR.json Updated locales. 2017-10-20 15:17:52 +00:00
ru_RU.json Updated locales. 2017-10-20 15:17:52 +00:00
tr_TR.json add traslations from Trasifex 2017-10-11 12:06:33 -07:00
uk_UA.json add traslations from Trasifex 2017-10-11 12:06:33 -07:00