You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/09/02 06:01:05 UTC

[1/3] openmeetings git commit: [OPENMEETINGS-1644] refresh and A/V switch seems to work

Repository: openmeetings
Updated Branches:
  refs/heads/master 62413cec6 -> d74a46a35


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
index 36fbe79..2368f4c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
@@ -51,6 +51,8 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.CallbackParameter;
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
 import org.apache.wicket.extensions.ajax.AjaxDownload;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
@@ -58,6 +60,7 @@ import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.resource.FileSystemResource;
 
 import com.googlecode.wicket.jquery.core.JQueryBehavior;
@@ -235,6 +238,12 @@ public abstract class FileTreePanel extends Panel {
 		setReadOnly(false, null);
 	}
 
+	@Override
+	public void renderHead(IHeaderResponse response) {
+		super.renderHead(response);
+		response.render(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(FileTreePanel.class, "filetree.js")));
+	}
+
 	protected String getContainment() {
 		return ".file.item.drop.area";
 	}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
new file mode 100644
index 0000000..b152b07
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+function dragHelper() {
+	var s = $(this);
+	if (s.parents('a').hasClass('ui-state-active')) {
+		s = $('.ui-state-active .ui-draggable.ui-draggable-handle');
+	}
+	var c = $('<div/>').attr('id', 'draggingContainer').width(80).height(36);
+	var h = $('<div class="ui-corner-all ui-widget-header"/>').append(s.clone()).width(s.width());
+	return c.append(h);
+}
+function treeRevert(dropped) {
+	$('.file.tree .trees')[0].scrollTop = $(this).parent()[0].offsetTop - 32;
+	return !dropped || (!!dropped && !!dropped.context && $(dropped.context).hasClass('wb', 'room'));
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
index cee3c62..1a80b8a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
@@ -32,7 +32,7 @@
 			</tr>
 			<tr>
 				<td><input wicket:id="firstName" type="text" wicket:message="placeholder:117" value="" /></td>
-				<td><input wicket:id="lastName" type="text" wicket:message="placeholder:149" value="" /></td>
+				<td><input wicket:id="lastName" type="text" wicket:message="placeholder:136" value="" /></td>
 			</tr>
 			<tr>
 				<td><input wicket:id="password" type="password" wicket:message="placeholder:110" value="" /></td>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index 6351d8e..bc0eedc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -228,7 +228,7 @@ public class RegisterDialog extends NonClosableDialog<String> {
 			super.onInitialize();
 			ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
 			firstNameField.setLabel(Model.of(getString("117")));
-			lastNameField.setLabel(Model.of(getString("149")));
+			lastNameField.setLabel(Model.of(getString("136")));
 			loginField.add(minimumLength(getMinLoginLength(cfgDao))).setLabel(Model.of(getString("114")));
 			passwordField.setResetPassword(true).add(minimumLength(getMinPasswdLength(cfgDao))).setLabel(Model.of(getString("110")));
 			confirmPassword.setLabel(Model.of(getString("116")));

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index 740a63c..9584713 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -51,8 +51,8 @@
 			</div>
 		</div>
 		<div id="video-refresh-btn">
-			<a class="ui-dialog-titlebar-refresh ui-corner-all ui-state-default" href="#" wicket:message="title:refresh.label" role="button">
-				<span class="ui-icon ui-icon-refresh"><wicket:message key="refresh.label"/></span>
+			<a class="ui-dialog-titlebar-refresh ui-corner-all ui-state-default" href="#" wicket:message="title:lbl.refresh" role="button">
+				<span class="ui-icon ui-icon-refresh"><wicket:message key="lbl.refresh"/></span>
 			</a>
 		</div>
 		<div id="video-volume-btn">

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 83406d2..0b05105 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -133,9 +133,11 @@ public class RoomPanel extends BasePanel {
 					, getUserId(), "0", r.getId()
 					, cp.getRemoteAddress()
 					, "" + r.getId());
-			JSONObject options = VideoSettings.getInitJson(cp, r.getId(), getClient().getSid());
-			options.put("interview", isInterview);
-			options.put("showMicStatus", !r.getHiddenElements().contains(RoomElement.MicrophoneStatus));
+			Client _c = getClient();
+			JSONObject options = VideoSettings.getInitJson(cp, r.getId(), _c.getSid())
+					.put("uid", _c.getUid())
+					.put("interview", isInterview)
+					.put("showMicStatus", !r.getHiddenElements().contains(RoomElement.MicrophoneStatus));
 			target.appendJavaScript(String.format("VideoManager.init(%s);", options));
 			WebSocketHelper.sendRoom(new RoomMessage(r.getId(), getUserId(), RoomMessage.Type.roomEnter));
 			// play video from other participants
@@ -587,7 +589,7 @@ public class RoomPanel extends BasePanel {
 							return;
 						}
 						if (!getClient().getUid().equals(c.getUid())) {
-							handler.appendJavaScript(String.format("if (VideoManager !== undefined) {VideoManager.micActivity('%s', %s);}", c.getUid(), obj.getBoolean("active")));
+							handler.appendJavaScript(String.format("if (typeof VideoManager !== 'undefined') {VideoManager.micActivity('%s', %s);}", c.getUid(), obj.getBoolean("active")));
 						}
 					}
 						break;

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index 0dbb7e6..f2a0c6b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -73,7 +73,7 @@
 			</div>
 			<div class="vid-block">
 				<div class="video-conainer"></div>
-				<div class="level-meter"></div>
+				<div class="level-meter" wicket:message="title:767"></div>
 				<div class="sett-row right">
 					<div><button class="play"><wicket:message key="764"/></button></div>
 				</div>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index e524193..54a3bca 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -142,6 +142,11 @@ var Video = (function() {
 	function _getName() {
 		return c.user.firstName + ' ' + c.user.lastName;
 	}
+	function _resizeDlg(_w, _h) {
+		let h = _h + t.height() + 2 + (f.is(":visible") ? f.height() : 0);
+		v.dialog("option", "width", _w).dialog("option", "height", h);
+		_resize(_w, _h);
+	}
 	function _securityMode(on) {
 		if (on) {
 			//TODO buttons
@@ -149,14 +154,11 @@ var Video = (function() {
 				position: {my: "center", at: "center", of: WBA_SEL}
 			});
 		} else {
-			let h = size.height + t.height() + 2 + (f.is(":visible") ? f.height() : 0);
-			v.dialog("option", "width", size.width)
-				.dialog("option", "height", h);
+			_resizeDlg(size.width, size.height);
 			v.dialog("widget").css(VideoUtil.getPos(VideoUtil.getRects(VID_SEL, VideoUtil.getVid(c.uid)), c.width, h));
-			_setSize(size.width, size.height);
 		}
 	}
-	function _setSize(w, h) {
+	function _resize(w, h) {
 		vc.width(w).height(h);
 		swf.attr('width', w).attr('height', h);
 	}
@@ -197,7 +199,8 @@ var Video = (function() {
 			, opts = VideoManager.getOptions();
 		{ //scope
 			let cont = opts.interview ? $('.pod.pod-' + c.pod) : $('.room.box');
-			cont.append($('#user-video').clone().attr('id', _id).attr('title', name).data(self));
+			cont.append($('#user-video').clone().attr('id', _id).attr('title', name)
+					.attr('data-client-uid', c.type + c.cuid).data(self));
 		}
 		v = $('#' + _id);
 		v.dialog({
@@ -216,7 +219,7 @@ var Video = (function() {
 			, resizeStop: function(event, ui) {
 				var w = ui.size.width - 2
 					, h = ui.size.height - t.height() - 4 - (f.is(":visible") ? f.height() : 0);
-				_setSize(w, h);
+				_resize(w, h);
 				swf[0].vidResize(w, h);
 			}
 		}).dialogExtend({
@@ -261,9 +264,7 @@ var Video = (function() {
 			let refresh = v.parent().find('.ui-dialog-titlebar-refresh')
 				.click(function(e) {
 					e.stopImmediatePropagation();
-					if (swf[0].refresh !== undefined) {
-						swf[0].refresh();
-					}
+					_refresh();
 				}).dblclick(function(e) {
 					e.stopImmediatePropagation();
 				});
@@ -329,8 +330,18 @@ var Video = (function() {
 			swf[0].update();
 		}
 	}
+	function _refresh(_opts) {
+		if (swf[0].refresh !== undefined) {
+			let opts = _opts || {};
+			if (!isNaN(opts.width)) {
+				_resizeDlg(opts.width, opts.height);
+			}
+			swf[0].refresh(opts);
+		}
+	}
 
 	self.update = _update;
+	self.refresh = _refresh;
 	self.init = _init;
 	self.securityMode = _securityMode;
 	self.client = function() { return c; };
@@ -385,13 +396,13 @@ var VideoManager = (function() {
 			share.tooltip().off('click').click(function() {
 				var v = $('#' + VideoUtil.getVid(c.uid))
 				if (v.length != 1) {
-					Video().init(options.uid, c, $(WBA_SEL).offset());
+					Video().init(c, $(WBA_SEL).offset());
 				} else {
 					v.dialog('open');
 				}
 			});
 		} else if ('sharing' !== c.type) {
-			Video().init(options.uid, c, VideoUtil.getPos(VideoUtil.getRects(VID_SEL), c.width, c.height + 25));
+			Video().init(c, VideoUtil.getPos(VideoUtil.getRects(VID_SEL), c.width, c.height + 25));
 		}
 	}
 	function _close(uid) {
@@ -413,12 +424,24 @@ var VideoManager = (function() {
 			});
 		});
 	}
+	function _find(uid) {
+		return $('.video.user-video div[data-client-uid="room' + uid + '"]');
+	}
 	function _micActivity(uid, active) {
 		var u = $('#user' + uid + ' .audio-activity.ui-icon');
+		var v = _find(uid).parent();
 		if (active) {
 			u.addClass("speaking");
+			v.addClass('user-speaks')
 		} else {
 			u.removeClass("speaking");
+			v.removeClass('user-speaks')
+		}
+	}
+	function _refresh(uid, opts) {
+		var v = _find(uid);
+		if (v.length > 0) {
+			v.data().refresh(opts);
 		}
 	}
 
@@ -429,6 +452,7 @@ var VideoManager = (function() {
 	self.close = _close;
 	self.securityMode = function(uid, on) { $('#' + VideoUtil.getVid(uid)).data().securityMode(on); };
 	self.micActivity = _micActivity;
+	self.refresh = _refresh;
 	return self;
 })();
 function setRoomSizes() {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
index bd54b69..8977ab9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js
@@ -29,8 +29,8 @@ function initVideo(el, id, options) {
 	return o;
 }
 var VideoSettings = (function() {
-	var self = {}, vs, lm, swf, s, cam, mic, res,
-		vidScroll, recBtn, playBtn, inited = false, recAllowed = false;
+	var self = {}, vs, lm, swf, s, cam, mic, res, o
+		, vidScroll, recBtn, playBtn, inited = false, recAllowed = false;
 	function _load() {
 		s = {};
 		try {
@@ -46,8 +46,12 @@ var VideoSettings = (function() {
 		if (typeof avSettings === 'function') {
 			avSettings(_s);
 		}
+		if (typeof VideoManager !== 'undefined' && o.uid) {
+			VideoManager.refresh(o.uid, s.video);
+		}
 	}
 	function _init(options) {
+		o = options;
 		vs = $('#video-settings');
 		lm = vs.find('.level-meter');
 		cam = vs.find('select.cam');
@@ -87,14 +91,14 @@ var VideoSettings = (function() {
 			]
 		});
 		lm.progressbar({ value: 0 });
-		options.width = 300;
-		options.height = 200;
-		options.mode = 'settings';
-		swf = initVideo(vidScroll, 'video-settings-swf', options)[0];
+		o.width = 300;
+		o.height = 200;
+		o.mode = 'settings';
+		swf = initVideo(vidScroll, 'video-settings-swf', o)[0];
 		vs.find('input, button').prop('disabled', true);
 		vs.find('button').button();
 		var rr = vs.find('.cam-resolution').parent('.sett-row');
-		if (!!options.interview) {
+		if (!!o.interview) {
 			rr.show();
 		} else {
 			rr.hide();

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
index 457e938..f6cd764 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
@@ -32,7 +32,7 @@ public class RefreshIcon extends ClientIcon {
 
 	@Override
 	protected String getTitle() {
-		return getString("610");
+		return getString("lbl.refresh");
 	}
 
 	@Override
@@ -48,7 +48,7 @@ public class RefreshIcon extends ClientIcon {
 
 	@Override
 	protected String getScript() {
-		return String.format("document.getElementById('lzapp').refreshAv('%s');", uid);
+		return String.format("VideoManager.refresh('%s');", uid);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
index 10ce471..7c78ac7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.html
@@ -19,71 +19,6 @@
 
 -->
 <html xmlns:wicket="http://wicket.apache.org">
-<wicket:head>
-	<script type="text/javascript">
-		var MAX_ITEM_COUNT = 5;
-		function getRssItems(url, next) {
-			//TODO items need to be merged and sorted by date
-			$.ajax({
-				url: url
-				, type: 'GET'
-				, crossDomain: true
-				, dataType: 'xml'
-				, success: function(data, status, xhr) {
-					var $xml = $(data);
-					var counter = MAX_ITEM_COUNT;
-					$xml.find("item").each(function() {
-						var $this = $(this), item = {
-							title : $this.find("title").text(),
-							link : $this.find("link").text(),
-							description : $this.find("description").text(),
-							pubDate : $this.find("pubDate").text(),
-							author : $this.find("author").text()
-						}
-						addItem(item);
-						if (--counter < 0) {
-							return false;
-						}
-					});
-					counter = MAX_ITEM_COUNT;
-					$xml.find("entry").each(function() {
-						var $this = $(this), item = {
-							title : $this.find("title").text(),
-							link : $this.find("link").text(),
-							description : $this.find("content"),
-							pubDate : $this.find("published").text(),
-							author : $this.find("author").text()
-						}
-						addItem(item);
-						if (--counter < 0) {
-							return false;
-						}
-					});
-					if (next) {
-						getRssItems(next, null)
-					} else {
-						$('#feeds').accordion({
-							collapsible: true
-							, active: false
-							, header: 'h3'
-							, heightStyle: "content"
-							});
-					}
-				}
-			});
-		}
-		function addItem(item) {
-			//TODO need to be checked
-			$('#feeds').append('<h3>' + item.title + '</h3>')
-				.append($('<div></div>').append(item.description));
-		}
-		function loadRssTab(url1, url2) {
-			$('#feedcontainer').html('');
-			$('#feedcontainer').append('<div id="feeds"></div>');
-			getRssItems(url1, url2);
-		}
-	</script>
-</wicket:head>
 <wicket:panel>
 	<div id="feedcontainer"></div>
 </wicket:panel>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
index 3040e0f..dd0142e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
@@ -30,10 +30,12 @@ import java.net.HttpURLConnection;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.wicket.behavior.AbstractAjaxBehavior;
 import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
 import org.apache.wicket.request.resource.ContentDisposition;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.util.resource.AbstractResourceStream;
 import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
 import org.wicketstuff.dashboard.Widget;
@@ -41,8 +43,8 @@ import org.wicketstuff.dashboard.web.WidgetView;
 
 public class RssWidgetView extends WidgetView {
 	private static final long serialVersionUID = 1L;
-	private RSSFeedBehavior feed1; 
-	private RSSFeedBehavior feed2; 
+	private final RSSFeedBehavior feed1;
+	private final RSSFeedBehavior feed2;
 
 	public RssWidgetView(String id, Model<Widget> model) {
 		super(id, model);
@@ -50,14 +52,14 @@ public class RssWidgetView extends WidgetView {
 		add(feed1 = new RSSFeedBehavior(cfgDao.getConfValue(CONFIG_RSS_FEED1_KEY, String.class, "")));
 		add(feed2 = new RSSFeedBehavior(cfgDao.getConfValue(CONFIG_RSS_FEED2_KEY, String.class, "")));
 	}
-	
+
 	@Override
 	public void renderHead(IHeaderResponse response) {
 		super.renderHead(response);
-		response.render(OnDomReadyHeaderItem.forScript("loadRssTab('" + feed1.getCallbackUrl() + "',"
-				+ "'" + feed2.getCallbackUrl() + "');")) ;
+		response.render(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(RssWidgetView.class, "rss.js")));
+		response.render(OnDomReadyHeaderItem.forScript(String.format("loadRssTab('%s', '%s');", feed1.getCallbackUrl(), feed2.getCallbackUrl()))) ;
 	}
-	
+
 	static class RSSFeedBehavior extends AbstractAjaxBehavior {
 		private static final long serialVersionUID = 1L;
 		private String url;
@@ -65,18 +67,17 @@ public class RssWidgetView extends WidgetView {
 		RSSFeedBehavior(String url) {
 			this.url = url;
 		}
-		
+
 		@Override
 		public void onRequest() {
 			ResourceStreamRequestHandler handler = new ResourceStreamRequestHandler(new AbstractResourceStream() {
 				private static final long serialVersionUID = 1L;
 				transient HttpURLConnection con;
-				
+
 				@Override
 				public InputStream getInputStream() throws ResourceStreamNotFoundException {
 					try {
 						con = getFeedConnection(url);
-						con.connect();
 						return con.getInputStream();
 					} catch (IOException e) {
 						throw new ResourceStreamNotFoundException();
@@ -90,7 +91,7 @@ public class RssWidgetView extends WidgetView {
 					}
 				}
 			}, "feed");
-			handler.setContentDisposition(ContentDisposition.ATTACHMENT);
+			handler.setContentDisposition(ContentDisposition.INLINE);
 			getComponent().getRequestCycle().scheduleRequestHandlerAfterCurrent(handler);
 		}
 	}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js
new file mode 100644
index 0000000..805078a
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+var MAX_ITEM_COUNT = 5;
+function getRssItems(url, next) {
+	//TODO items need to be merged and sorted by date
+	$.ajax({
+		url: url
+		, type: 'GET'
+		, crossDomain: true
+		, dataType: 'xml'
+		, cache: false
+		, success: function(data, status, xhr) {
+			var $xml = $(data);
+			var counter = MAX_ITEM_COUNT;
+			$xml.find("item").each(function() {
+				var $this = $(this), item = {
+					title : $this.find("title").text(),
+					link : $this.find("link").text(),
+					description : $this.find("description").text(),
+					pubDate : $this.find("pubDate").text(),
+					author : $this.find("author").text()
+				}
+				addItem(item);
+				if (--counter < 0) {
+					return false;
+				}
+			});
+			counter = MAX_ITEM_COUNT;
+			$xml.find("entry").each(function() {
+				var $this = $(this), item = {
+					title : $this.find("title").text(),
+					link : $this.find("link").text(),
+					description : $this.find("content"),
+					pubDate : $this.find("published").text(),
+					author : $this.find("author").text()
+				}
+				addItem(item);
+				if (--counter < 0) {
+					return false;
+				}
+			});
+			if (next) {
+				getRssItems(next, null)
+			} else {
+				$('#feeds').accordion({
+					collapsible: true
+					, active: false
+					, header: 'h3'
+					, heightStyle: "content"
+					});
+			}
+		}
+	});
+}
+function addItem(item) {
+	//TODO need to be checked
+	$('#feeds').append('<h3>' + item.title + '</h3>')
+		.append($('<div></div>').append(item.description));
+}
+function loadRssTab(url1, url2) {
+	$('#feedcontainer').html('');
+	$('#feedcontainer').append('<div id="feeds"></div>');
+	getRssItems(url1, url2);
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/webapp/css/room.css
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css
index bb4a9cc..6970606 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -138,13 +138,13 @@
 .room.holder.small .room.sidebar.left .user.list .user.name {
 	display: none;
 }
-.room.sidebar.left .user.list .user .actions {
+.room.sidebar.left .user.list .user .user.actions {
 	position: relative;
 	min-height: 18px;
 	padding: 0;
 	padding-left: 44px;
 	visibility: hidden;
-	padding-right: 20px;
+	margin-right: 35px;
 }
 .room.sidebar.left .user.list .user:hover .user.actions {
 	visibility: visible;
@@ -277,6 +277,9 @@
 .ui-dialog.video .ui-dialog-titlebar {
 	padding-left: 10px
 }
+.ui-dialog.video.user-video.user-speaks{
+	box-shadow: 3px 3px 4px green;
+}
 .dropdown-menu.video.volume, .dropdown-menu.video.volume li {
 	width: 20px;
 	min-width: 20px;


[3/3] openmeetings git commit: [OPENMEETINGS-1644] refresh and A/V switch seems to work

Posted by so...@apache.org.
[OPENMEETINGS-1644] refresh and A/V switch seems to work


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d74a46a3
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d74a46a3
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d74a46a3

Branch: refs/heads/master
Commit: d74a46a35b816b1f3e0724077ce1f90ea3b3f83f
Parents: 62413ce
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Sep 2 13:00:53 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Sep 2 13:00:53 2017 +0700

----------------------------------------------------------------------
 .../openmeetings/core/rss/LoadAtomRssFeed.java  |  4 +-
 .../openmeetings/db/entity/basic/Client.java    |  1 +
 openmeetings-flash/src/main/flex/main.mxml      | 46 ++++++-----
 .../installation/ImportInitvalues.java          |  2 +-
 .../web/admin/groups/GroupsPanel.html           |  2 +-
 .../web/admin/rooms/RoomsPanel.html             |  4 +-
 .../web/admin/users/UsersPanel.html             |  2 +-
 .../web/app/Application.properties.xml          | 14 +---
 .../web/app/Application_ar.properties.xml       | 14 +---
 .../web/app/Application_bg.properties.xml       | 14 +---
 .../web/app/Application_ca.properties.xml       | 14 +---
 .../web/app/Application_cs.properties.xml       | 14 +---
 .../web/app/Application_da.properties.xml       | 14 +---
 .../web/app/Application_de.properties.xml       | 14 +---
 .../web/app/Application_el.properties.xml       | 14 +---
 .../web/app/Application_es.properties.xml       | 14 +---
 .../web/app/Application_fa.properties.xml       | 14 +---
 .../web/app/Application_fi.properties.xml       | 14 +---
 .../web/app/Application_fr.properties.xml       | 14 +---
 .../web/app/Application_gl.properties.xml       | 14 +---
 .../web/app/Application_hu.properties.xml       | 14 +---
 .../web/app/Application_id.properties.xml       | 14 +---
 .../web/app/Application_it.properties.xml       | 14 +---
 .../web/app/Application_ja.properties.xml       | 14 +---
 .../web/app/Application_ko.properties.xml       | 14 +---
 .../web/app/Application_nl.properties.xml       | 14 +---
 .../web/app/Application_pl.properties.xml       | 14 +---
 .../web/app/Application_pt.properties.xml       | 14 +---
 .../web/app/Application_pt_BR.properties.xml    | 14 +---
 .../web/app/Application_ru.properties.xml       | 14 +---
 .../web/app/Application_sk.properties.xml       | 14 +---
 .../web/app/Application_sv.properties.xml       | 14 +---
 .../web/app/Application_th.properties.xml       | 14 +---
 .../web/app/Application_tr.properties.xml       | 14 +---
 .../web/app/Application_uk.properties.xml       | 14 +---
 .../web/app/Application_zh_CN.properties.xml    | 14 +---
 .../web/app/Application_zh_TW.properties.xml    | 14 +---
 .../apache/openmeetings/web/common/Captcha.html |  2 +-
 .../web/common/FormSaveRefreshPanel.html        |  2 +-
 .../web/common/tree/FileTreePanel.html          | 17 +----
 .../web/common/tree/FileTreePanel.java          |  9 +++
 .../openmeetings/web/common/tree/filetree.js    | 31 ++++++++
 .../web/pages/auth/RegisterDialog.html          |  2 +-
 .../web/pages/auth/RegisterDialog.java          |  2 +-
 .../apache/openmeetings/web/room/RoomPanel.html |  4 +-
 .../apache/openmeetings/web/room/RoomPanel.java | 10 ++-
 .../openmeetings/web/room/VideoSettings.html    |  2 +-
 .../org/apache/openmeetings/web/room/room.js    | 48 +++++++++---
 .../apache/openmeetings/web/room/settings.js    | 18 +++--
 .../web/room/sidebar/icon/RefreshIcon.java      |  4 +-
 .../web/user/dashboard/RssWidgetView.html       | 65 ----------------
 .../web/user/dashboard/RssWidgetView.java       | 21 ++---
 .../openmeetings/web/user/dashboard/rss.js      | 80 ++++++++++++++++++++
 openmeetings-web/src/main/webapp/css/room.css   |  7 +-
 54 files changed, 267 insertions(+), 538 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
index b1edcae..c67b1d1 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
@@ -32,7 +32,7 @@ public class LoadAtomRssFeed {
 
 	public static HttpURLConnection getFeedConnection(String _url) throws IOException {
 		log.debug("getFeedConnection:: " + _url);
-		
+
 		URL url = new URL(_url);
 
 		HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -41,6 +41,8 @@ public class LoadAtomRssFeed {
 		conn.setDoInput(true);
 		conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322)");
 		conn.setRequestProperty("Referer", "http://openmeetings.apache.org/");
+		conn.setUseCaches(false);
+		conn.connect();
 		return conn;
 	}
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index e4f5cb8..790b1c3 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -386,6 +386,7 @@ public class Client implements IClient {
 		}
 		JSONObject json = new JSONObject()
 				.put("user", u)
+				.put("cuid", uid)
 				.put("uid", uid)
 				.put("rights", new JSONArray(rights))
 				.put("activities", new JSONArray(activities))

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-flash/src/main/flex/main.mxml
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/flex/main.mxml b/openmeetings-flash/src/main/flex/main.mxml
index 4cb13ea..f660fb3 100644
--- a/openmeetings-flash/src/main/flex/main.mxml
+++ b/openmeetings-flash/src/main/flex/main.mxml
@@ -143,14 +143,17 @@
 						video.getNc().call("check", new Responder(function (check:Object):void {
 							debug("check", check);
 							if (_hasVideo(check.activities) && hasVideo()) {
-								_hasAudio(check.activities) ? video.unmute() : video.mute();
-							}
-							if (mic != null) {
-								activityTimer.start();
+								activities = check.activities;
+								hasAudio() ? video.unmute() : video.mute();
+								if (mic != null) {
+									activityTimer.start();
+								} else {
+									activityTimer.stop();
+								}
 							} else {
-								activityTimer.stop();
+								activities = check.activities;
+								refreshBroadcast(null);
 							}
-							activities = check.activities;
 							//debug("Client updated: ", c);
 						}));
 					});
@@ -171,7 +174,7 @@
 								addImage(params.width, params.height);
 								video.resize(params.width, params.height);
 								activityTimer.addEventListener(TimerEvent.TIMER, broadcastTimerListener);
-								refreshBroadcast();
+								refreshBroadcast(null);
 								ExternalInterface.call("VideoManager.securityMode", params.uid, false);
 								ExternalInterface.addCallback("refresh", refreshBroadcast);
 							});
@@ -182,7 +185,7 @@
 				case OmVideo.PLAY: {
 					addImage(params.width, params.height);
 					video.resize(params.width, params.height);
-					refreshPlayback();
+					refreshPlayback(null);
 					ExternalInterface.addCallback("setVolume", function (vol:int):void {
 						video.setStreamVolume(vol);
 					});
@@ -193,15 +196,22 @@
 				}
 					break;
 			}
-			ExternalInterface.addCallback("vidResize", function (_width:int, _height:int):void {
-				userImage.width = _width;
-				userImage.height = _height;
-				video.resize(_width, _height);
-				video.vidResize(_width, _height);
-			});
+			ExternalInterface.addCallback("vidResize", vidResize);
 		}
 
-		private function refreshBroadcast():void {
+		private function vidResize(_width:int, _height:int):void {
+			userImage.width = _width;
+			userImage.height = _height;
+			video.resize(_width, _height);
+			video.vidResize(_width, _height);
+		}
+
+		private function refreshBroadcast(opts:Object):void {
+			if (opts && !isNaN(opts.width)) {
+				selectedCam = opts.cam;
+				selectedMic = opts.mic;
+				vidResize(opts.width, opts.height);
+			}
 			video.reset();
 			activityTimer.stop();
 			var broadcastId:String = UIDUtil.createUID();
@@ -220,7 +230,7 @@
 			}
 		}
 
-		private function refreshPlayback():void {
+		private function refreshPlayback(opts:Object):void {
 			var params:Object = FlexGlobals.topLevelApplication.parameters;
 			video.reset();
 			video.play(params.broadcastId); // TODO audio/video
@@ -303,7 +313,9 @@
 			if (cam != null) {
 				if (cam.muted) {
 					debug("Camera Muted");
-					ExternalInterface.call("VideoManager.securityMode", params.uid, true);
+					if (params.mode != 'settings') {
+						ExternalInterface.call("VideoManager.securityMode", params.uid, true);
+					}
 					video.attachCamera(cam);
 					cam.addEventListener(StatusEvent.STATUS, function (event:StatusEvent):void {
 						debug("cameraStatusHandler! " + event);

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index 2257df8..7185e44 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -152,7 +152,7 @@ public class ImportInitvalues {
 		Naviglobal admin = navimanagement.addGlobalStructure(6, "6", LEVEL_GROUP_ADMIN, "Administration Menu", "586");
 		navimanagement.addMainStructure("adminModuleUser", null, 14, "125", LEVEL_GROUP_ADMIN, "Administration of Users", admin.getId(), "1454");
 		navimanagement.addMainStructure("adminModuleConnections", null, 15, "597", LEVEL_ADMIN, "Aministration of Connections", admin.getId(), "1455");
-		navimanagement.addMainStructure("adminModuleOrg", null, 16, "127", LEVEL_GROUP_ADMIN, "Administration of Groups", admin.getId(), "1456");
+		navimanagement.addMainStructure("adminModuleOrg", null, 16, "126", LEVEL_GROUP_ADMIN, "Administration of Groups", admin.getId(), "1456");
 		navimanagement.addMainStructure("adminModuleRoom", null, 17, "186", LEVEL_GROUP_ADMIN, "Administration of Rooms", admin.getId(), "1457");
 		navimanagement.addMainStructure("adminModuleConfiguration", null, 18, "263", LEVEL_ADMIN, "Administration of Configuration", admin.getId(), "1458");
 		navimanagement.addMainStructure("adminModuleLanguages", null, 19, "348", LEVEL_ADMIN, "Administration of Languages", admin.getId(), "1459");

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
index 98c7f64..95b1834 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
@@ -24,7 +24,7 @@
 		<span wicket:id="navigator">[dataview navigator]</span>
 		<table class="adminListTable">
 			<tr>
-				<th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="164" /></th>
+				<th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="188" /></th>
 				<th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="165" /></th>
 			</tr>
 		</table>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
index 9984d69..9701abb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
@@ -70,13 +70,13 @@
 
 				<!-- Groups -->
 				<fieldset class="ui-widget-content">
-					<legend class="ui-widget-header"><wicket:message key="191" /></legend>
+					<legend class="ui-widget-header"><wicket:message key="126" /></legend>
 					<div class="formelement">
 						<label wicket:for="ispublic"><wicket:message key="190" /></label><input type="checkbox" class="formcheckbox" wicket:id="ispublic" />
 					</div>
 					<div class="formelement">
 						<div class="info-text"><wicket:message key="828" /></div>
-						<label wicket:for="roomGroups"><wicket:message key="191" /></label><div class="om-select2"><select class="input" wicket:id="roomGroups"></select></div>
+						<label wicket:for="roomGroups"><wicket:message key="126" /></label><div class="om-select2"><select class="input" wicket:id="roomGroups"></select></div>
 					</div>
 				</fieldset>
 

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
index c9661bf..b8dc48b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
@@ -25,7 +25,7 @@
 		<table class="adminListTable">
 			<thead>
 				<tr>
-					<th class="four_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span> <wicket:message key="146" /></th>
+					<th class="four_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span> <wicket:message key="188" /></th>
 					<th class="four_column_layout_column2 ui-widget-header"><span wicket:id="orderByLogin"></span> <wicket:message key="108" /></th>
 					<th class="four_column_layout_column3 ui-widget-header"><span wicket:id="orderByFirstName"></span> <wicket:message key="117" /></th>
 					<th class="four_column_layout_column4 ui-widget-header"><span wicket:id="orderByLastName"></span> <wicket:message key="136" /></th>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index d35d198..7446fe3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Home]]></entry>
 	<entry key="125"><![CDATA[Users]]></entry>
 	<entry key="126"><![CDATA[Groups]]></entry>
-	<entry key="127"><![CDATA[Usergroups]]></entry>
 	<entry key="131"><![CDATA[Enter]]></entry>
 	<entry key="135"><![CDATA[Title/first name]]></entry>
 	<entry key="136"><![CDATA[Last name]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Address]]></entry>
 	<entry key="143"><![CDATA[User details]]></entry>
 	<entry key="144"><![CDATA[Save]]></entry>
-	<entry key="146"><![CDATA[User ID]]></entry>
-	<entry key="149"><![CDATA[Last name]]></entry>
 	<entry key="155"><![CDATA[New record]]></entry>
 	<entry key="157"><![CDATA[Delete record]]></entry>
 	<entry key="159"><![CDATA[Disabled]]></entry>
 	<entry key="161"><![CDATA[Usergroup]]></entry>
 	<entry key="162"><![CDATA[Calendar]]></entry>
-	<entry key="164"><![CDATA[Usergroup ID]]></entry>
 	<entry key="165"><![CDATA[Name]]></entry>
 	<entry key="177"><![CDATA[User]]></entry>
 	<entry key="178"><![CDATA[Add user]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Conference rooms]]></entry>
 	<entry key="188"><![CDATA[ID]]></entry>
 	<entry key="190"><![CDATA[Public]]></entry>
-	<entry key="191"><![CDATA[Usergroups]]></entry>
 	<entry key="196"><![CDATA[Comment]]></entry>
 	<entry key="197"><![CDATA[Save and export]]></entry>
 	<entry key="199"><![CDATA[Save as]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Change line width]]></entry>
 	<entry key="433"><![CDATA[Guest]]></entry>
 	<entry key="442"><![CDATA[Delete server chat log]]></entry>
-	<entry key="447"><![CDATA[Choose published devices]]></entry>
-	<entry key="448"><![CDATA[Audio and video]]></entry>
-	<entry key="449"><![CDATA[Audio only]]></entry>
-	<entry key="450"><![CDATA[Video only]]></entry>
-	<entry key="451"><![CDATA[No audio/video (static image)]]></entry>
-	<entry key="452"><![CDATA[No audio/video from your PC will be published, your profile picture will be shown]]></entry>
 	<entry key="453"><![CDATA[MO]]></entry>
 	<entry key="454"><![CDATA[TU]]></entry>
 	<entry key="455"><![CDATA[WE]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Do you really want to unenroll this client from the room?]]></entry>
 	<entry key="606"><![CDATA[Your session has been closed by an administrator or moderator.]]></entry>
 	<entry key="607"><![CDATA[Phone]]></entry>
-	<entry key="610"><![CDATA[(Re) Start audio/video or change device settings]]></entry>
 	<entry key="612"><![CDATA[Remove ability to draw on whiteboard]]></entry>
 	<entry key="615"><![CDATA[Whiteboard]]></entry>
 	<entry key="619"><![CDATA[Room type]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Cancel]]></entry>
+	<entry key="lbl.refresh"><![CDATA[Refresh]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Numeric 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Yes/No]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[Refresh]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 70b0004..9cf00df 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[البيت]]></entry>
 	<entry key="125"><![CDATA[المستعملون]]></entry>
 	<entry key="126"><![CDATA[المجموعات]]></entry>
-	<entry key="127"><![CDATA[المنظمات]]></entry>
 	<entry key="131"><![CDATA[أدخل]]></entry>
 	<entry key="135"><![CDATA[Firstname]]></entry>
 	<entry key="136"><![CDATA[Lastname]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Adress - معلومات]]></entry>
 	<entry key="143"><![CDATA[Userdata]]></entry>
 	<entry key="144"><![CDATA[انقاذ]]></entry>
-	<entry key="146"><![CDATA[- رقم تعريف المستخدم]]></entry>
-	<entry key="149"><![CDATA[Lastname]]></entry>
 	<entry key="155"><![CDATA[قياسيه جديدة]]></entry>
 	<entry key="157"><![CDATA[حذف سجل]]></entry>
 	<entry key="159"><![CDATA[فاقد الاهليه]]></entry>
 	<entry key="161"><![CDATA[المنظمات]]></entry>
 	<entry key="162"><![CDATA[التقويم]]></entry>
-	<entry key="164"><![CDATA[منظمة معرف]]></entry>
 	<entry key="165"><![CDATA[الاسم]]></entry>
 	<entry key="177"><![CDATA[مستعمل]]></entry>
 	<entry key="178"><![CDATA[اضافة مستخدم]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Conferencerooms]]></entry>
 	<entry key="188"><![CDATA[الهوية]]></entry>
 	<entry key="190"><![CDATA[الجمهور]]></entry>
-	<entry key="191"><![CDATA[المنظمات]]></entry>
 	<entry key="196"><![CDATA[التعليق]]></entry>
 	<entry key="197"><![CDATA[انقاذ]]></entry>
 	<entry key="199"><![CDATA[باستثناء ما ورد]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[تغيير عرض الخط]]></entry>
 	<entry key="433"><![CDATA[ضيف]]></entry>
 	<entry key="442"><![CDATA[حذف server-chatlog]]></entry>
-	<entry key="447"><![CDATA[إختر الأجهزة المنشورة]]></entry>
-	<entry key="448"><![CDATA[صوت و صورة]]></entry>
-	<entry key="449"><![CDATA[صوت فقط]]></entry>
-	<entry key="450"><![CDATA[صورة فقط]]></entry>
-	<entry key="451"><![CDATA[لا صورة/صوت (صورة ثابتة)]]></entry>
-	<entry key="452"><![CDATA[لا صوت/صورة ستنشر من جهازك، بدلاً من هذا ستظهر صورة من ملفك. إختر هذه الإعدادات إذا كان لديك مشاكل مع عرض النطاق الترددي أو إذا كان إتصالك بالإنترنت بطيئاً.]]></entry>
 	<entry key="453"><![CDATA[الإثنين]]></entry>
 	<entry key="454"><![CDATA[الثلاثاء]]></entry>
 	<entry key="455"><![CDATA[الأربعاء]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[هل تريد فعلاً أن ترمي العميل خارج الإتصال؟<br/> هذا سوف يقوم فقط بإخراج الزبون من الغرفة الحالية. يمكن للزبون أن يدخل مرة أخرى.]]></entry>
 	<entry key="606"><![CDATA[لقد تم إغلاق جلستك عن طريق المسؤول أو رئيس الجلسة.]]></entry>
 	<entry key="607"><![CDATA[هاتف]]></entry>
-	<entry key="610"><![CDATA[(إعادة) بدء صوت / صورة أو تغيير إعدادات الجهاز]]></entry>
 	<entry key="612"><![CDATA[إلغاء قدرة الرسم على اللوح]]></entry>
 	<entry key="615"><![CDATA[اللوح]]></entry>
 	<entry key="619"><![CDATA[نوع الغرفة.]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[الغاء]]></entry>
+	<entry key="lbl.refresh"><![CDATA[تحديث]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[عددي 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[نعم / لا]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[تحديث]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 612b053..d5ae978 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Начало]]></entry>
 	<entry key="125"><![CDATA[Потребители]]></entry>
 	<entry key="126"><![CDATA[Групи]]></entry>
-	<entry key="127"><![CDATA[Организации]]></entry>
 	<entry key="131"><![CDATA[Вход]]></entry>
 	<entry key="135"><![CDATA[Име]]></entry>
 	<entry key="136"><![CDATA[Фамилия]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Адрес]]></entry>
 	<entry key="143"><![CDATA[Данни за потребителя]]></entry>
 	<entry key="144"><![CDATA[Запис]]></entry>
-	<entry key="146"><![CDATA[ID]]></entry>
-	<entry key="149"><![CDATA[Фамилия]]></entry>
 	<entry key="155"><![CDATA[Нов запис]]></entry>
 	<entry key="157"><![CDATA[Изтриване на запис]]></entry>
 	<entry key="159"><![CDATA[изключен]]></entry>
 	<entry key="161"><![CDATA[Организации]]></entry>
 	<entry key="162"><![CDATA[Календар]]></entry>
-	<entry key="164"><![CDATA[Организация ID]]></entry>
 	<entry key="165"><![CDATA[Име]]></entry>
 	<entry key="177"><![CDATA[Потребител]]></entry>
 	<entry key="178"><![CDATA[добавяне потребител]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Стаи за конференции]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[публична]]></entry>
-	<entry key="191"><![CDATA[Организации]]></entry>
 	<entry key="196"><![CDATA[Коментар]]></entry>
 	<entry key="197"><![CDATA[запазване и експорт]]></entry>
 	<entry key="199"><![CDATA[запазване като]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[смяна ширината на линията]]></entry>
 	<entry key="433"><![CDATA[Гост]]></entry>
 	<entry key="442"><![CDATA[Изтриване на чат история]]></entry>
-	<entry key="447"><![CDATA[Избор на устройства]]></entry>
-	<entry key="448"><![CDATA[Аудио и Видео]]></entry>
-	<entry key="449"><![CDATA[Само Аудио]]></entry>
-	<entry key="450"><![CDATA[Само Видео]]></entry>
-	<entry key="451"><![CDATA[без Аудио/Видео (статично изображение)]]></entry>
-	<entry key="452"><![CDATA[Няма да се показва никакво Аудио/Видео от Вашето PC, вместо това ще се показва статично изображение. Може да изберете тази настройка, ако имате бавна Интернет връзка.]]></entry>
 	<entry key="453"><![CDATA[ПОН]]></entry>
 	<entry key="454"><![CDATA[ВТ]]></entry>
 	<entry key="455"><![CDATA[СР]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Наистина ли искате кик на потребителя?&lt;br/&gt;Това само ще махне клиента от стаята, и след това той може да се логне наново.]]></entry>
 	<entry key="606"><![CDATA[Сесията Ви е приключена от Администратор или Модератор.]]></entry>
 	<entry key="607"><![CDATA[Телефон]]></entry>
-	<entry key="610"><![CDATA[Ре(старт) на Аудио/Видео или промяна на настройките]]></entry>
 	<entry key="612"><![CDATA[Премахва правото за рисуване на дъската]]></entry>
 	<entry key="615"><![CDATA[Бяла дъска]]></entry>
 	<entry key="619"><![CDATA[Тип стая]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Отказ]]></entry>
+	<entry key="lbl.refresh"><![CDATA[опресняване]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Числов 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Да/Не]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[опресняване]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 17901f2..0c74e26 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Inici]]></entry>
 	<entry key="125"><![CDATA[Usuaris]]></entry>
 	<entry key="126"><![CDATA[Grups]]></entry>
-	<entry key="127"><![CDATA[Organitzacions]]></entry>
 	<entry key="131"><![CDATA[Entrar]]></entry>
 	<entry key="135"><![CDATA[Nom]]></entry>
 	<entry key="136"><![CDATA[Cognoms]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Més informació]]></entry>
 	<entry key="143"><![CDATA[Dades de usuari]]></entry>
 	<entry key="144"><![CDATA[Guardar]]></entry>
-	<entry key="146"><![CDATA[ID]]></entry>
-	<entry key="149"><![CDATA[cognoms]]></entry>
 	<entry key="155"><![CDATA[Nou registre]]></entry>
 	<entry key="157"><![CDATA[Esborrar registre]]></entry>
 	<entry key="159"><![CDATA[no actiu]]></entry>
 	<entry key="161"><![CDATA[Organitzacions]]></entry>
 	<entry key="162"><![CDATA[calendari]]></entry>
-	<entry key="164"><![CDATA[ID]]></entry>
 	<entry key="165"><![CDATA[Nom]]></entry>
 	<entry key="177"><![CDATA[usuari]]></entry>
 	<entry key="178"><![CDATA[afegir usuari]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Sales de conferència]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[pública]]></entry>
-	<entry key="191"><![CDATA[Organitzacions]]></entry>
 	<entry key="196"><![CDATA[Comentari]]></entry>
 	<entry key="197"><![CDATA[guardar]]></entry>
 	<entry key="199"><![CDATA[guardar com]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[canviar grossor de línia]]></entry>
 	<entry key="433"><![CDATA[Invitat]]></entry>
 	<entry key="442"><![CDATA[Eliminar registre (log) de xat en el servidor]]></entry>
-	<entry key="447"><![CDATA[Seleccionar dispositius]]></entry>
-	<entry key="448"><![CDATA[Àudio i Vídeo]]></entry>
-	<entry key="449"><![CDATA[Només Àudio]]></entry>
-	<entry key="450"><![CDATA[Només Vídeo]]></entry>
-	<entry key="451"><![CDATA[Sense Àudio/Vídeo (Imatge fixa)]]></entry>
-	<entry key="452"><![CDATA[No es transmetrà Àudio/Vídeo des del seu equip. En el seu lloc es mostrarà la imatge del seu perfil. Seleccioni aquesta configuració si té problemes amb l'ample de banda d'internet.]]></entry>
 	<entry key="453"><![CDATA[DL]]></entry>
 	<entry key="454"><![CDATA[DM]]></entry>
 	<entry key="455"><![CDATA[MC]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Està segur de voler expulsar a aquest client de la connexió?\n El client serà expulsat de la Sala, però podrà tornar a autenticar-se de nou.]]></entry>
 	<entry key="606"><![CDATA[La seva sessió ha estat tancada per l'administrador o el moderador.]]></entry>
 	<entry key="607"><![CDATA[Telèfon]]></entry>
-	<entry key="610"><![CDATA[(Re) Iniciar Àudio/Vídeo o canviar la configuració de dispositius]]></entry>
 	<entry key="612"><![CDATA[Llevar permisos per a dibuixar en la pissarra]]></entry>
 	<entry key="615"><![CDATA[Pissarra]]></entry>
 	<entry key="619"><![CDATA[Tipus de sala]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Cancelar]]></entry>
+	<entry key="lbl.refresh"><![CDATA[actualitzar]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Valor numèric [1-10]]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Sí/No]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[actualitzar]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 885103b..3d71222 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Domů]]></entry>
 	<entry key="125"><![CDATA[Uživatelé]]></entry>
 	<entry key="126"><![CDATA[Skupiny]]></entry>
-	<entry key="127"><![CDATA[Organizace]]></entry>
 	<entry key="131"><![CDATA[vstup]]></entry>
 	<entry key="135"><![CDATA[Jméno]]></entry>
 	<entry key="136"><![CDATA[Příjmení]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Info o adrese]]></entry>
 	<entry key="143"><![CDATA[Uživatelská data]]></entry>
 	<entry key="144"><![CDATA[ulož]]></entry>
-	<entry key="146"><![CDATA[USER-ID]]></entry>
-	<entry key="149"><![CDATA[Příjmení]]></entry>
 	<entry key="155"><![CDATA[nový záznam]]></entry>
 	<entry key="157"><![CDATA[smaž záznam]]></entry>
 	<entry key="159"><![CDATA[zakázáno]]></entry>
 	<entry key="161"><![CDATA[Organizace]]></entry>
 	<entry key="162"><![CDATA[kalendář]]></entry>
-	<entry key="164"><![CDATA[ID organizace]]></entry>
 	<entry key="165"><![CDATA[Název]]></entry>
 	<entry key="177"><![CDATA[uživatel]]></entry>
 	<entry key="178"><![CDATA[přidej uživatele]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Konferenční místnost]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[veřejné]]></entry>
-	<entry key="191"><![CDATA[Organizace]]></entry>
 	<entry key="196"><![CDATA[Komentář]]></entry>
 	<entry key="197"><![CDATA[ulož a exportuj]]></entry>
 	<entry key="199"><![CDATA[ulož jako]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Změň tloušťku čáry]]></entry>
 	<entry key="433"><![CDATA[Host]]></entry>
 	<entry key="442"><![CDATA[Smaž záznam pokecu na serveru]]></entry>
-	<entry key="447"><![CDATA[Vyber zveřejněné zařízení]]></entry>
-	<entry key="448"><![CDATA[Zvuk a obraz]]></entry>
-	<entry key="449"><![CDATA[Pouze zvuk]]></entry>
-	<entry key="450"><![CDATA[Pouze obraz]]></entry>
-	<entry key="451"><![CDATA[Bez zvuku a obrazu (statický obrázek)]]></entry>
-	<entry key="452"><![CDATA[Zvuk a Obraz z Vašeho PC není zveřejněno, bude zobrazen pouze obrázek z Vašeho profilu.Pokud máte problémy zkontrolujte Vaše nastavení, nebo máte velmi pomalé připojení k internetu.]]></entry>
 	<entry key="453"><![CDATA[Po]]></entry>
 	<entry key="454"><![CDATA[Út]]></entry>
 	<entry key="455"><![CDATA[St]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Opravdu chcete odpojit uživatele?<br/> Toto pouze odpojí uživatele od dané místnosti. Uživatel se může opět přihlásit.]]></entry>
 	<entry key="606"><![CDATA[Vaše sezení bylo ukončeno administrátorem, nebo moderátorem.]]></entry>
 	<entry key="607"><![CDATA[Telefon]]></entry>
-	<entry key="610"><![CDATA[(Re) Start Zvuk/Obraz, nebo změna nastavení zařízení]]></entry>
 	<entry key="612"><![CDATA[Odejmout možnost kreslení na tabuli]]></entry>
 	<entry key="615"><![CDATA[Tabule]]></entry>
 	<entry key="619"><![CDATA[Room Type]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[zruš]]></entry>
+	<entry key="lbl.refresh"><![CDATA[aktualizuj]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Čísla 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Ano/Ne]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[aktualizuj]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index f68d496..52384d6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Forside]]></entry>
 	<entry key="125"><![CDATA[Brugere]]></entry>
 	<entry key="126"><![CDATA[Grupper]]></entry>
-	<entry key="127"><![CDATA[Organisationer]]></entry>
 	<entry key="131"><![CDATA[Log ind]]></entry>
 	<entry key="135"><![CDATA[Fornavn]]></entry>
 	<entry key="136"><![CDATA[Efternavn]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Adresse-Info]]></entry>
 	<entry key="143"><![CDATA[Brugerdata]]></entry>
 	<entry key="144"><![CDATA[Gem]]></entry>
-	<entry key="146"><![CDATA[Bruger-ID]]></entry>
-	<entry key="149"><![CDATA[Efternavn]]></entry>
 	<entry key="155"><![CDATA[Nyt indhold]]></entry>
 	<entry key="157"><![CDATA[Slet indhold]]></entry>
 	<entry key="159"><![CDATA[Ikke tilgængelig]]></entry>
 	<entry key="161"><![CDATA[Organisation]]></entry>
 	<entry key="162"><![CDATA[Kalender]]></entry>
-	<entry key="164"><![CDATA[Organisation-ID]]></entry>
 	<entry key="165"><![CDATA[Navn]]></entry>
 	<entry key="177"><![CDATA[Brugere]]></entry>
 	<entry key="178"><![CDATA[Gem til brugere]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Konferencerum]]></entry>
 	<entry key="188"><![CDATA[Id]]></entry>
 	<entry key="190"><![CDATA[Offentlig]]></entry>
-	<entry key="191"><![CDATA[Organisationer]]></entry>
 	<entry key="196"><![CDATA[Kommentar]]></entry>
 	<entry key="197"><![CDATA[Gem og eksport]]></entry>
 	<entry key="199"><![CDATA[Gem som]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Ændre linjebredde]]></entry>
 	<entry key="433"><![CDATA[Gæst]]></entry>
 	<entry key="442"><![CDATA[Slet serverens Chat-log]]></entry>
-	<entry key="447"><![CDATA[Vælg enheder]]></entry>
-	<entry key="448"><![CDATA[Lyd og video]]></entry>
-	<entry key="449"><![CDATA[Kun lyd]]></entry>
-	<entry key="450"><![CDATA[Kun video]]></entry>
-	<entry key="451"><![CDATA[Ingen lyd/video (statisk billede)]]></entry>
-	<entry key="452"><![CDATA[Ingen Lyd/Video vil blive publiceret. I stedet vil et billede fra din profil blive vist. Vælg denne indstilling, hvis du har en dårlig båndbredde.]]></entry>
 	<entry key="453"><![CDATA[MA]]></entry>
 	<entry key="454"><![CDATA[TI]]></entry>
 	<entry key="455"><![CDATA[ON]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Vil du virkelig udelukke denne klient?<br/> Det her udelukker kun klienten fra det aktuelle rum. Vedkommende kan tilslutte sig igen.]]></entry>
 	<entry key="606"><![CDATA[Din session er blevet lukket af administratoren eller moderatoren.]]></entry>
 	<entry key="607"><![CDATA[Telefon]]></entry>
-	<entry key="610"><![CDATA[Genstart lyd/video eller ændre indstillinger]]></entry>
 	<entry key="612"><![CDATA[Fjern muligheden for at tegne på whiteboardet]]></entry>
 	<entry key="615"><![CDATA[Whiteboard]]></entry>
 	<entry key="619"><![CDATA[Rumtyper]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Afbryd]]></entry>
+	<entry key="lbl.refresh"><![CDATA[Opdater]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Numerisk 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Ja/Nej]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[Opdater]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index f08ef97..72337b3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Home]]></entry>
 	<entry key="125"><![CDATA[Benutzer]]></entry>
 	<entry key="126"><![CDATA[Gruppen]]></entry>
-	<entry key="127"><![CDATA[Organisationen]]></entry>
 	<entry key="131"><![CDATA[Betreten]]></entry>
 	<entry key="135"><![CDATA[Vorname]]></entry>
 	<entry key="136"><![CDATA[Nachname]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Adressinfo]]></entry>
 	<entry key="143"><![CDATA[Benutzerdaten]]></entry>
 	<entry key="144"><![CDATA[Speichern]]></entry>
-	<entry key="146"><![CDATA[Benutzer-ID]]></entry>
-	<entry key="149"><![CDATA[Nachname]]></entry>
 	<entry key="155"><![CDATA[Datensatz anlegen]]></entry>
 	<entry key="157"><![CDATA[Datensatz entfernen]]></entry>
 	<entry key="159"><![CDATA[gesperrt]]></entry>
 	<entry key="161"><![CDATA[Organisationen]]></entry>
 	<entry key="162"><![CDATA[Kalender]]></entry>
-	<entry key="164"><![CDATA[Organisations-ID]]></entry>
 	<entry key="165"><![CDATA[Name]]></entry>
 	<entry key="177"><![CDATA[Benutzer]]></entry>
 	<entry key="178"><![CDATA[Benutzer hinzufügen]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Konferenzräume]]></entry>
 	<entry key="188"><![CDATA[ID]]></entry>
 	<entry key="190"><![CDATA[öffentlich]]></entry>
-	<entry key="191"><![CDATA[Organisationen]]></entry>
 	<entry key="196"><![CDATA[Kommentar]]></entry>
 	<entry key="197"><![CDATA[Speichern]]></entry>
 	<entry key="199"><![CDATA[Speichern unter]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Linienstärke ändern]]></entry>
 	<entry key="433"><![CDATA[Gäste]]></entry>
 	<entry key="442"><![CDATA[Chatlog löschen]]></entry>
-	<entry key="447"><![CDATA[Wählen Sie die Geräte aus:]]></entry>
-	<entry key="448"><![CDATA[Ton und Video]]></entry>
-	<entry key="449"><![CDATA[nur Ton (Mikrophon)]]></entry>
-	<entry key="450"><![CDATA[nur Video (Webcam)]]></entry>
-	<entry key="451"><![CDATA[kein Video/Ton (nur Profil-Bild)]]></entry>
-	<entry key="452"><![CDATA[Kein Video/Ton veröffentlichen. Wählen Sie diese Einstellung wenn die verfügbare Bandbreite sehr niedrig ist.]]></entry>
 	<entry key="453"><![CDATA[MO]]></entry>
 	<entry key="454"><![CDATA[DI]]></entry>
 	<entry key="455"><![CDATA[MI]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Wollen Sie diesen Benutzer wirklich von dieser Verbingung ausschließen?<br/> Diese Maßnahme entfernt den Benutzer lediglich aus dem Raum. Der Benutzer kann sich wieder einloggen.]]></entry>
 	<entry key="606"><![CDATA[Ihre Sitzung wurde beendet.]]></entry>
 	<entry key="607"><![CDATA[Telefon]]></entry>
-	<entry key="610"><![CDATA[Neu starten von Ton/Video oder Einstellungen ändern]]></entry>
 	<entry key="612"><![CDATA[Diesem Benutzer den Zugang zum Zeichenbrett verwehren.]]></entry>
 	<entry key="615"><![CDATA[Zeichenbrett]]></entry>
 	<entry key="619"><![CDATA[Raumtyp]]></entry>
@@ -919,6 +907,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Abbrechen]]></entry>
+	<entry key="lbl.refresh"><![CDATA[Neu laden]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[E-Mail Management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[Mein Konferenzraum (für 1-16 Benutzer)]]></entry>
@@ -955,7 +944,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Numerisch 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Ja/Nein]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[Neu laden]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index 7925da1..224db78 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Αρχική Σελίδα]]></entry>
 	<entry key="125"><![CDATA[Χρήστες]]></entry>
 	<entry key="126"><![CDATA[Ομάδες]]></entry>
-	<entry key="127"><![CDATA[Οργανισμοί]]></entry>
 	<entry key="131"><![CDATA[Είσοδος]]></entry>
 	<entry key="135"><![CDATA[Όνομα]]></entry>
 	<entry key="136"><![CDATA[Επώνυμο]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Διεύθυνση]]></entry>
 	<entry key="143"><![CDATA[Στοιχεία Χρήστη]]></entry>
 	<entry key="144"><![CDATA[Αποθήκευση]]></entry>
-	<entry key="146"><![CDATA[ID]]></entry>
-	<entry key="149"><![CDATA[Επώνυμο]]></entry>
 	<entry key="155"><![CDATA[Νέα Εγγραφή]]></entry>
 	<entry key="157"><![CDATA[Διαγραφή Εγγραφής]]></entry>
 	<entry key="159"><![CDATA[Απενεργοποιημένη]]></entry>
 	<entry key="161"><![CDATA[Οργανισμοί]]></entry>
 	<entry key="162"><![CDATA[Ημερολόγιο]]></entry>
-	<entry key="164"><![CDATA[ID]]></entry>
 	<entry key="165"><![CDATA[Όνομα]]></entry>
 	<entry key="177"><![CDATA[Χρήστης]]></entry>
 	<entry key="178"><![CDATA[Προσθήκη Χρήστη]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Δωμάτιο Συνδιάσκέψεων]]></entry>
 	<entry key="188"><![CDATA[Αριθμός]]></entry>
 	<entry key="190"><![CDATA[Δημόσιο]]></entry>
-	<entry key="191"><![CDATA[Οργανισμοί]]></entry>
 	<entry key="196"><![CDATA[Σχόλιο]]></entry>
 	<entry key="197"><![CDATA[Αποθήκευση και Εξαγωγή]]></entry>
 	<entry key="199"><![CDATA[Αποθήκευση ως]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Αλλαγή Πλάτους Γραμμής]]></entry>
 	<entry key="433"><![CDATA[Επισκέπτης]]></entry>
 	<entry key="442"><![CDATA[Διαγραφή Chatlog από το Διακομιστή]]></entry>
-	<entry key="447"><![CDATA[Επιλογή Δημοσιευμένων Συσκευών]]></entry>
-	<entry key="448"><![CDATA[Ήχος και Βίντεο]]></entry>
-	<entry key="449"><![CDATA[Ήχος μόνο]]></entry>
-	<entry key="450"><![CDATA[Βίντεο μόνο]]></entry>
-	<entry key="451"><![CDATA[Χωρίς Ηχό/Βίντεο (Στατική Εικόνα)]]></entry>
-	<entry key="452"><![CDATA[Δεν θα δημοσιεύεται ούτε Ήχος ούτε Βίντεο από το PC σας. Αντί αυτού θα εμφανίζεται η Εικόνα του Προφίλ σας. Επιλέξτε αυτήν τη ρύθμιση αν έχετε προβλήματα με το bandwidth σας ή μια πολύ αργή Σύνδεση Internet.]]></entry>
 	<entry key="453"><![CDATA[ΔΕΥ]]></entry>
 	<entry key="454"><![CDATA[ΤΡΙ]]></entry>
 	<entry key="455"><![CDATA[ΤΕΤ]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Θέλετε πραγματικά να βγάλετε αυτόν τον Πελάτη από τη Σύνδεση;<br/> Με αυτόν τον τρόπο ο Πελάτης αφαιρείται μόνο από το τρέχον Δωμάτιο και μπορεί να συνδεθεί ξανά.]]></entry>
 	<entry key="606"><![CDATA[Η Σύνοδός σας έχει κλείσει από Διαχειριστή ή Συντονιστή.]]></entry>
 	<entry key="607"><![CDATA[Τηλέφωνο]]></entry>
-	<entry key="610"><![CDATA[(Επαν)Εκκίνηση Ήχου/Βίντεο ή Αλλαγή Ρυθμίσεων Συσκευής]]></entry>
 	<entry key="612"><![CDATA[Αφαιρέστε τη δυνατότητα σχεδίασης πάνω στον Πίνακα]]></entry>
 	<entry key="615"><![CDATA[Πίνακας]]></entry>
 	<entry key="619"><![CDATA[Τύπος Δωματίου]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Ακύρωση]]></entry>
+	<entry key="lbl.refresh"><![CDATA[Ανανέωση]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Αριθμός 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Ναι/Όχι]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[Ανανέωση]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index dbfda3c..05f76e2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Inicio]]></entry>
 	<entry key="125"><![CDATA[Usuarios]]></entry>
 	<entry key="126"><![CDATA[Grupos]]></entry>
-	<entry key="127"><![CDATA[Organizaciones]]></entry>
 	<entry key="131"><![CDATA[Entrar]]></entry>
 	<entry key="135"><![CDATA[Nombre]]></entry>
 	<entry key="136"><![CDATA[Apellidos]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Más información]]></entry>
 	<entry key="143"><![CDATA[Datos de Usuario]]></entry>
 	<entry key="144"><![CDATA[Guardar]]></entry>
-	<entry key="146"><![CDATA[ID]]></entry>
-	<entry key="149"><![CDATA[Apellido(s)]]></entry>
 	<entry key="155"><![CDATA[Nuevo registro]]></entry>
 	<entry key="157"><![CDATA[Borrar registro]]></entry>
 	<entry key="159"><![CDATA[desactivado]]></entry>
 	<entry key="161"><![CDATA[Organizaciones]]></entry>
 	<entry key="162"><![CDATA[Calendario]]></entry>
-	<entry key="164"><![CDATA[ID]]></entry>
 	<entry key="165"><![CDATA[Nombre]]></entry>
 	<entry key="177"><![CDATA[Usuario]]></entry>
 	<entry key="178"><![CDATA[Añadir usuario]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Salas de Conferencia]]></entry>
 	<entry key="188"><![CDATA[ID]]></entry>
 	<entry key="190"><![CDATA[pública]]></entry>
-	<entry key="191"><![CDATA[Organizaciones]]></entry>
 	<entry key="196"><![CDATA[Comentario]]></entry>
 	<entry key="197"><![CDATA[Guardar y exportar]]></entry>
 	<entry key="199"><![CDATA[Guardar como]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Cambiar grosor de línea]]></entry>
 	<entry key="433"><![CDATA[Invitado]]></entry>
 	<entry key="442"><![CDATA[Eliminar registro (log) de chat en el servidor]]></entry>
-	<entry key="447"><![CDATA[Seleccionar dispositivos]]></entry>
-	<entry key="448"><![CDATA[Audio y vídeo]]></entry>
-	<entry key="449"><![CDATA[Sólo audio]]></entry>
-	<entry key="450"><![CDATA[Sólo vídeo]]></entry>
-	<entry key="451"><![CDATA[Sin audio/vídeo (Imagen fija)]]></entry>
-	<entry key="452"><![CDATA[No se transmitirá audio/vídeo desde su equipo. En su lugar se mostrará la imagen de su perfil. Seleccione esta configuración si tiene problemas con el ancho de banda de internet.]]></entry>
 	<entry key="453"><![CDATA[LU]]></entry>
 	<entry key="454"><![CDATA[MA]]></entry>
 	<entry key="455"><![CDATA[MI]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[¿Está seguro de querer expulsar a este cliente de la conexión?<br/> El cliente será expulsado de la sala, pero podrá volver a autenticarse de nuevo.]]></entry>
 	<entry key="606"><![CDATA[Su sesión ha sido cerrada por el administrador o el moderador.]]></entry>
 	<entry key="607"><![CDATA[Teléfono]]></entry>
-	<entry key="610"><![CDATA[(Re) Iniciar audio/vídeo o cambiar la configuración de dispositivos]]></entry>
 	<entry key="612"><![CDATA[Quitar permisos para dibujar en la pizarra]]></entry>
 	<entry key="615"><![CDATA[Pizarra]]></entry>
 	<entry key="619"><![CDATA[Tipo de sala]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
     ]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Cancelar]]></entry>
+	<entry key="lbl.refresh"><![CDATA[actualizar]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[Mi sala de conferencias (para 1-16 usuarios)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Valor numérico [1-10]]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Sí/No]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[actualizar]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index c4013ac..0ea211e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[اصلي صفحه]]></entry>
 	<entry key="125"><![CDATA[كاربر]]></entry>
 	<entry key="126"><![CDATA[ها گروه]]></entry>
-	<entry key="127"><![CDATA[دهي سازمان]]></entry>
 	<entry key="131"><![CDATA[ورود]]></entry>
 	<entry key="135"><![CDATA[:نام]]></entry>
 	<entry key="136"><![CDATA[:خانوادگي نام]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[:آدرس]]></entry>
 	<entry key="143"><![CDATA[كاربر سوابق]]></entry>
 	<entry key="144"><![CDATA[ذخيره]]></entry>
-	<entry key="146"><![CDATA[كاربر شناسه]]></entry>
-	<entry key="149"><![CDATA[خانوادگي نام]]></entry>
 	<entry key="155"><![CDATA[جديد ضبط]]></entry>
 	<entry key="157"><![CDATA[ضبط حذف]]></entry>
 	<entry key="159"><![CDATA[صلاحيت فاقد]]></entry>
 	<entry key="161"><![CDATA[دهي سازمان]]></entry>
 	<entry key="162"><![CDATA[تقويم]]></entry>
-	<entry key="164"><![CDATA[سازمان شناسه]]></entry>
 	<entry key="165"><![CDATA[نام]]></entry>
 	<entry key="177"><![CDATA[كاربر]]></entry>
 	<entry key="178"><![CDATA[اضافه كاربر]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[كنفرانس اطاق]]></entry>
 	<entry key="188"><![CDATA[شناسه]]></entry>
 	<entry key="190"><![CDATA[همگاني]]></entry>
-	<entry key="191"><![CDATA[دهي سازمان]]></entry>
 	<entry key="196"><![CDATA[تفسير]]></entry>
 	<entry key="197"><![CDATA[ذخيره]]></entry>
 	<entry key="199"><![CDATA[از ذخيره]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[خط ضخامت تغيير]]></entry>
 	<entry key="433"><![CDATA[مهمان]]></entry>
 	<entry key="442"><![CDATA[سرور حذف]]></entry>
-	<entry key="447"><![CDATA[Choose Published Devices]]></entry>
-	<entry key="448"><![CDATA[بصري و سمعي]]></entry>
-	<entry key="449"><![CDATA[سمعي فقط]]></entry>
-	<entry key="450"><![CDATA[بصري فقط]]></entry>
-	<entry key="451"><![CDATA[بصري نه/سمعي نه]]></entry>
-	<entry key="452"><![CDATA[بصري نه/سمعي نه]]></entry>
 	<entry key="453"><![CDATA[دوشنبه]]></entry>
 	<entry key="454"><![CDATA[شنبه سه]]></entry>
 	<entry key="455"><![CDATA[شنبه چهار]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Do you really want to kick this Client from the Connection?<br/> This does only remove the Client from the current Room.The Client could re-login again.]]></entry>
 	<entry key="606"><![CDATA[Your session has been closed by an Administrator or Moderator.]]></entry>
 	<entry key="607"><![CDATA[Telefon]]></entry>
-	<entry key="610"><![CDATA[(Re) Start Audio/Video or change Device Settings]]></entry>
 	<entry key="612"><![CDATA[Remove ability to draw on whiteboard]]></entry>
 	<entry key="615"><![CDATA[Whiteboard]]></entry>
 	<entry key="619"><![CDATA[Room Type]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[انصراف]]></entry>
+	<entry key="lbl.refresh"><![CDATA[بيني باز]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[1-10 اعداد]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[خير/بله]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[بيني باز]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index f9e5ba0..97ad4d2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Koti]]></entry>
 	<entry key="125"><![CDATA[Users]]></entry>
 	<entry key="126"><![CDATA[Ryhmät]]></entry>
-	<entry key="127"><![CDATA[Organisaatiot]]></entry>
 	<entry key="131"><![CDATA[astu sisään]]></entry>
 	<entry key="135"><![CDATA[Etunimi]]></entry>
 	<entry key="136"><![CDATA[Sukunimi]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Osoitteen lisätieto]]></entry>
 	<entry key="143"><![CDATA[Käyttäjätieto]]></entry>
 	<entry key="144"><![CDATA[tallenna]]></entry>
-	<entry key="146"><![CDATA[USER-ID]]></entry>
-	<entry key="149"><![CDATA[Sukunimi]]></entry>
 	<entry key="155"><![CDATA[uusi tietue]]></entry>
 	<entry key="157"><![CDATA[poista tietue]]></entry>
 	<entry key="159"><![CDATA[pois käytöstä]]></entry>
 	<entry key="161"><![CDATA[Organisaatiot]]></entry>
 	<entry key="162"><![CDATA[kalenteri]]></entry>
-	<entry key="164"><![CDATA[Organisaatio-ID]]></entry>
 	<entry key="165"><![CDATA[Nimi]]></entry>
 	<entry key="177"><![CDATA[käyttäjä]]></entry>
 	<entry key="178"><![CDATA[uusi käyttäjä]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Konferenssihuoneet]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[julkinen]]></entry>
-	<entry key="191"><![CDATA[Organisaatiot]]></entry>
 	<entry key="196"><![CDATA[Kommentti]]></entry>
 	<entry key="197"><![CDATA[tallenna ja vie]]></entry>
 	<entry key="199"><![CDATA[tallenna nimellä]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Muuta viivan leveyttä]]></entry>
 	<entry key="433"><![CDATA[Vieras]]></entry>
 	<entry key="442"><![CDATA[Poista palvelimen keskusteluloki]]></entry>
-	<entry key="447"><![CDATA[Valitse julkaistavat laitteet]]></entry>
-	<entry key="448"><![CDATA[Ääni ja video]]></entry>
-	<entry key="449"><![CDATA[Vain ääni]]></entry>
-	<entry key="450"><![CDATA[Vain video]]></entry>
-	<entry key="451"><![CDATA[Ei ääntä/videota (kiinteä kuva)]]></entry>
-	<entry key="452"><![CDATA[Ääntä/kuvaa tietokoneelta ei julkaista. Profiilikuvasi näytetään sen sijaan. Valitse tämä asetus jos sinulla on ongelmia yhteytesi kanssa tai yhteytesi on erittäin hidas.]]></entry>
 	<entry key="453"><![CDATA[MA]]></entry>
 	<entry key="454"><![CDATA[TI]]></entry>
 	<entry key="455"><![CDATA[KE]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Haluatko varmasti katkaista tämän asiakkaan yhteyden?<br/> Tämä vain poistaa asiakkaan huoneesta. Asiakas voi kirjautua aina uudestaan.]]></entry>
 	<entry key="606"><![CDATA[Istuntosi on lopetettu ylläpitäjän tai moderaattorin toimesta.]]></entry>
 	<entry key="607"><![CDATA[Puhelin]]></entry>
-	<entry key="610"><![CDATA[(Re) Käynnistä Ääni/Kuva tai muuta laitteiden asetuksia]]></entry>
 	<entry key="612"><![CDATA[Estä käyttäjän piirtäminen piirtoalueelle]]></entry>
 	<entry key="615"><![CDATA[Piirtoalue]]></entry>
 	<entry key="619"><![CDATA[Huoneen tyyppi]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[peruuta]]></entry>
+	<entry key="lbl.refresh"><![CDATA[päivitä]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -951,7 +940,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.yesNo"><![CDATA[Kyllä/Ei]]></entry>
 	<entry key="prof"><![CDATA[Prof]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[päivitä]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index e6ecaea..c142b5d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Accueil]]></entry>
 	<entry key="125"><![CDATA[Utilisateurs]]></entry>
 	<entry key="126"><![CDATA[Groupes]]></entry>
-	<entry key="127"><![CDATA[Organisations]]></entry>
 	<entry key="131"><![CDATA[Entrer]]></entry>
 	<entry key="135"><![CDATA[Prénom]]></entry>
 	<entry key="136"><![CDATA[Nom]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Commentaires]]></entry>
 	<entry key="143"><![CDATA[Détails sur l'utilisateur]]></entry>
 	<entry key="144"><![CDATA[Sauvegarder]]></entry>
-	<entry key="146"><![CDATA[ID]]></entry>
-	<entry key="149"><![CDATA[Nom]]></entry>
 	<entry key="155"><![CDATA[Nouvel enregistrement]]></entry>
 	<entry key="157"><![CDATA[Effacer l'enregistrement]]></entry>
 	<entry key="159"><![CDATA[Désactivé]]></entry>
 	<entry key="161"><![CDATA[Organisations]]></entry>
 	<entry key="162"><![CDATA[Calendrier]]></entry>
-	<entry key="164"><![CDATA[ID Organisation]]></entry>
 	<entry key="165"><![CDATA[Nom]]></entry>
 	<entry key="177"><![CDATA[Utilisateur]]></entry>
 	<entry key="178"><![CDATA[Ajouter utilisateur]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Salles]]></entry>
 	<entry key="188"><![CDATA[ID]]></entry>
 	<entry key="190"><![CDATA[Publique]]></entry>
-	<entry key="191"><![CDATA[Organisations]]></entry>
 	<entry key="196"><![CDATA[Commentaire :]]></entry>
 	<entry key="197"><![CDATA[Enregistrer]]></entry>
 	<entry key="199"><![CDATA[Enregistrer sous]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Changer la largeur de ligne]]></entry>
 	<entry key="433"><![CDATA[Invité]]></entry>
 	<entry key="442"><![CDATA[Effacer l'historique du t'chat]]></entry>
-	<entry key="447"><![CDATA[Choisissez le périphérique]]></entry>
-	<entry key="448"><![CDATA[Audio et Vidéo]]></entry>
-	<entry key="449"><![CDATA[Audio seulement]]></entry>
-	<entry key="450"><![CDATA[Vidéo seulement]]></entry>
-	<entry key="451"><![CDATA[Pas d'audio ni de vidéo (image statique)]]></entry>
-	<entry key="452"><![CDATA[Aucun flux Audio/Vidéo ne sera émis, à la place l'image de votre profil sera affichée. Choisissez cette configuration en cas de problème de bande passante ou si votre connexion internet est lente.]]></entry>
 	<entry key="453"><![CDATA[LU]]></entry>
 	<entry key="454"><![CDATA[MA]]></entry>
 	<entry key="455"><![CDATA[ME]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Voulez-vous vraiment sortir cet utilisateur ?<br/> Cela supprimera le client de la réunion actuelle mais il pourra se reconnecter.]]></entry>
 	<entry key="606"><![CDATA[Votre session a été interrompue par l'administrateur ou le modérateur.]]></entry>
 	<entry key="607"><![CDATA[Téléphone]]></entry>
-	<entry key="610"><![CDATA[(Re) Démarrer audio/vidéo ou changer les paramètres]]></entry>
 	<entry key="612"><![CDATA[Retirer le droit de dessiner sur le tableau blanc.]]></entry>
 	<entry key="615"><![CDATA[Tableau blanc]]></entry>
 	<entry key="619"><![CDATA[Type de salle]]></entry>
@@ -906,6 +894,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Annuler]]></entry>
+	<entry key="lbl.refresh"><![CDATA[Rafraichir]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Gestion courriels]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Verifier courriels traités par le système]]></entry>
 	<entry key="my.room.conference"><![CDATA[Ma salle de conférence (pour 1-16 utilisateurs)]]></entry>
@@ -942,7 +931,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Numérique 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Oui/Non]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[Rafraichir]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 6618ade..13d9b87 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Inicio]]></entry>
 	<entry key="125"><![CDATA[Usuarios]]></entry>
 	<entry key="126"><![CDATA[Grupos]]></entry>
-	<entry key="127"><![CDATA[Organizacións]]></entry>
 	<entry key="131"><![CDATA[Entrar]]></entry>
 	<entry key="135"><![CDATA[Nome]]></entry>
 	<entry key="136"><![CDATA[Apelido(s)]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Información adicional]]></entry>
 	<entry key="143"><![CDATA[Datos do usuario]]></entry>
 	<entry key="144"><![CDATA[Gardar]]></entry>
-	<entry key="146"><![CDATA[ID do usuario]]></entry>
-	<entry key="149"><![CDATA[Apelido(s)]]></entry>
 	<entry key="155"><![CDATA[Novo rexistro]]></entry>
 	<entry key="157"><![CDATA[Eliminar o rexistro]]></entry>
 	<entry key="159"><![CDATA[desactivado]]></entry>
 	<entry key="161"><![CDATA[Organizacións]]></entry>
 	<entry key="162"><![CDATA[Calendario]]></entry>
-	<entry key="164"><![CDATA[ID da organización]]></entry>
 	<entry key="165"><![CDATA[Nome]]></entry>
 	<entry key="177"><![CDATA[Usuario]]></entry>
 	<entry key="178"><![CDATA[Engadir un usuario]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Salas de conferencia]]></entry>
 	<entry key="188"><![CDATA[ID]]></entry>
 	<entry key="190"><![CDATA[pública]]></entry>
-	<entry key="191"><![CDATA[Organizacións]]></entry>
 	<entry key="196"><![CDATA[Comentario]]></entry>
 	<entry key="197"><![CDATA[Gardar e exportar]]></entry>
 	<entry key="199"><![CDATA[Gardar como]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Cambiar o groso da liña]]></entry>
 	<entry key="433"><![CDATA[Convidado]]></entry>
 	<entry key="442"><![CDATA[Eliminar o rexistro da conversa no servidor]]></entry>
-	<entry key="447"><![CDATA[Escolla os dispositivos]]></entry>
-	<entry key="448"><![CDATA[Són e vídeo]]></entry>
-	<entry key="449"><![CDATA[Só son]]></entry>
-	<entry key="450"><![CDATA[Só vídeo]]></entry>
-	<entry key="451"><![CDATA[Sen son/vídeo (imáxe fixa)]]></entry>
-	<entry key="452"><![CDATA[Non se enviará son/vídeo desde o seu computador, no seu lugar mostrarase a imáxe do seu perfil. Seleccione esta configuración se vostede tén problemas co seu largo de banda ou unha conexión de Internet lenta.]]></entry>
 	<entry key="453"><![CDATA[LU]]></entry>
 	<entry key="454"><![CDATA[MA]]></entry>
 	<entry key="455"><![CDATA[ME]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Realmente quere expulsar este cliente da conexión?<br/> Isto só borra ao cliente da sala actual. O cliente pode volver a acceder de novo.]]></entry>
 	<entry key="606"><![CDATA[A súa sesión foi pechada por un administrador ou un moderador.]]></entry>
 	<entry key="607"><![CDATA[Teléfono]]></entry>
-	<entry key="610"><![CDATA[(Re)iniciar o son/vídeo ou cambiar a configuración dos dispositivos]]></entry>
 	<entry key="612"><![CDATA[Denegar o permiso a debuxar no taboleiro]]></entry>
 	<entry key="615"><![CDATA[Taboleiro]]></entry>
 	<entry key="619"><![CDATA[Tipo de sala]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Cancelar]]></entry>
+	<entry key="lbl.refresh"><![CDATA[actualizar]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Valor numérico 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Sí/Non]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[actualizar]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index df3fcea..3100a8a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Nyitó oldal]]></entry>
 	<entry key="125"><![CDATA[Felhasználók]]></entry>
 	<entry key="126"><![CDATA[Csoportok]]></entry>
-	<entry key="127"><![CDATA[Szervezet]]></entry>
 	<entry key="131"><![CDATA[belépés]]></entry>
 	<entry key="135"><![CDATA[Keresztnév]]></entry>
 	<entry key="136"><![CDATA[Családnév]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Megjegyzés]]></entry>
 	<entry key="143"><![CDATA[Felhasználói adatok]]></entry>
 	<entry key="144"><![CDATA[mentés]]></entry>
-	<entry key="146"><![CDATA[USER-ID]]></entry>
-	<entry key="149"><![CDATA[Családnév]]></entry>
 	<entry key="155"><![CDATA[új bejegyzés]]></entry>
 	<entry key="157"><![CDATA[bejegyzés törlése]]></entry>
 	<entry key="159"><![CDATA[tiltott]]></entry>
 	<entry key="161"><![CDATA[Szervezetek]]></entry>
 	<entry key="162"><![CDATA[naptár]]></entry>
-	<entry key="164"><![CDATA[Szervezet-ID]]></entry>
 	<entry key="165"><![CDATA[Név]]></entry>
 	<entry key="177"><![CDATA[felhasználó]]></entry>
 	<entry key="178"><![CDATA[felhasználó hozzáadása]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Konferenciatermek]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[nyilvános]]></entry>
-	<entry key="191"><![CDATA[Szervezetek]]></entry>
 	<entry key="196"><![CDATA[Megjegyzés]]></entry>
 	<entry key="197"><![CDATA[mentés]]></entry>
 	<entry key="199"><![CDATA[mentés mint]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Vonalvastagság változtatás]]></entry>
 	<entry key="433"><![CDATA[Vendég]]></entry>
 	<entry key="442"><![CDATA[Szerver-csevegési napló törlés]]></entry>
-	<entry key="447"><![CDATA[Válassz engedélyezett eszközt]]></entry>
-	<entry key="448"><![CDATA[Hang és kép]]></entry>
-	<entry key="449"><![CDATA[Csak hang]]></entry>
-	<entry key="450"><![CDATA[Csak kép]]></entry>
-	<entry key="451"><![CDATA[Hang és kép nélkül (álló kép)]]></entry>
-	<entry key="452"><![CDATA[Sem hang sem kép nem kerül megosztásra a gépedről, hanem a felhasználói adataidból a feltöltött kép. Használd ezt, ha gondjaid vannak a sávszélességgel vagy nagyon lassú az Interneted.]]></entry>
 	<entry key="453"><![CDATA[h]]></entry>
 	<entry key="454"><![CDATA[k]]></entry>
 	<entry key="455"><![CDATA[sz]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Biztosan kitiltja a látogatót?<br/> Csak a jelenlegi konferenciából kerül kitiltásra. A látogató vissza tud jelentkezni.]]></entry>
 	<entry key="606"><![CDATA[Az Adminisztrátor,Moderátor kitiltotta a teremből.]]></entry>
 	<entry key="607"><![CDATA[Telefon]]></entry>
-	<entry key="610"><![CDATA[(Újra) Indítja az Audio/Video eszköz beállítását]]></entry>
 	<entry key="612"><![CDATA[Visszaveszi a táblára rajzolás lehetőségét]]></entry>
 	<entry key="615"><![CDATA[Tábla]]></entry>
 	<entry key="619"><![CDATA[Terem típusa]]></entry>
@@ -902,6 +890,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Mégse]]></entry>
+	<entry key="lbl.refresh"><![CDATA[frissítés]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[Konferencia szobáim (1-16 résztvevő)]]></entry>
@@ -938,7 +927,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Szám 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Igen/Nem]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[frissítés]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>


[2/3] openmeetings git commit: [OPENMEETINGS-1644] refresh and A/V switch seems to work

Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index 69a5ece..3d55dbf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Halaman Utama]]></entry>
 	<entry key="125"><![CDATA[User]]></entry>
 	<entry key="126"><![CDATA[Group]]></entry>
-	<entry key="127"><![CDATA[Organisasi]]></entry>
 	<entry key="131"><![CDATA[masuk]]></entry>
 	<entry key="135"><![CDATA[Nama Depan]]></entry>
 	<entry key="136"><![CDATA[Nama Belakang]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Informasi alamat]]></entry>
 	<entry key="143"><![CDATA[Data User]]></entry>
 	<entry key="144"><![CDATA[simpan]]></entry>
-	<entry key="146"><![CDATA[ID USER]]></entry>
-	<entry key="149"><![CDATA[nama belakang]]></entry>
 	<entry key="155"><![CDATA[rekot baru]]></entry>
 	<entry key="157"><![CDATA[hapus rekot]]></entry>
 	<entry key="159"><![CDATA[abaikan]]></entry>
 	<entry key="161"><![CDATA[organisasi]]></entry>
 	<entry key="162"><![CDATA[kalender]]></entry>
-	<entry key="164"><![CDATA[ID Organisasi]]></entry>
 	<entry key="165"><![CDATA[nama]]></entry>
 	<entry key="177"><![CDATA[user]]></entry>
 	<entry key="178"><![CDATA[tambah user]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Ruang Konferensi]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[publik]]></entry>
-	<entry key="191"><![CDATA[organisasi]]></entry>
 	<entry key="196"><![CDATA[komentar]]></entry>
 	<entry key="197"><![CDATA[simpan]]></entry>
 	<entry key="199"><![CDATA[simpan sebagai]]></entry>
@@ -196,12 +191,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Ubah besaran garis]]></entry>
 	<entry key="433"><![CDATA[Tamu]]></entry>
 	<entry key="442"><![CDATA[Hapus Log chat di Server]]></entry>
-	<entry key="447"><![CDATA[Pilih Perangkat]]></entry>
-	<entry key="448"><![CDATA[Audio dan Video]]></entry>
-	<entry key="449"><![CDATA[Hanya Audio]]></entry>
-	<entry key="450"><![CDATA[Hanya Video]]></entry>
-	<entry key="451"><![CDATA[Tidak ada Audio/Video (gambar saja)]]></entry>
-	<entry key="452"><![CDATA[Tidak ada Audio/Video dari PC anda, hanya akan menampilkan gambar anda dari profile. Kemungkinan anda mengalami gangguan koneksi internet atau koneksi internet anda lambat.]]></entry>
 	<entry key="453"><![CDATA[Sn]]></entry>
 	<entry key="454"><![CDATA[Sl]]></entry>
 	<entry key="455"><![CDATA[Rb]]></entry>
@@ -283,7 +272,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Do you really want to kick this Client from the Connection?<br/> This does only remove the Client from the current Room.The Client could re-login again.]]></entry>
 	<entry key="606"><![CDATA[Your session has been closed by an Administrator or Moderator.]]></entry>
 	<entry key="607"><![CDATA[Phone]]></entry>
-	<entry key="610"><![CDATA[(Re) Start Audio/Video or change Device Settings]]></entry>
 	<entry key="612"><![CDATA[Remove ability to draw on whiteboard]]></entry>
 	<entry key="615"><![CDATA[Whiteboard]]></entry>
 	<entry key="619"><![CDATA[Room Type]]></entry>
@@ -915,6 +903,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[batal]]></entry>
+	<entry key="lbl.refresh"><![CDATA[panggil ulang]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -951,7 +940,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Angka dari 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Ya/Tidak]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[panggil ulang]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index 84e44df..e66527b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Home]]></entry>
 	<entry key="125"><![CDATA[Utenti]]></entry>
 	<entry key="126"><![CDATA[Gruppi]]></entry>
-	<entry key="127"><![CDATA[Organizzazioni]]></entry>
 	<entry key="131"><![CDATA[Entra]]></entry>
 	<entry key="135"><![CDATA[Nome]]></entry>
 	<entry key="136"><![CDATA[Cognome]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Informazioni]]></entry>
 	<entry key="143"><![CDATA[Dati utente]]></entry>
 	<entry key="144"><![CDATA[Salva]]></entry>
-	<entry key="146"><![CDATA[ID Utente]]></entry>
-	<entry key="149"><![CDATA[Cognome]]></entry>
 	<entry key="155"><![CDATA[Nuovo record]]></entry>
 	<entry key="157"><![CDATA[Elimina record]]></entry>
 	<entry key="159"><![CDATA[Disabilitato]]></entry>
 	<entry key="161"><![CDATA[Organizzazioni]]></entry>
 	<entry key="162"><![CDATA[Calendario]]></entry>
-	<entry key="164"><![CDATA[ID Organizzazione]]></entry>
 	<entry key="165"><![CDATA[Nome]]></entry>
 	<entry key="177"><![CDATA[Utente]]></entry>
 	<entry key="178"><![CDATA[Aggiungi un'utente]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Stanze delle conferenze]]></entry>
 	<entry key="188"><![CDATA[ID]]></entry>
 	<entry key="190"><![CDATA[Pubblico]]></entry>
-	<entry key="191"><![CDATA[Organizzazioni]]></entry>
 	<entry key="196"><![CDATA[Commento]]></entry>
 	<entry key="197"><![CDATA[Salva]]></entry>
 	<entry key="199"><![CDATA[Salva con nome]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Cambia spessore linea]]></entry>
 	<entry key="433"><![CDATA[Ospite]]></entry>
 	<entry key="442"><![CDATA[Cancella i log della chat sul server]]></entry>
-	<entry key="447"><![CDATA[Scegli le periferiche da pubblicare]]></entry>
-	<entry key="448"><![CDATA[Audio e Video]]></entry>
-	<entry key="449"><![CDATA[Solo Audio]]></entry>
-	<entry key="450"><![CDATA[Solo Video]]></entry>
-	<entry key="451"><![CDATA[Nessun Audio/Video (immagine statica)]]></entry>
-	<entry key="452"><![CDATA[Nessun Audio/Video del tuo PC saranno pubblicati, sarà visualizzata solo l'immagine del tuo profilo. Scegli questa impostazione se hai problemi di banda o velocità Internet.]]></entry>
 	<entry key="453"><![CDATA[Lun]]></entry>
 	<entry key="454"><![CDATA[Mar]]></entry>
 	<entry key="455"><![CDATA[Mer]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Sei sicuro di voler chiudere la connessione a questo client?]]></entry>
 	<entry key="606"><![CDATA[La tua sessione è stata chiusa da un amministratore o moderatore]]></entry>
 	<entry key="607"><![CDATA[Telefono]]></entry>
-	<entry key="610"><![CDATA[(Ri) attiva Audio/Video o cambia le impostazioni]]></entry>
 	<entry key="612"><![CDATA[Rimuovi possibilità di disegnare sulla lavagna]]></entry>
 	<entry key="615"><![CDATA[Lavagna]]></entry>
 	<entry key="619"><![CDATA[Tipo stanza]]></entry>
@@ -916,6 +904,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Hash invalido]]></entry>
 	<entry key="lbl.cancel"><![CDATA[annulla]]></entry>
+	<entry key="lbl.refresh"><![CDATA[Aggiorna]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Gestione Email]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Verifica elaborazione e-mails del sistema]]></entry>
 	<entry key="my.room.conference"><![CDATA[Mia stanza conferenza]]></entry>
@@ -952,7 +941,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Numerico 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Si/No]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[Aggiorna]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 9f73d0b..3770f46 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[ホーム]]></entry>
 	<entry key="125"><![CDATA[ユーザー管理]]></entry>
 	<entry key="126"><![CDATA[グループ]]></entry>
-	<entry key="127"><![CDATA[組織管理]]></entry>
 	<entry key="131"><![CDATA[入室]]></entry>
 	<entry key="135"><![CDATA[名]]></entry>
 	<entry key="136"><![CDATA[姓]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[その他情報]]></entry>
 	<entry key="143"><![CDATA[ユーザープロフィール]]></entry>
 	<entry key="144"><![CDATA[保存]]></entry>
-	<entry key="146"><![CDATA[ユーザーID]]></entry>
-	<entry key="149"><![CDATA[姓]]></entry>
 	<entry key="155"><![CDATA[新規作成]]></entry>
 	<entry key="157"><![CDATA[削除]]></entry>
 	<entry key="159"><![CDATA[無効]]></entry>
 	<entry key="161"><![CDATA[組織]]></entry>
 	<entry key="162"><![CDATA[カレンダー]]></entry>
-	<entry key="164"><![CDATA[組織-ID]]></entry>
 	<entry key="165"><![CDATA[名前]]></entry>
 	<entry key="177"><![CDATA[ユーザー]]></entry>
 	<entry key="178"><![CDATA[ユーザー追加]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[会議室]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[公開]]></entry>
-	<entry key="191"><![CDATA[組織]]></entry>
 	<entry key="196"><![CDATA[コメント]]></entry>
 	<entry key="197"><![CDATA[保存]]></entry>
 	<entry key="199"><![CDATA[名前を付けて保存]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[線の太さ]]></entry>
 	<entry key="433"><![CDATA[ゲスト]]></entry>
 	<entry key="442"><![CDATA[チャット記録の削除]]></entry>
-	<entry key="447"><![CDATA[デバイスの選択]]></entry>
-	<entry key="448"><![CDATA[音声/映像]]></entry>
-	<entry key="449"><![CDATA[音声のみ]]></entry>
-	<entry key="450"><![CDATA[映像のみ]]></entry>
-	<entry key="451"><![CDATA[音声/映像なし(静止画像)]]></entry>
-	<entry key="452"><![CDATA[このPCから音声も映像も送信されません。代わりにユーザープロフィールの画像が表示されます。 このオプションは、ネットワーク帯域に問題がある場合や、インターネット接続が著しく遅い場合に選択してください。]]></entry>
 	<entry key="453"><![CDATA[月]]></entry>
 	<entry key="454"><![CDATA[火]]></entry>
 	<entry key="455"><![CDATA[水]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[本当にこのユーザーを追い出してよろしいですか?<br/> 追い出したとしても、ユーザーは単にこの会議室から追い出されるだけです。ユーザーは、再度ログインすることができます。]]></entry>
 	<entry key="606"><![CDATA[管理者または司会者によって、セッションが切断されました。]]></entry>
 	<entry key="607"><![CDATA[電話]]></entry>
-	<entry key="610"><![CDATA[音声/ビデオを開始(再開)する、またはデバイス設定を変更する]]></entry>
 	<entry key="612"><![CDATA[ホワイトボードの利用を禁止する]]></entry>
 	<entry key="615"><![CDATA[ホワイトボード]]></entry>
 	<entry key="619"><![CDATA[会議室タイプ]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[キャンセル]]></entry>
+	<entry key="lbl.refresh"><![CDATA[更新]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[私の会議室 (ユーザー数 1-16 向け)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[1~10の数字]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[はい/いいえ]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[更新]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 43858e7..f1fff39 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[집]]></entry>
 	<entry key="125"><![CDATA[유저]]></entry>
 	<entry key="126"><![CDATA[다체]]></entry>
-	<entry key="127"><![CDATA[조직]]></entry>
 	<entry key="131"><![CDATA[들어가다]]></entry>
 	<entry key="135"><![CDATA[이름]]></entry>
 	<entry key="136"><![CDATA[성]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[주소 인호]]></entry>
 	<entry key="143"><![CDATA[유져데이다]]></entry>
 	<entry key="144"><![CDATA[저장]]></entry>
-	<entry key="146"><![CDATA[USER-ID]]></entry>
-	<entry key="149"><![CDATA[성]]></entry>
 	<entry key="155"><![CDATA[새로운 기록]]></entry>
 	<entry key="157"><![CDATA[기록을 지우다]]></entry>
 	<entry key="159"><![CDATA[무력하게 하다]]></entry>
 	<entry key="161"><![CDATA[조직]]></entry>
 	<entry key="162"><![CDATA[달력]]></entry>
-	<entry key="164"><![CDATA[조직 번호]]></entry>
 	<entry key="165"><![CDATA[이름]]></entry>
 	<entry key="177"><![CDATA[유저]]></entry>
 	<entry key="178"><![CDATA[유저추가]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[회의실]]></entry>
 	<entry key="188"><![CDATA[아이디]]></entry>
 	<entry key="190"><![CDATA[공공장소]]></entry>
-	<entry key="191"><![CDATA[조직]]></entry>
 	<entry key="196"><![CDATA[의견]]></entry>
 	<entry key="197"><![CDATA[저장]]></entry>
 	<entry key="199"><![CDATA[..와 같이 저장 하다]]></entry>
@@ -197,12 +192,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Change Linewidth]]></entry>
 	<entry key="433"><![CDATA[Guest]]></entry>
 	<entry key="442"><![CDATA[Delete Server-Chatlog]]></entry>
-	<entry key="447"><![CDATA[Choose Published Devices]]></entry>
-	<entry key="448"><![CDATA[Audio and Video]]></entry>
-	<entry key="449"><![CDATA[Audio only]]></entry>
-	<entry key="450"><![CDATA[Video only]]></entry>
-	<entry key="451"><![CDATA[no Audio/Video (static Image)]]></entry>
-	<entry key="452"><![CDATA[No Audio/Video from your PC will be published, instead of that a picture from your profile will be shown. Choose these settings if you have problems with your bandwidth or a very slow Internet connection.]]></entry>
 	<entry key="453"><![CDATA[MO]]></entry>
 	<entry key="454"><![CDATA[TU]]></entry>
 	<entry key="455"><![CDATA[WE]]></entry>
@@ -284,7 +273,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Do you really want to kick this Client from the Connection?<br/> This does only remove the Client from the current Room.The Client could re-login again.]]></entry>
 	<entry key="606"><![CDATA[Your session has been closed by an Administrator or Moderator.]]></entry>
 	<entry key="607"><![CDATA[Phone]]></entry>
-	<entry key="610"><![CDATA[(Re) Start Audio/Video or change Device Settings]]></entry>
 	<entry key="612"><![CDATA[Remove ability to draw on whiteboard]]></entry>
 	<entry key="615"><![CDATA[Whiteboard]]></entry>
 	<entry key="619"><![CDATA[Room Type]]></entry>
@@ -916,6 +904,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[무효]]></entry>
+	<entry key="lbl.refresh"><![CDATA[refresh]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -952,7 +941,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[숫자 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[네/아니오]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[refresh]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index a684033..acc278d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Start]]></entry>
 	<entry key="125"><![CDATA[Gebruikers]]></entry>
 	<entry key="126"><![CDATA[Groepen]]></entry>
-	<entry key="127"><![CDATA[Organisaties]]></entry>
 	<entry key="131"><![CDATA[Deelnemen]]></entry>
 	<entry key="135"><![CDATA[Voornaam]]></entry>
 	<entry key="136"><![CDATA[Achternaam]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Meer gegevens]]></entry>
 	<entry key="143"><![CDATA[Gebruikersgegevens]]></entry>
 	<entry key="144"><![CDATA[Opslaan]]></entry>
-	<entry key="146"><![CDATA[USER-ID]]></entry>
-	<entry key="149"><![CDATA[Achternaam]]></entry>
 	<entry key="155"><![CDATA[Toevoegen]]></entry>
 	<entry key="157"><![CDATA[Verwijderen]]></entry>
 	<entry key="159"><![CDATA[Blokkeren]]></entry>
 	<entry key="161"><![CDATA[Organisatie(s)]]></entry>
 	<entry key="162"><![CDATA[Kalender]]></entry>
-	<entry key="164"><![CDATA[ID]]></entry>
 	<entry key="165"><![CDATA[Naam]]></entry>
 	<entry key="177"><![CDATA[Gebruiker]]></entry>
 	<entry key="178"><![CDATA[Gebruiker toevoegen]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Kamer]]></entry>
 	<entry key="188"><![CDATA[ID]]></entry>
 	<entry key="190"><![CDATA[Openbaar]]></entry>
-	<entry key="191"><![CDATA[Organisaties]]></entry>
 	<entry key="196"><![CDATA[Toelichting]]></entry>
 	<entry key="197"><![CDATA[Opslaan en exporteren]]></entry>
 	<entry key="199"><![CDATA[Opslaan als]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Verander lijn dikte]]></entry>
 	<entry key="433"><![CDATA[Gast]]></entry>
 	<entry key="442"><![CDATA[Verwijder Server-Chatlog]]></entry>
-	<entry key="447"><![CDATA[Choose Published Devices]]></entry>
-	<entry key="448"><![CDATA[Beeld en Geluid]]></entry>
-	<entry key="449"><![CDATA[Alleen geluid]]></entry>
-	<entry key="450"><![CDATA[Alleen beeld]]></entry>
-	<entry key="451"><![CDATA[Geen beeld/geluid (pasfoto afbeelden)]]></entry>
-	<entry key="452"><![CDATA[Als er netwerk problemen zijn, kies dan voor pasfoto afbeelden. Je profiel pasfoto wordt hiervoor gebruikt.]]></entry>
 	<entry key="453"><![CDATA[Ma]]></entry>
 	<entry key="454"><![CDATA[Di]]></entry>
 	<entry key="455"><![CDATA[Wo]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Weet je zeker dat je deze gebruiker wilt uitloggen?<br/>De gebruiker zal uit dit overleg worden gehaald. De gebruiker kan wel weer opnieuw deelnemen.]]></entry>
 	<entry key="606"><![CDATA[Je bent door een organisator of beheerder uit het overleg gehaald.]]></entry>
 	<entry key="607"><![CDATA[Telefoon]]></entry>
-	<entry key="610"><![CDATA[(Her) Start beeld/geluid of verander instellingen]]></entry>
 	<entry key="612"><![CDATA[Ontneem gebruiker toestemming om op het tekenbord te tekenen]]></entry>
 	<entry key="615"><![CDATA[Tekenbord]]></entry>
 	<entry key="619"><![CDATA[Kamer soort]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Annuleren]]></entry>
+	<entry key="lbl.refresh"><![CDATA[vernieuwen]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Getal 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Ja/Nee]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[vernieuwen]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 9872a65..a2017c7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Strona startowa]]></entry>
 	<entry key="125"><![CDATA[Użytkownicy]]></entry>
 	<entry key="126"><![CDATA[Grupy]]></entry>
-	<entry key="127"><![CDATA[Organizacje]]></entry>
 	<entry key="131"><![CDATA[Wejdź]]></entry>
 	<entry key="135"><![CDATA[Imię]]></entry>
 	<entry key="136"><![CDATA[Nazwisko]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Informacje adesowe]]></entry>
 	<entry key="143"><![CDATA[Dane użytkownika]]></entry>
 	<entry key="144"><![CDATA[Zapisz]]></entry>
-	<entry key="146"><![CDATA[ID-użytkownika]]></entry>
-	<entry key="149"><![CDATA[Nazwisko]]></entry>
 	<entry key="155"><![CDATA[Nowy wpis]]></entry>
 	<entry key="157"><![CDATA[Skasuj wpis]]></entry>
 	<entry key="159"><![CDATA[zablokowany]]></entry>
 	<entry key="161"><![CDATA[Organizacje]]></entry>
 	<entry key="162"><![CDATA[Kalendarz]]></entry>
-	<entry key="164"><![CDATA[ID-organizacji]]></entry>
 	<entry key="165"><![CDATA[Nazwa]]></entry>
 	<entry key="177"><![CDATA[Użytkownik]]></entry>
 	<entry key="178"><![CDATA[dodaj użytkownika]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Pokoje konferencyjne]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[publiczny]]></entry>
-	<entry key="191"><![CDATA[Organizacje]]></entry>
 	<entry key="196"><![CDATA[Komentarz]]></entry>
 	<entry key="197"><![CDATA[zapisz i eksportuj]]></entry>
 	<entry key="199"><![CDATA[zapisz jako]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Zmień grubość linii]]></entry>
 	<entry key="433"><![CDATA[Gość]]></entry>
 	<entry key="442"><![CDATA[Skasuj transkrypt czatu]]></entry>
-	<entry key="447"><![CDATA[Wybierz udostępniane urządzenia]]></entry>
-	<entry key="448"><![CDATA[Dźwięk and Wideo]]></entry>
-	<entry key="449"><![CDATA[Tylko dźwięk]]></entry>
-	<entry key="450"><![CDATA[Tylko obraz]]></entry>
-	<entry key="451"><![CDATA[bez transmisji Audio/Wideo (statyczny obrazek)]]></entry>
-	<entry key="452"><![CDATA[Nie będzie transmisji audio/wideo z twojego komputera. Zamiast tego zostanie pokazany obrazek (awatar) z twojego profilu. Wybierz te ustawienia, jeśli masz problemy z przepustowością lub bardzo wolne łącze internetowe.]]></entry>
 	<entry key="453"><![CDATA[PO]]></entry>
 	<entry key="454"><![CDATA[WT]]></entry>
 	<entry key="455"><![CDATA[ŚR]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Czy chcesz wyrzucić (rozłączyć) połączenie tego użytkownika? <br/> Wyrzucisz użytkownika z pokoju, ale może on się powtórnie zalogować.]]></entry>
 	<entry key="606"><![CDATA[Połączenie przerwane przez administratora lub moderatora.]]></entry>
 	<entry key="607"><![CDATA[Telefon]]></entry>
-	<entry key="610"><![CDATA[(Re)startuj Audio/Wideo zmień ustawienia urządzeń]]></entry>
 	<entry key="612"><![CDATA[Zabierz temu użytkownikowi prawo do rysowania na tablicy]]></entry>
 	<entry key="615"><![CDATA[Tablica]]></entry>
 	<entry key="619"><![CDATA[Rodzaj pokoju]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[anuluj]]></entry>
+	<entry key="lbl.refresh"><![CDATA[odśwież]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Liczba 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Tak/Nie]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[odśwież]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index fa27dc8..13b718f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[home]]></entry>
 	<entry key="125"><![CDATA[Usuários]]></entry>
 	<entry key="126"><![CDATA[Grupos]]></entry>
-	<entry key="127"><![CDATA[Organizações]]></entry>
 	<entry key="131"><![CDATA[entrar]]></entry>
 	<entry key="135"><![CDATA[Primeiro nome]]></entry>
 	<entry key="136"><![CDATA[Último nome]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Endereço]]></entry>
 	<entry key="143"><![CDATA[Dados do usuário]]></entry>
 	<entry key="144"><![CDATA[salvar]]></entry>
-	<entry key="146"><![CDATA[ID DO USUÁRIO]]></entry>
-	<entry key="149"><![CDATA[último nome]]></entry>
 	<entry key="155"><![CDATA[novo registro]]></entry>
 	<entry key="157"><![CDATA[excluir registro]]></entry>
 	<entry key="159"><![CDATA[desabilitado]]></entry>
 	<entry key="161"><![CDATA[organizações]]></entry>
 	<entry key="162"><![CDATA[calendário]]></entry>
-	<entry key="164"><![CDATA[ID da Organização]]></entry>
 	<entry key="165"><![CDATA[nome]]></entry>
 	<entry key="177"><![CDATA[usuário]]></entry>
 	<entry key="178"><![CDATA[adicionar usuário]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Salas de conferência]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[público]]></entry>
-	<entry key="191"><![CDATA[organizações]]></entry>
 	<entry key="196"><![CDATA[comentário]]></entry>
 	<entry key="197"><![CDATA[salvar]]></entry>
 	<entry key="199"><![CDATA[salvar como]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Mudar tamanho da linha]]></entry>
 	<entry key="433"><![CDATA[Convidado]]></entry>
 	<entry key="442"><![CDATA[Deletar Server-Chatlog]]></entry>
-	<entry key="447"><![CDATA[Escolher adaptadores publicados]]></entry>
-	<entry key="448"><![CDATA[Áudio e Vídeo]]></entry>
-	<entry key="449"><![CDATA[Áudio somente]]></entry>
-	<entry key="450"><![CDATA[Vídeo somente]]></entry>
-	<entry key="451"><![CDATA[sem Áudio/Vídeo (Image estática)]]></entry>
-	<entry key="452"><![CDATA[Nenhum Áudio/Vídeo do seu PC será publicado, ao invés disso uma figura do seu perfil será mostrada. Escolha essas configurações se você tem problemas com sua conexão ou uma conexão de Internet lenta.]]></entry>
 	<entry key="453"><![CDATA[SEG]]></entry>
 	<entry key="454"><![CDATA[TER]]></entry>
 	<entry key="455"><![CDATA[QUA]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Do you really want to kick this Client from the Connection?<br/> This does only remove the Client from the current Room.The Client could re-login again.]]></entry>
 	<entry key="606"><![CDATA[Your session has been closed by an Administrator or Moderator.]]></entry>
 	<entry key="607"><![CDATA[Phone]]></entry>
-	<entry key="610"><![CDATA[(Re) Start Audio/Video or change Device Settings]]></entry>
 	<entry key="612"><![CDATA[Remove ability to draw on whiteboard]]></entry>
 	<entry key="615"><![CDATA[Whiteboard]]></entry>
 	<entry key="619"><![CDATA[Room Type]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[cancelar]]></entry>
+	<entry key="lbl.refresh"><![CDATA[atualizar]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Numérico 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Sim/Não]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[atualizar]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index 9353754..eeff5d3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Início]]></entry>
 	<entry key="125"><![CDATA[Usuários]]></entry>
 	<entry key="126"><![CDATA[Grupos]]></entry>
-	<entry key="127"><![CDATA[Organizações]]></entry>
 	<entry key="131"><![CDATA[entrar]]></entry>
 	<entry key="135"><![CDATA[Primeiro nome]]></entry>
 	<entry key="136"><![CDATA[Último nome]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Endereço]]></entry>
 	<entry key="143"><![CDATA[Dados do usuário]]></entry>
 	<entry key="144"><![CDATA[salvar]]></entry>
-	<entry key="146"><![CDATA[ID]]></entry>
-	<entry key="149"><![CDATA[Ùltimo nome]]></entry>
 	<entry key="155"><![CDATA[novo registro]]></entry>
 	<entry key="157"><![CDATA[excluir registro]]></entry>
 	<entry key="159"><![CDATA[Desabilitado]]></entry>
 	<entry key="161"><![CDATA[organizações]]></entry>
 	<entry key="162"><![CDATA[CALENDÁRIO]]></entry>
-	<entry key="164"><![CDATA[ID da Organização]]></entry>
 	<entry key="165"><![CDATA[nome]]></entry>
 	<entry key="177"><![CDATA[usuário]]></entry>
 	<entry key="178"><![CDATA[adicionar usuário]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Salas de conferência]]></entry>
 	<entry key="188"><![CDATA[id]]></entry>
 	<entry key="190"><![CDATA[público]]></entry>
-	<entry key="191"><![CDATA[organizações]]></entry>
 	<entry key="196"><![CDATA[comentário]]></entry>
 	<entry key="197"><![CDATA[salvar]]></entry>
 	<entry key="199"><![CDATA[salvar como]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Mudar tamanho da linha]]></entry>
 	<entry key="433"><![CDATA[Convidado]]></entry>
 	<entry key="442"><![CDATA[excluir Server-Chatlog]]></entry>
-	<entry key="447"><![CDATA[Escolher adaptadores publicados]]></entry>
-	<entry key="448"><![CDATA[Áudio e Vídeo]]></entry>
-	<entry key="449"><![CDATA[Áudio somente]]></entry>
-	<entry key="450"><![CDATA[Vídeo somente]]></entry>
-	<entry key="451"><![CDATA[sem Áudio/Vídeo (Image estática)]]></entry>
-	<entry key="452"><![CDATA[Nenhum Áudio/Vídeo do seu PC será publicado, ao invés disso uma figura do seu perfil será mostrada. Escolha essas configurações se você tem problemas com sua conexão ou uma conexão de Internet lenta.]]></entry>
 	<entry key="453"><![CDATA[SEG]]></entry>
 	<entry key="454"><![CDATA[TER]]></entry>
 	<entry key="455"><![CDATA[QUA]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Tem certeza que deseja desconectar esse cliente dessa conexão?<br/> Isso somente remove o cliente da sala atual. O cliente pode reconectar-se novamente.]]></entry>
 	<entry key="606"><![CDATA[Sua sessão foi terminada por um Administrador ou Moderador.]]></entry>
 	<entry key="607"><![CDATA[Telefone]]></entry>
-	<entry key="610"><![CDATA[(Re) Inicie áudio/vídeo ou modifique as configurações de dispositivos]]></entry>
 	<entry key="612"><![CDATA[Remover a capacidade de desenhar na lousa]]></entry>
 	<entry key="615"><![CDATA[Lousa]]></entry>
 	<entry key="619"><![CDATA[Tipo de sala]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Cancelar]]></entry>
+	<entry key="lbl.refresh"><![CDATA[atualizar]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[Minha sala de conferência (de 1-16 usuários)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Numérico 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Sim/Não]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[atualizar]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index 53db649..2a9c9e0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[На главную]]></entry>
 	<entry key="125"><![CDATA[Пользователи]]></entry>
 	<entry key="126"><![CDATA[Группы]]></entry>
-	<entry key="127"><![CDATA[Группы]]></entry>
 	<entry key="131"><![CDATA[Вход]]></entry>
 	<entry key="135"><![CDATA[Имя]]></entry>
 	<entry key="136"><![CDATA[Фамилия]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Информация]]></entry>
 	<entry key="143"><![CDATA[Данные пользователя]]></entry>
 	<entry key="144"><![CDATA[Сохранить]]></entry>
-	<entry key="146"><![CDATA[Идент. № пользователя]]></entry>
-	<entry key="149"><![CDATA[Фамилия]]></entry>
 	<entry key="155"><![CDATA[Создать запись]]></entry>
 	<entry key="157"><![CDATA[Удалить запись]]></entry>
 	<entry key="159"><![CDATA[заблокировано]]></entry>
 	<entry key="161"><![CDATA[Организации]]></entry>
 	<entry key="162"><![CDATA[Календарь]]></entry>
-	<entry key="164"><![CDATA[Идент. № орг-ии]]></entry>
 	<entry key="165"><![CDATA[Имя]]></entry>
 	<entry key="177"><![CDATA[Пользователь]]></entry>
 	<entry key="178"><![CDATA[Добавить пользователя]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Комнаты совещаний]]></entry>
 	<entry key="188"><![CDATA[Идент. №]]></entry>
 	<entry key="190"><![CDATA[Публичная комната]]></entry>
-	<entry key="191"><![CDATA[Организации]]></entry>
 	<entry key="196"><![CDATA[Комментарий]]></entry>
 	<entry key="197"><![CDATA[Сохранить]]></entry>
 	<entry key="199"><![CDATA[Сохранить как]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Изменить ширину линий]]></entry>
 	<entry key="433"><![CDATA[Гость]]></entry>
 	<entry key="442"><![CDATA[Удалить лог чата на сервере]]></entry>
-	<entry key="447"><![CDATA[Изменить публичные устройства]]></entry>
-	<entry key="448"><![CDATA[Аудио и видео]]></entry>
-	<entry key="449"><![CDATA[Только аудио]]></entry>
-	<entry key="450"><![CDATA[Только видео]]></entry>
-	<entry key="451"><![CDATA[без аудио и видео (статическое изобр.)]]></entry>
-	<entry key="452"><![CDATA[Аудио/видео с вашего компьютера не будет опубликовано, опубликована будет только картинка из вашего профиля. Выберите эту установку, если вы испытываете проблемы с шириной канала или если у вас медленное соединение с Интернетом]]></entry>
 	<entry key="453"><![CDATA[ПН]]></entry>
 	<entry key="454"><![CDATA[ВТ]]></entry>
 	<entry key="455"><![CDATA[СР]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Вы действительно хотите отключить этого клиента? Клиент может залогиниться вновь]]></entry>
 	<entry key="606"><![CDATA[Ваша сессия завершена администратором или модератором.]]></entry>
 	<entry key="607"><![CDATA[Телефон]]></entry>
-	<entry key="610"><![CDATA[(Ре)старт аудио/видео или изменение установок устройства]]></entry>
 	<entry key="612"><![CDATA[Запретить рисовать на доске]]></entry>
 	<entry key="615"><![CDATA[Доска]]></entry>
 	<entry key="619"><![CDATA[Тип комнаты]]></entry>
@@ -915,6 +903,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Неверный код]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Отменить]]></entry>
+	<entry key="lbl.refresh"><![CDATA[обновить]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Управление письмами]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Проверка статуса отосланных писем]]></entry>
 	<entry key="my.room.conference"><![CDATA[Моя комната для конференций(до 16 участников)]]></entry>
@@ -951,7 +940,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Число 1 - 10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Да/Нет]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Записи группы]]></entry>
-	<entry key="refresh.label"><![CDATA[обновить]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Доступ к групповым файлам ограничен]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[Вы Докладчик в этой комнате.]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Отнять право быть Докладчиком в комнате]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index d2038b2..d8c4109 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Domov]]></entry>
 	<entry key="125"><![CDATA[Používatelia]]></entry>
 	<entry key="126"><![CDATA[Skupiny]]></entry>
-	<entry key="127"><![CDATA[Spoločnosti]]></entry>
 	<entry key="131"><![CDATA[Vstup]]></entry>
 	<entry key="135"><![CDATA[Titul/Meno]]></entry>
 	<entry key="136"><![CDATA[Priezvisko]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Adresa]]></entry>
 	<entry key="143"><![CDATA[Údaje používateľa]]></entry>
 	<entry key="144"><![CDATA[Uložiť]]></entry>
-	<entry key="146"><![CDATA[ID používateľa]]></entry>
-	<entry key="149"><![CDATA[Priezvisko]]></entry>
 	<entry key="155"><![CDATA[Nové nahrávanie]]></entry>
 	<entry key="157"><![CDATA[Zmazať nahrávku]]></entry>
 	<entry key="159"><![CDATA[Zablokované]]></entry>
 	<entry key="161"><![CDATA[Spoločnosti]]></entry>
 	<entry key="162"><![CDATA[Kalendár]]></entry>
-	<entry key="164"><![CDATA[ID spoločnosti]]></entry>
 	<entry key="165"><![CDATA[Meno]]></entry>
 	<entry key="177"><![CDATA[Používateľ]]></entry>
 	<entry key="178"><![CDATA[Pridať používateľa]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Miestnosti]]></entry>
 	<entry key="188"><![CDATA[ID]]></entry>
 	<entry key="190"><![CDATA[Verejné]]></entry>
-	<entry key="191"><![CDATA[Spoločnosti]]></entry>
 	<entry key="196"><![CDATA[Komentovať]]></entry>
 	<entry key="197"><![CDATA[Uložiť a exportovať]]></entry>
 	<entry key="199"><![CDATA[Uložiť ako]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Zmeniť širku]]></entry>
 	<entry key="433"><![CDATA[Hosť]]></entry>
 	<entry key="442"><![CDATA[Delete server chat log]]></entry>
-	<entry key="447"><![CDATA[Vybrať zariadenie]]></entry>
-	<entry key="448"><![CDATA[Audio a video]]></entry>
-	<entry key="449"><![CDATA[Iba audio]]></entry>
-	<entry key="450"><![CDATA[Video iba]]></entry>
-	<entry key="451"><![CDATA[Žiadne audio/video (obrázok)]]></entry>
-	<entry key="452"><![CDATA[Žiadne audio/video z vášho počítača nie je publikované]]></entry>
 	<entry key="453"><![CDATA[Po]]></entry>
 	<entry key="454"><![CDATA[Ut]]></entry>
 	<entry key="455"><![CDATA[Str]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Naozaj chcete vyhodiť tohto klienta z miestnosti?]]></entry>
 	<entry key="606"><![CDATA[Vaše stretnutie bolo zavreté administrátorom alebo moderátorom.]]></entry>
 	<entry key="607"><![CDATA[Telefón]]></entry>
-	<entry key="610"><![CDATA[(Re) štartovať audio/video alebo zmeniť nastavenia zaradenia]]></entry>
 	<entry key="612"><![CDATA[Odobrať právo kresliť na tabuľu]]></entry>
 	<entry key="615"><![CDATA[Tabuľa]]></entry>
 	<entry key="619"><![CDATA[Typ miestnosti]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Zrušiť]]></entry>
+	<entry key="lbl.refresh"><![CDATA[Obnoviť]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Čísla 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Áno/Nie]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[Obnoviť]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index da0bd8e..58b1d97 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Hem]]></entry>
 	<entry key="125"><![CDATA[Användare]]></entry>
 	<entry key="126"><![CDATA[Grupper]]></entry>
-	<entry key="127"><![CDATA[Organisationer]]></entry>
 	<entry key="131"><![CDATA[Stig in]]></entry>
 	<entry key="135"><![CDATA[Förnamn]]></entry>
 	<entry key="136"><![CDATA[Efternamn]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Adress-Info]]></entry>
 	<entry key="143"><![CDATA[Användardata]]></entry>
 	<entry key="144"><![CDATA[Spara]]></entry>
-	<entry key="146"><![CDATA[Användar-ID]]></entry>
-	<entry key="149"><![CDATA[Efternamn]]></entry>
 	<entry key="155"><![CDATA[Nytt innehåll]]></entry>
 	<entry key="157"><![CDATA[Radera innehåll]]></entry>
 	<entry key="159"><![CDATA[Ej tillgänglig]]></entry>
 	<entry key="161"><![CDATA[Organisation]]></entry>
 	<entry key="162"><![CDATA[Kalender]]></entry>
-	<entry key="164"><![CDATA[Organisation-ID]]></entry>
 	<entry key="165"><![CDATA[Namn]]></entry>
 	<entry key="177"><![CDATA[Användare]]></entry>
 	<entry key="178"><![CDATA[Lägg till användare]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Konferensrum]]></entry>
 	<entry key="188"><![CDATA[Id]]></entry>
 	<entry key="190"><![CDATA[Publik]]></entry>
-	<entry key="191"><![CDATA[Organisationer]]></entry>
 	<entry key="196"><![CDATA[Kommentar]]></entry>
 	<entry key="197"><![CDATA[Spara]]></entry>
 	<entry key="199"><![CDATA[Spara som]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Ändra Linjebredd]]></entry>
 	<entry key="433"><![CDATA[Gäst]]></entry>
 	<entry key="442"><![CDATA[Radera Serverns Chatlogg]]></entry>
-	<entry key="447"><![CDATA[Välj Enheter]]></entry>
-	<entry key="448"><![CDATA[Ljud och Video]]></entry>
-	<entry key="449"><![CDATA[Endast Ljud]]></entry>
-	<entry key="450"><![CDATA[Endast Video]]></entry>
-	<entry key="451"><![CDATA[Inget Ljud/Video (statisk bild)]]></entry>
-	<entry key="452"><![CDATA[Inget Ljud/Video kommer att publiceras, i stället kommer en bild från din profil att visas. Välj den här inställningen om du har dålig bandbredd.]]></entry>
 	<entry key="453"><![CDATA[MÅ]]></entry>
 	<entry key="454"><![CDATA[TI]]></entry>
 	<entry key="455"><![CDATA[ON]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Vill du verkligen sparka den här Klienten?<br/> Det här avlägsnar endast Klienten från det aktuella rummet och ger honom möjlighet att återansluta sig.]]></entry>
 	<entry key="606"><![CDATA[Din session har stängts av en Administratör eller Moderator.]]></entry>
 	<entry key="607"><![CDATA[Telefon]]></entry>
-	<entry key="610"><![CDATA[Starta (om) Ljud/Video eller ändra Anordningens Inställningar]]></entry>
 	<entry key="612"><![CDATA[Ta bort möjligheten att rita på Whiteboarden]]></entry>
 	<entry key="615"><![CDATA[Whiteboard]]></entry>
 	<entry key="619"><![CDATA[Typ av rum]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Avbryt]]></entry>
+	<entry key="lbl.refresh"><![CDATA[Uppdatera]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Numerisk 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Ja/Nej]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[Uppdatera]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 8b54497..ea66ca7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[หน้าแรก]]></entry>
 	<entry key="125"><![CDATA[ผู้ใช้]]></entry>
 	<entry key="126"><![CDATA[กลุ่ม]]></entry>
-	<entry key="127"><![CDATA[องค์กร]]></entry>
 	<entry key="131"><![CDATA[เข้าห้อง]]></entry>
 	<entry key="135"><![CDATA[ชื่อ]]></entry>
 	<entry key="136"><![CDATA[นามสกุล]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[ข้อมูลที่อยู่]]></entry>
 	<entry key="143"><![CDATA[ข้อมูลผู้ใช้]]></entry>
 	<entry key="144"><![CDATA[บันทึก]]></entry>
-	<entry key="146"><![CDATA[หมายเลขประจำตัวผู้ใช้]]></entry>
-	<entry key="149"><![CDATA[นามสกุล]]></entry>
 	<entry key="155"><![CDATA[บันทึกใหม่]]></entry>
 	<entry key="157"><![CDATA[ลบบันทึก]]></entry>
 	<entry key="159"><![CDATA[ยกเลิกแล้ว]]></entry>
 	<entry key="161"><![CDATA[องค์กร]]></entry>
 	<entry key="162"><![CDATA[ปฏิทิน]]></entry>
-	<entry key="164"><![CDATA[หมายเลขประจำองค์กร]]></entry>
 	<entry key="165"><![CDATA[ชื่อ]]></entry>
 	<entry key="177"><![CDATA[ผู้ใช้]]></entry>
 	<entry key="178"><![CDATA[เพิ่มผู้ใช้]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[ห้องประชุมกลุ่ม]]></entry>
 	<entry key="188"><![CDATA[หมายเลขประจำตัว]]></entry>
 	<entry key="190"><![CDATA[สาธารณะ]]></entry>
-	<entry key="191"><![CDATA[องค์กร]]></entry>
 	<entry key="196"><![CDATA[ข้อคิดเห็น]]></entry>
 	<entry key="197"><![CDATA[บันทึกและเอ็กซ์พอร์ต]]></entry>
 	<entry key="199"><![CDATA[บันทึกเป็น]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[เปลี่ยนความหนาของเส้น]]></entry>
 	<entry key="433"><![CDATA[แขก]]></entry>
 	<entry key="442"><![CDATA[ลบเซิร์ฟเวอร์-บันทึกการแชท]]></entry>
-	<entry key="447"><![CDATA[เลือกอุปกรณ์ที่ใช้เผยแพร่]]></entry>
-	<entry key="448"><![CDATA[เสียงและภาพวีดีโอ]]></entry>
-	<entry key="449"><![CDATA[เสียงเท่านั้น]]></entry>
-	<entry key="450"><![CDATA[ภาพวีดีโอเท่านั้น]]></entry>
-	<entry key="451"><![CDATA[ไม่มีเสียง/ภาพวีดีโอ (ภาพนิ่ง)]]></entry>
-	<entry key="452"><![CDATA[ไม่เผยแพร่เสียง/ภาพวีดีโอจากเครื่องคอมพิวเตอร์ของคุณสู่สาธารณะ โดยที่จะแสดงภาพจากโปรโฟล์ของคุณแทน ควรเลือกการตั้งค่าเหล่านี้หากคุณมีปัญหากับแบนด์วิธหรืออินเตอร์เน็ตช้ามาก]]></entry>
 	<entry key="453"><![CDATA[จ]]></entry>
 	<entry key="454"><![CDATA[อ]]></entry>
 	<entry key="455"><![CDATA[พ]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Do you really want to kick this Client from the Connection?<br/> This does only remove the Client from the current Room.The Client could re-login again.]]></entry>
 	<entry key="606"><![CDATA[Your session has been closed by an Administrator or Moderator.]]></entry>
 	<entry key="607"><![CDATA[Phone]]></entry>
-	<entry key="610"><![CDATA[(Re) Start Audio/Video or change Device Settings]]></entry>
 	<entry key="612"><![CDATA[Remove ability to draw on whiteboard]]></entry>
 	<entry key="615"><![CDATA[Whiteboard]]></entry>
 	<entry key="619"><![CDATA[Room Type]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[ยกเลิก]]></entry>
+	<entry key="lbl.refresh"><![CDATA[รีเฟรช]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[เลข 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[ใช่/ไม่]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[รีเฟรช]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index dc5604e..d5832c3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Ev]]></entry>
 	<entry key="125"><![CDATA[Kullanıcılar]]></entry>
 	<entry key="126"><![CDATA[Gruplar]]></entry>
-	<entry key="127"><![CDATA[Kurumlar]]></entry>
 	<entry key="131"><![CDATA[giriş]]></entry>
 	<entry key="135"><![CDATA[Ad]]></entry>
 	<entry key="136"><![CDATA[Soyad]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Adres]]></entry>
 	<entry key="143"><![CDATA[Kullanıcı bilgisi]]></entry>
 	<entry key="144"><![CDATA[kaydet]]></entry>
-	<entry key="146"><![CDATA[Kullanıcı kodu]]></entry>
-	<entry key="149"><![CDATA[Soyad]]></entry>
 	<entry key="155"><![CDATA[yeni kayıt]]></entry>
 	<entry key="157"><![CDATA[kayıt sil]]></entry>
 	<entry key="159"><![CDATA[devre dışı]]></entry>
 	<entry key="161"><![CDATA[Kurumlar]]></entry>
 	<entry key="162"><![CDATA[takvim]]></entry>
-	<entry key="164"><![CDATA[Kurum Kodu]]></entry>
 	<entry key="165"><![CDATA[Ad]]></entry>
 	<entry key="177"><![CDATA[kullanıcı]]></entry>
 	<entry key="178"><![CDATA[kullanıcı ekle]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Konferans Odaları]]></entry>
 	<entry key="188"><![CDATA[kod]]></entry>
 	<entry key="190"><![CDATA[herkese açık]]></entry>
-	<entry key="191"><![CDATA[Kurumlar]]></entry>
 	<entry key="196"><![CDATA[Yorum]]></entry>
 	<entry key="197"><![CDATA[kaydet]]></entry>
 	<entry key="199"><![CDATA[farklı kaydet]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Çizgi genişliğini değiştir]]></entry>
 	<entry key="433"><![CDATA[Misafir]]></entry>
 	<entry key="442"><![CDATA[Sunucu sohbet kayıtlarını sil]]></entry>
-	<entry key="447"><![CDATA[Yayınlanmış Araçları Seç]]></entry>
-	<entry key="448"><![CDATA[Ses ve Görüntü]]></entry>
-	<entry key="449"><![CDATA[Sadece Ses]]></entry>
-	<entry key="450"><![CDATA[Sadece Görüntü]]></entry>
-	<entry key="451"><![CDATA[Ses Görüntü yok (sabit resim)]]></entry>
-	<entry key="452"><![CDATA[Bilgisayarınız tarafından yayınlanabilecek olan ses / görüntü bulunmamaktadır, bunun yerine profilinizde yer alan resim kullnılacaktır. Bu seçeneği bant genişliğinizde bir sorun varsa ya da İnternet bağlantınız çok yavaşsa tercih ediniz.]]></entry>
 	<entry key="453"><![CDATA[PZT]]></entry>
 	<entry key="454"><![CDATA[SAL]]></entry>
 	<entry key="455"><![CDATA[ÇAR]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Bu istemciyi bağlantıdan çıkarmak istediğinize emin misiniz?<br/>Bu işlem sadece uyarı amaçlıdır ve kullanıcının odaya yeniden giriş yapmasını engellemez.]]></entry>
 	<entry key="606"><![CDATA[Oturumunuz Yönetici veya Düzenleyici tarafından sonlandırıldı.]]></entry>
 	<entry key="607"><![CDATA[Telefon]]></entry>
-	<entry key="610"><![CDATA[Ses/Görüntüyü (Yeniden) Başlat veya Aygıt Ayarlarını değiştir]]></entry>
 	<entry key="612"><![CDATA[Kullanıcının Karatahtayı kullanmasını engelle]]></entry>
 	<entry key="615"><![CDATA[Karatahta]]></entry>
 	<entry key="619"><![CDATA[Oda Tipi]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[iptal]]></entry>
+	<entry key="lbl.refresh"><![CDATA[yenile]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[Sayısal 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Evet/Hayır]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[yenile]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index ac395e9..2faaad2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[На головну]]></entry>
 	<entry key="125"><![CDATA[Користувачі]]></entry>
 	<entry key="126"><![CDATA[Групи]]></entry>
-	<entry key="127"><![CDATA[Організації]]></entry>
 	<entry key="131"><![CDATA[Вхід]]></entry>
 	<entry key="135"><![CDATA[Ім'я]]></entry>
 	<entry key="136"><![CDATA[Прізвище]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[Додаткова brінформація]]></entry>
 	<entry key="143"><![CDATA[Дані користувача]]></entry>
 	<entry key="144"><![CDATA[Зберегти]]></entry>
-	<entry key="146"><![CDATA[Ідент. № користувача]]></entry>
-	<entry key="149"><![CDATA[Прізвище]]></entry>
 	<entry key="155"><![CDATA[Створити запис]]></entry>
 	<entry key="157"><![CDATA[Стерти запис]]></entry>
 	<entry key="159"><![CDATA[Заблоковано]]></entry>
 	<entry key="161"><![CDATA[Організації]]></entry>
 	<entry key="162"><![CDATA[Календар]]></entry>
-	<entry key="164"><![CDATA[Ідент. № організації]]></entry>
 	<entry key="165"><![CDATA[Ім'я]]></entry>
 	<entry key="177"><![CDATA[Користувач]]></entry>
 	<entry key="178"><![CDATA[Додати користувача]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[Кімнати для конференцій]]></entry>
 	<entry key="188"><![CDATA[Ідент. №]]></entry>
 	<entry key="190"><![CDATA[Публічно]]></entry>
-	<entry key="191"><![CDATA[Організації]]></entry>
 	<entry key="196"><![CDATA[Коментар]]></entry>
 	<entry key="197"><![CDATA[Зберегти]]></entry>
 	<entry key="199"><![CDATA[Зберегти як]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[Змінити ширину лінії]]></entry>
 	<entry key="433"><![CDATA[Гість]]></entry>
 	<entry key="442"><![CDATA[Стерти лог чату серверу]]></entry>
-	<entry key="447"><![CDATA[Виберіть публічні пристрої]]></entry>
-	<entry key="448"><![CDATA[Аудіо і відео]]></entry>
-	<entry key="449"><![CDATA[Лише аудіо]]></entry>
-	<entry key="450"><![CDATA[Лише відео]]></entry>
-	<entry key="451"><![CDATA[без Аудіо/Відео (статичні малюнки)]]></entry>
-	<entry key="452"><![CDATA[Без показу Аудіо/Відео від вашого ПК. Буде доступна лиша картинка вашого профілю. Виберіть ці параметри якщо у вас поганий канал Internet.]]></entry>
 	<entry key="453"><![CDATA[ПН]]></entry>
 	<entry key="454"><![CDATA[ВТ]]></entry>
 	<entry key="455"><![CDATA[СР]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Ви дійсно хочете відключить цього клієнта? Клієнт може залогуватися знову]]></entry>
 	<entry key="606"><![CDATA[Ваша сесія завершена адміністратором або модератором.]]></entry>
 	<entry key="607"><![CDATA[Телефон]]></entry>
-	<entry key="610"><![CDATA[(Ре)старт аудіо/відео або зміна установок пристрою]]></entry>
 	<entry key="612"><![CDATA[Заборонити малювати на дошці]]></entry>
 	<entry key="615"><![CDATA[Дошка]]></entry>
 	<entry key="619"><![CDATA[Тип кімнати]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Скасувати]]></entry>
+	<entry key="lbl.refresh"><![CDATA[Оновити]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Управління листами]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Перевірка статусу надісланих листів]]></entry>
 	<entry key="my.room.conference"><![CDATA[Моя кімната для конференцій(до 16 учасників)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[В числовому порядку 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[Так/Ні]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[Оновити]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 617e6a7..d0e7b55 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[首页]]></entry>
 	<entry key="125"><![CDATA[用户管理]]></entry>
 	<entry key="126"><![CDATA[群组管理]]></entry>
-	<entry key="127"><![CDATA[组织管理]]></entry>
 	<entry key="131"><![CDATA[进入]]></entry>
 	<entry key="135"><![CDATA[姓]]></entry>
 	<entry key="136"><![CDATA[名]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[详细地址]]></entry>
 	<entry key="143"><![CDATA[用户数据]]></entry>
 	<entry key="144"><![CDATA[保存]]></entry>
-	<entry key="146"><![CDATA[用户编号]]></entry>
-	<entry key="149"><![CDATA[名]]></entry>
 	<entry key="155"><![CDATA[新记录]]></entry>
 	<entry key="157"><![CDATA[删除记录]]></entry>
 	<entry key="159"><![CDATA[禁止]]></entry>
 	<entry key="161"><![CDATA[组织管理]]></entry>
 	<entry key="162"><![CDATA[日历]]></entry>
-	<entry key="164"><![CDATA[组织编号]]></entry>
 	<entry key="165"><![CDATA[名称]]></entry>
 	<entry key="177"><![CDATA[用户]]></entry>
 	<entry key="178"><![CDATA[添加用户]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[会议室]]></entry>
 	<entry key="188"><![CDATA[编号]]></entry>
 	<entry key="190"><![CDATA[公开]]></entry>
-	<entry key="191"><![CDATA[组织]]></entry>
 	<entry key="196"><![CDATA[备注]]></entry>
 	<entry key="197"><![CDATA[保存]]></entry>
 	<entry key="199"><![CDATA[另存为]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[修改 线宽]]></entry>
 	<entry key="433"><![CDATA[客人]]></entry>
 	<entry key="442"><![CDATA[删除服务器端讨论记录]]></entry>
-	<entry key="447"><![CDATA[选择发布设备]]></entry>
-	<entry key="448"><![CDATA[音频和视频]]></entry>
-	<entry key="449"><![CDATA[只有音频]]></entry>
-	<entry key="450"><![CDATA[只有视频]]></entry>
-	<entry key="451"><![CDATA[无 音频/视频 (静态图片)]]></entry>
-	<entry key="452"><![CDATA[你的个人电脑上将不会有 音频/视频 发布, 而用你个人信息里的图片代替显示. 如果你遇到带宽问题或者速度过慢, 请选择这些设置.]]></entry>
 	<entry key="453"><![CDATA[一]]></entry>
 	<entry key="454"><![CDATA[二]]></entry>
 	<entry key="455"><![CDATA[三]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[你确认从此连接断开用户?<br/> 仅将用户从此房间踢出.用户可以重新连入.]]></entry>
 	<entry key="606"><![CDATA[你的会话已经被管理员或主持人关闭.]]></entry>
 	<entry key="607"><![CDATA[电话]]></entry>
-	<entry key="610"><![CDATA[(Re) 启动音频/视频 或者修改设备配置]]></entry>
 	<entry key="612"><![CDATA[移除在白板画画功能]]></entry>
 	<entry key="615"><![CDATA[白板]]></entry>
 	<entry key="619"><![CDATA[会议室类型]]></entry>
@@ -904,6 +892,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[取消]]></entry>
+	<entry key="lbl.refresh"><![CDATA[刷新]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[在线会议室(1-16人)]]></entry>
@@ -940,7 +929,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[数字 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[是/否]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[刷新]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index f85725f..4dfaf0d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -84,7 +84,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[首頁]]></entry>
 	<entry key="125"><![CDATA[用戶管理]]></entry>
 	<entry key="126"><![CDATA[團體管理]]></entry>
-	<entry key="127"><![CDATA[組織管理]]></entry>
 	<entry key="131"><![CDATA[進入]]></entry>
 	<entry key="135"><![CDATA[名稱]]></entry>
 	<entry key="136"><![CDATA[姓氏]]></entry>
@@ -95,14 +94,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="142"><![CDATA[地址-信息]]></entry>
 	<entry key="143"><![CDATA[用户资料]]></entry>
 	<entry key="144"><![CDATA[保存]]></entry>
-	<entry key="146"><![CDATA[用户-ID]]></entry>
-	<entry key="149"><![CDATA[姓氏]]></entry>
 	<entry key="155"><![CDATA[新紀錄]]></entry>
 	<entry key="157"><![CDATA[刪除紀錄]]></entry>
 	<entry key="159"><![CDATA[關閉]]></entry>
 	<entry key="161"><![CDATA[組織]]></entry>
 	<entry key="162"><![CDATA[日曆]]></entry>
-	<entry key="164"><![CDATA[組織 -ID]]></entry>
 	<entry key="165"><![CDATA[名稱]]></entry>
 	<entry key="177"><![CDATA[用戶]]></entry>
 	<entry key="178"><![CDATA[增加用戶]]></entry>
@@ -110,7 +106,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="187"><![CDATA[會議室]]></entry>
 	<entry key="188"><![CDATA[身份證]]></entry>
 	<entry key="190"><![CDATA[公開]]></entry>
-	<entry key="191"><![CDATA[組織]]></entry>
 	<entry key="196"><![CDATA[評論]]></entry>
 	<entry key="197"><![CDATA[保存]]></entry>
 	<entry key="199"><![CDATA[另存為]]></entry>
@@ -195,12 +190,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="429"><![CDATA[改變線寬]]></entry>
 	<entry key="433"><![CDATA[客戶]]></entry>
 	<entry key="442"><![CDATA[刪除服務器 聊天記錄]]></entry>
-	<entry key="447"><![CDATA[選擇播放裝置]]></entry>
-	<entry key="448"><![CDATA[音頻和視頻]]></entry>
-	<entry key="449"><![CDATA[僅音頻]]></entry>
-	<entry key="450"><![CDATA[僅視頻]]></entry>
-	<entry key="451"><![CDATA[沒有音頻/視頻(靜態影像)]]></entry>
-	<entry key="452"><![CDATA[沒有音頻/視頻從你的個人電腦將會公佈,而不是一個圖片從你的檔案就會顯示。選擇這些設置,如果您有問題,與你的帶寬還是一個非常緩慢的互聯網連接。]]></entry>
 	<entry key="453"><![CDATA[MO]]></entry>
 	<entry key="454"><![CDATA[TU]]></entry>
 	<entry key="455"><![CDATA[WE]]></entry>
@@ -282,7 +271,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Do you really want to kick this Client from the Connection?<br/> This does only remove the Client from the current Room.The Client could re-login again.]]></entry>
 	<entry key="606"><![CDATA[Your session has been closed by an Administrator or Moderator.]]></entry>
 	<entry key="607"><![CDATA[Phone]]></entry>
-	<entry key="610"><![CDATA[(Re) Start Audio/Video or change Device Settings]]></entry>
 	<entry key="612"><![CDATA[Remove ability to draw on whiteboard]]></entry>
 	<entry key="615"><![CDATA[Whiteboard]]></entry>
 	<entry key="619"><![CDATA[Room Type]]></entry>
@@ -914,6 +902,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="lbl.cancel"><![CDATA[取消]]></entry>
+	<entry key="lbl.refresh"><![CDATA[刷新]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
@@ -950,7 +939,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="poll.type.numeric"><![CDATA[數字的 1-10]]></entry>
 	<entry key="poll.type.yesNo"><![CDATA[是/否]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Group recordings]]></entry>
-	<entry key="refresh.label"><![CDATA[刷新]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="right.presenter.allowed.self"><![CDATA[You granted right to be presenter in this room]]></entry>
 	<entry key="right.presenter.remove"><![CDATA[Remove right to be presenter in this room]]></entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
index 39d8368..a8f5505 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.html
@@ -22,6 +22,6 @@
 <wicket:panel>
 	<input type="text" wicket:id="captchaText" wicket:message="placeholder:captcha.text,title:captcha.text" style="margin-bottom: 5px;"/><br/>
 	<img wicket:id="captcha" style="vertical-align: bottom;"/>
-	<span wicket:id="refresh" wicket:message="alt:refresh.label,title:refresh.label"><wicket:message key="refresh.label"/></span>
+	<span wicket:id="refresh" wicket:message="alt:lbl.refresh,title:lbl.refresh"><wicket:message key="lbl.refresh"/></span>
 </wicket:panel>
 </html>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
index 1860b12..38aa767 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
@@ -25,7 +25,7 @@
 			<input type="submit" value="" wicket:id="ajax-save-button" wicket:message="title:144" />
 		</div>
 		<div class="formRefreshButton">
-			<input type="submit" value="" wicket:id="ajax-refresh-button" wicket:message="title:refresh.label" />
+			<input type="submit" value="" wicket:id="ajax-refresh-button" wicket:message="title:lbl.refresh" />
 		</div>
 		<wicket:child/>
 	</div>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d74a46a3/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
index 34220e7..758cd48 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
@@ -21,26 +21,11 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<form wicket:id="form">
-	<script type="text/javascript">
-		function dragHelper() {
-			var s = $(this);
-			if (s.parents('a').hasClass('ui-state-active')) {
-				s = $('.ui-state-active .ui-draggable.ui-draggable-handle');
-			}
-			var c = $('<div/>').attr('id', 'draggingContainer').width(80).height(36);
-			var h = $('<div class="ui-corner-all ui-widget-header"/>').append(s.clone()).width(s.width());
-			return c.append(h);
-		}
-		function treeRevert(dropped) {
-			$('.file.tree .trees')[0].scrollTop = $(this).parent()[0].offsetTop - 32;
-			return !dropped || (!!dropped && !!dropped.context && $(dropped.context).hasClass('wb', 'room'));
-		}
-	</script>
 	<div class="file tree item drop area">
 		<div class="icons clear trash-toolbar" wicket:id="trash-toolbar" wicket:message="title:705">
 			<span wicket:id="upload" wicket:message="title:702"></span>
 			<span wicket:id="create" wicket:message="title:703"></span>
-			<span wicket:id="refresh" class="refresh om-icon big align-left clickable" wicket:message="title:refresh.label"></span>
+			<span wicket:id="refresh" class="refresh om-icon big align-left clickable" wicket:message="title:lbl.refresh"></span>
 			<span wicket:id="trash"></span>
 			<div class="clear"></div>
 		</div>