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/08/23 15:42:09 UTC
[2/2] openmeetings git commit: [OPENMEETINGS-1644] User speaks
indicator is added
[OPENMEETINGS-1644] User speaks indicator is added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/61308322
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/61308322
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/61308322
Branch: refs/heads/master
Commit: 613083228c4f835e9fe71aaf72fd6284470ae9b1
Parents: 7a592e7
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Aug 23 22:41:57 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Aug 23 22:41:57 2017 +0700
----------------------------------------------------------------------
.../core/remote/ScopeApplicationAdapter.java | 13 ++++--
openmeetings-flash/src/main/flex/main.mxml | 45 +++++++++++++++++---
.../flex/org/apache/openmeetings/OmVideo.as | 9 ++++
.../openmeetings/service/user/UserManager.java | 4 +-
.../openmeetings/util/message/RoomMessage.java | 1 +
.../web/app/Application.properties.xml | 6 +--
.../web/app/Application_ar.properties.xml | 6 +--
.../web/app/Application_bg.properties.xml | 6 +--
.../web/app/Application_ca.properties.xml | 6 +--
.../web/app/Application_cs.properties.xml | 6 +--
.../web/app/Application_da.properties.xml | 6 +--
.../web/app/Application_de.properties.xml | 6 +--
.../web/app/Application_el.properties.xml | 6 +--
.../web/app/Application_es.properties.xml | 6 +--
.../web/app/Application_fa.properties.xml | 6 +--
.../web/app/Application_fi.properties.xml | 6 +--
.../web/app/Application_fr.properties.xml | 6 +--
.../web/app/Application_gl.properties.xml | 6 +--
.../web/app/Application_hu.properties.xml | 6 +--
.../web/app/Application_id.properties.xml | 6 +--
.../web/app/Application_it.properties.xml | 6 +--
.../web/app/Application_ja.properties.xml | 6 +--
.../web/app/Application_ko.properties.xml | 6 +--
.../web/app/Application_nl.properties.xml | 6 +--
.../web/app/Application_pl.properties.xml | 6 +--
.../web/app/Application_pt.properties.xml | 6 +--
.../web/app/Application_pt_BR.properties.xml | 6 +--
.../web/app/Application_ru.properties.xml | 6 +--
.../web/app/Application_sk.properties.xml | 6 +--
.../web/app/Application_sv.properties.xml | 6 +--
.../web/app/Application_th.properties.xml | 6 +--
.../web/app/Application_tr.properties.xml | 6 +--
.../web/app/Application_uk.properties.xml | 6 +--
.../web/app/Application_zh_CN.properties.xml | 6 +--
.../web/app/Application_zh_TW.properties.xml | 6 +--
.../apache/openmeetings/web/common/Captcha.html | 2 +-
.../web/common/FormSaveRefreshPanel.html | 2 +-
.../web/common/tree/FileTreePanel.html | 2 +-
.../apache/openmeetings/web/room/RoomPanel.html | 9 +++-
.../apache/openmeetings/web/room/RoomPanel.java | 13 ++++++
.../org/apache/openmeetings/web/room/room.js | 17 ++++----
pom.xml | 4 +-
42 files changed, 154 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index b531e8e..6682c1f 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -870,9 +870,9 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
* @param clientId
* @return 1 in case of success, -1 otherwise
*/
- public int sendMessageById(Object newMessage, final Long id, IScope scope) {
+ public int sendMessageById(Object newMessage, final String uid, IScope scope) {
try {
- _log.debug("### sendMessageById ### {}", id);
+ _log.debug("### sendMessageById ### {}", uid);
Map<String, Object> hsm = new HashMap<>();
hsm.put("message", newMessage);
@@ -881,7 +881,7 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
for (IConnection conn : scope.getClientConnections()) {
if (conn != null) {
if (conn instanceof IServiceCapableConnection) {
- if (id.equals(IClientUtil.getId(conn.getClient()))) {
+ if (uid.equals(IClientUtil.getId(conn.getClient()))) {
((IServiceCapableConnection) conn).invoke("sendVarsToMessageWithClient", new Object[] { hsm }, this);
}
}
@@ -1082,6 +1082,13 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
}
}
+ public void micActivity(boolean active) {
+ IConnection current = Red5.getConnectionLocal();
+ StreamClient client = sessionManager.get(IClientUtil.getId(current.getClient()));
+ WebSocketHelper.sendRoom(new TextRoomMessage(client.getRoomId(), client.getUserId(), RoomMessage.Type.audioActivity
+ , new JSONObject().put("sid", client.getOwnerSid()).put("active", active).toString()));
+ }
+
/*
* SIP transport methods
*/
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 092ac2e..3c69a43 100644
--- a/openmeetings-flash/src/main/flex/main.mxml
+++ b/openmeetings-flash/src/main/flex/main.mxml
@@ -29,6 +29,7 @@
</fx:Declarations>
<fx:Script><![CDATA[
import mx.core.FlexGlobals;
+ import mx.graphics.SolidColor;
import mx.utils.UIDUtil;
import org.apache.openmeetings.OmVideo;
@@ -46,6 +47,8 @@
private var recName:String;
private var mic:Microphone = null;
private var activities:Array = [];
+ private var activityTimer:Timer = new Timer(100);
+ private var active:Boolean = false;
[Bindable]
private var interview:Boolean = false;
@@ -138,8 +141,13 @@
if (_hasVideo(c.activities) && hasVideo()) {
_hasAudio(c.activities) ? video.unmute() : video.mute();
}
+ if (mic != null) {
+ activityTimer.start();
+ } else {
+ activityTimer.stop();
+ }
activities = c.activities;
- debug("Client updated: ", c);
+ //debug("Client updated: ", c);
});
ExternalInterface.addCallback("setVolume", function (vol:int):void {
if (hasAudio()) {
@@ -151,7 +159,14 @@
video.reset();
var broadcastId:String = UIDUtil.createUID();
debug("BroadcastId = " + broadcastId);
- video.broadcast(broadcastId, hasVideo() ? getCam() : null, getMic());
+ activityTimer.addEventListener(TimerEvent.TIMER, broadcastTimerListener);
+ mic = getMic();
+ if (mic != null) {
+ volumeRect.visible = true;
+ volumeRect.fill = new SolidColor(0x00FF00);
+ activityTimer.start();
+ }
+ video.broadcast(broadcastId, hasVideo() ? getCam() : null, mic);
if (!hasAudio()) {
video.mute();
}
@@ -328,6 +343,25 @@
video.play(recName + ".flv");
}
+ private function testTimerListener(event:TimerEvent):void {
+ ExternalInterface.call("VideoSettings.micActivity", mic.activityLevel);
+ }
+
+ private function broadcastTimerListener(event:TimerEvent):void {
+ var params:Object = FlexGlobals.topLevelApplication.parameters;
+ var _active:Boolean = mic.activityLevel > 8;
+ var h:int = video.height - 10;
+ var ah:int = Math.round(mic.activityLevel * h / 100);
+ volumeRect.y = 5 + h - ah;
+ volumeRect.height = ah;
+ if (active !== _active) {
+ active = _active;
+ video.getNc().call("micActivity", new Responder(function (res:Object):void {
+ }), active);
+ ExternalInterface.call("VideoManager.micActivity", params.uid, active);
+ }
+ }
+
private function startTestRecording():void {
try {
var counter:int = 5;
@@ -337,10 +371,7 @@
var t:Date = new Date();
recName = "TEST_SETUP_" + t.getTime();
mic = getMic();
- var activityTimer:Timer = new Timer(100);
- activityTimer.addEventListener(TimerEvent.TIMER, function (event:TimerEvent):void {
- ExternalInterface.call("VideoSettings.micActivity", mic.activityLevel);
- });
+ activityTimer.addEventListener(TimerEvent.TIMER, testTimerListener);
video.record(recName, getCam(), mic, function ():void {
if (mic != null) {
activityTimer.start();
@@ -352,6 +383,7 @@
ExternalInterface.call("VideoSettings.allowPlay");
playTestRecording();
activityTimer.stop();
+ activityTimer.removeEventListener(TimerEvent.TIMER, testTimerListener);
mic = null;
}
});
@@ -364,6 +396,7 @@
]]></fx:Script>
<mx:UIComponent id="videoDisplay" width="0" height="0" />
+ <s:Rect id="volumeRect" x="5" y="5" width="10" height="100" visible="false" />
<s:Label id="timerText" height="20" width="45" x="20" y="5" paddingLeft="5" paddingTop="5"
visible="false" backgroundColor="0xf5f5f5" fontWeight="bold"><s:text></s:text></s:Label>
</s:Application>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
index e3d9d4e..b6cd258 100644
--- a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
+++ b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
@@ -30,6 +30,7 @@ import flash.media.VideoStreamSettings;
import flash.media.SoundTransform;
import flash.net.NetConnection;
import flash.net.NetStream;
+import flash.net.Responder;
import mx.core.UIComponent;
public class OmVideo {
@@ -67,6 +68,10 @@ public class OmVideo {
return vid;
}
+ public function getMic():Microphone {
+ return mic;
+ }
+
public function resize(width:int, height:int):void {
this.width = ui.width = width;
this.height = ui.height = height;
@@ -305,5 +310,9 @@ public class OmVideo {
}
ns = null;
}
+
+ public function getNc():NetConnection {
+ return nc;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
index 2fb9bc5..f6e7b0e 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
@@ -332,7 +332,7 @@ public class UserManager implements IUserManager {
Map<Integer, String> messageObj = new HashMap<>();
messageObj.put(0, "kick");
- scopeApplicationAdapter.sendMessageById(messageObj, rcl.getId(), currentScope);
+ scopeApplicationAdapter.sendMessageById(messageObj, rcl.getUid(), currentScope);
}
return true;
} catch (Exception err) {
@@ -362,7 +362,7 @@ public class UserManager implements IUserManager {
Map<Integer, String> messageObj = new HashMap<>();
messageObj.put(0, "kick");
- scopeApplicationAdapter.sendMessageById(messageObj, rcl.getId(), scope);
+ scopeApplicationAdapter.sendMessageById(messageObj, uid, scope);
scopeApplicationAdapter.roomLeaveByScope(rcl, scope);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java
index 40cbffc..3e1cb0f 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java
@@ -50,6 +50,7 @@ public class RoomMessage implements IWebSocketPushMessage {
, kick
, newStream
, closeStream
+ , audioActivity //user speaks
}
private final Date timestamp;
private final String uid;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 e63c6fe..5d9d68c 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
@@ -168,7 +168,6 @@
<entry key="153">Cancel</entry>
<entry key="154">Delete</entry>
<entry key="155">New record</entry>
- <entry key="156">Refresh record</entry>
<entry key="157">Delete record</entry>
<entry key="158">Status</entry>
<entry key="159">Disabled</entry>
@@ -391,7 +390,7 @@
<entry key="399">Joined</entry>
<entry key="400"></entry>
<entry key="401">Users in this room</entry>
- <entry key="402">Refresh</entry>
+ <entry key="refresh.label">Refresh</entry>
<entry key="404">Click on a room to get the room details</entry>
<entry key="405">Chat with the users in this room</entry>
<entry key="406">Room</entry>
@@ -677,7 +676,6 @@
<entry key="701">Year</entry>
<entry key="702">Upload file</entry>
<entry key="703">Add folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (drag and drop item here)</entry>
<entry key="706">My files (home drive)</entry>
<entry key="707">Room files (public drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 c6a039f..dc667a9 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
@@ -168,7 +168,6 @@
<entry key="153">الغاء</entry>
<entry key="154">حذف</entry>
<entry key="155">قياسيه جديدة</entry>
- <entry key="156">تجديد السجل</entry>
<entry key="157">حذف سجل</entry>
<entry key="158">المركز</entry>
<entry key="159">فاقد الاهليه</entry>
@@ -391,7 +390,7 @@
<entry key="399">إنضم:</entry>
<entry key="400"></entry>
<entry key="401">المستخدمين في هذه الغرفة:</entry>
- <entry key="402">تحديث</entry>
+ <entry key="refresh.label">تحديث</entry>
<entry key="404">إضغط على الغرفة للحصول على تفاصيل</entry>
<entry key="405">دردشة مع المستخدمين في هذه الغرفة:</entry>
<entry key="406">غرفة:</entry>
@@ -677,7 +676,6 @@
<entry key="701">سنة</entry>
<entry key="702">إيداع ملف</entry>
<entry key="703">إضافة مجلد</entry>
- <entry key="704">تحديث</entry>
<entry key="705">قمامة</entry>
<entry key="706">ملفاتي (Home Drive)</entry>
<entry key="707">غرفة الملفات (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 ee3615c..aefa338 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
@@ -168,7 +168,6 @@
<entry key="153">Отказ</entry>
<entry key="154">Изтриване</entry>
<entry key="155">Нов запис</entry>
- <entry key="156">Опресняване на записа</entry>
<entry key="157">Изтриване на запис</entry>
<entry key="158">Статус</entry>
<entry key="159">изключен</entry>
@@ -391,7 +390,7 @@
<entry key="399">Включили се:</entry>
<entry key="400"></entry>
<entry key="401">Потребители в тази стая:</entry>
- <entry key="402">опресняване</entry>
+ <entry key="refresh.label">опресняване</entry>
<entry key="404">натиснете върху стая за детайли</entry>
<entry key="405">Чат с потребителите от тази стая:</entry>
<entry key="406">Стая:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Година</entry>
<entry key="702">Качване на файл</entry>
<entry key="703">Нова папка</entry>
- <entry key="704">Опресняване</entry>
<entry key="705">Кошче</entry>
<entry key="706">Моите файлове (home)</entry>
<entry key="707">Файлове за стаята</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 c203590..c3f3f05 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
@@ -168,7 +168,6 @@
<entry key="153">cancel·lar</entry>
<entry key="154">borrar</entry>
<entry key="155">Nou registre</entry>
- <entry key="156">Actualitzar registre</entry>
<entry key="157">Esborrar registre</entry>
<entry key="158">Estat</entry>
<entry key="159">no actiu</entry>
@@ -391,7 +390,7 @@
<entry key="399">En el sistema:</entry>
<entry key="400"></entry>
<entry key="401">Usuaris en la sala:</entry>
- <entry key="402">actualitzar</entry>
+ <entry key="refresh.label">actualitzar</entry>
<entry key="404">Premi sobre una sala per a veure els detalls</entry>
<entry key="405">Escriure als usuaris d'aquesta sala:</entry>
<entry key="406">Sala:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Any</entry>
<entry key="702">Pujar fitxer</entry>
<entry key="703">Fitxer carpeta</entry>
- <entry key="704">Actualizar</entry>
<entry key="705">Papelera</entry>
<entry key="706">Els meus Arxius (Dispositiu personal)</entry>
<entry key="707">Arxius de la Sala (Dispositiu públic)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 6459b67..872f2ee 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
@@ -168,7 +168,6 @@
<entry key="153">zruš</entry>
<entry key="154">smaž</entry>
<entry key="155">nový záznam</entry>
- <entry key="156">aktualizuj záznam</entry>
<entry key="157">smaž záznam</entry>
<entry key="158">stav</entry>
<entry key="159">zakázáno</entry>
@@ -391,7 +390,7 @@
<entry key="399">Joined:</entry>
<entry key="400"></entry>
<entry key="401">Uživatelé v této místnosti:</entry>
- <entry key="402">aktualizuj</entry>
+ <entry key="refresh.label">aktualizuj</entry>
<entry key="404">Pro získání detalů klikněte na místnost</entry>
<entry key="405">Pokec uživatelů v této místnosti:</entry>
<entry key="406">Mistnost:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Year</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 c19d234..0efb0b5 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
@@ -168,7 +168,6 @@
<entry key="153">Annuller</entry>
<entry key="154">Slet</entry>
<entry key="155">Nyt indhold</entry>
- <entry key="156">Opdater indhold</entry>
<entry key="157">Slet indhold</entry>
<entry key="158">Status</entry>
<entry key="159">Ikke tilgængelig</entry>
@@ -391,7 +390,7 @@
<entry key="399">Tlsluttede:</entry>
<entry key="400"></entry>
<entry key="401">Brugere i dette rum:</entry>
- <entry key="402">Opdater</entry>
+ <entry key="refresh.label">Opdater</entry>
<entry key="404">Klik på et rum for at få flere detaljer</entry>
<entry key="405">Chat med brugere i dette rum:</entry>
<entry key="406">Rum:</entry>
@@ -677,7 +676,6 @@
<entry key="701">År</entry>
<entry key="702">Indlæs fil</entry>
<entry key="703">Tilføj mappe</entry>
- <entry key="704">Opdater</entry>
<entry key="705">Papirkurv</entry>
<entry key="706">Mine filer (Privat drev)</entry>
<entry key="707">Rum filer (Offentligt drev)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 17f9140..2c8a9dc 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
@@ -168,7 +168,6 @@
<entry key="153">Abbrechen</entry>
<entry key="154">Enfernen</entry>
<entry key="155">Datensatz anlegen</entry>
- <entry key="156">Datensatz neu laden</entry>
<entry key="157">Datensatz entfernen</entry>
<entry key="158">Status</entry>
<entry key="159">gesperrt</entry>
@@ -391,7 +390,7 @@
<entry key="399">Mitglied seit:</entry>
<entry key="400"></entry>
<entry key="401">Benutzer in diesem Raum:</entry>
- <entry key="402">Neu laden</entry>
+ <entry key="refresh.label">Neu laden</entry>
<entry key="404">Wählen Sie einen Raum aus, um Details zu erhalten.</entry>
<entry key="405">Chatten Sie mit Benutzern in diesem Raum:</entry>
<entry key="406">Raum:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Jahr</entry>
<entry key="702">Datei hochladen</entry>
<entry key="703">Ordner hinzufügen</entry>
- <entry key="704">Aktualisieren</entry>
<entry key="705">Papierkorb (Ziehen Sie eine Datei mit der Maus hierher)</entry>
<entry key="706">Meine Dateien (persönliches Laufwerk)</entry>
<entry key="707">Konferenzdokumente (öffentliches Laufwerk)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Räume des aktuellen Benutzers</entry>
<entry key="1509">Erstellen/Ändern Termin spezieller Raum</entry>
<entry key="1510">Sie können mehrere Adressen im folgenden Format angeben: vorname1 nachname1 <email1>,"vorname2 nachname2" <email2>,'vorname nachname3' <email3>, ...</entry>
- <entry key="1511">Stream-Volumen anpassen</entry>
+ <entry key="volume.label">Volumen anpassen</entry>
<entry key="1512">Mikrofon-Volumen anpassen</entry>
<entry key="1513">Chat ist moderiert</entry>
<entry key="1514">Erlaube Nachrichten</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 1286983..e1af331 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
@@ -168,7 +168,6 @@
<entry key="153">Ακύρωση</entry>
<entry key="154">Διαγραφή</entry>
<entry key="155">Νέα Εγγραφή</entry>
- <entry key="156">Ανανέωση Εγγραφής</entry>
<entry key="157">Διαγραφή Εγγραφής</entry>
<entry key="158">Κατάσταση</entry>
<entry key="159">Απενεργοποιημένη</entry>
@@ -391,7 +390,7 @@
<entry key="399">Συνδεδεμένοι:</entry>
<entry key="400"></entry>
<entry key="401">Χρήστες σε αυτό το Δωμάτιο:</entry>
- <entry key="402">Ανανέωση</entry>
+ <entry key="refresh.label">Ανανέωση</entry>
<entry key="404">Επιλέξτε ένα Δωμάτιο για να δείτε Λεπτομέρειες.</entry>
<entry key="405">Συνομιλήστε με τους Χρήστες σε αυτό το Δωμάτιο:</entry>
<entry key="406">Δωμάτιο:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Έτος</entry>
<entry key="702">Φόρτωση Αρχείου</entry>
<entry key="703">Προσθήκη Φακέλου</entry>
- <entry key="704">Ανανέωση</entry>
<entry key="705">Σκουπίδια</entry>
<entry key="706">Τα Αρχεία Μου (Home Drive)</entry>
<entry key="707">Αρχεία Δωματίου (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 f7c215c..a56fe16 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
@@ -168,7 +168,6 @@
<entry key="153">Cancelar</entry>
<entry key="154">Borrar</entry>
<entry key="155">Nuevo registro</entry>
- <entry key="156">Actualizar registro</entry>
<entry key="157">Borrar registro</entry>
<entry key="158">Estado</entry>
<entry key="159">desactivado</entry>
@@ -391,7 +390,7 @@
<entry key="399">Unido:</entry>
<entry key="400"/>
<entry key="401">Usuarios en la sala:</entry>
- <entry key="402">actualizar</entry>
+ <entry key="refresh.label">actualizar</entry>
<entry key="404">Pulse sobre una sala para ver los detalles</entry>
<entry key="405">Conversar con los usuarios de esta sala:</entry>
<entry key="406">Sala:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Año</entry>
<entry key="702">Subir archivo</entry>
<entry key="703">Añadir carpeta</entry>
- <entry key="704">Actualizar</entry>
<entry key="705">Papelera</entry>
<entry key="706">Mis archivos (Dispositivo personal)</entry>
<entry key="707">Archivos de la sala (Dispositivo público)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Salas del usuario actual</entry>
<entry key="1509">Crear/Modificar sala especial de cita</entry>
<entry key="1510">Puede insertar múltiples direcciones en el formato: nombre1 apellidos1 <correo1>,"nombre2 apellidos2" <correo2>,'nombre3 apellidos3' <correo3>, ...</entry>
- <entry key="1511">Ajustar volumen de flujo</entry>
+ <entry key="volume.label">Ajustar volumen</entry>
<entry key="1512">Ajustar volumen del micrófono</entry>
<entry key="1513">Es un chat moderado</entry>
<entry key="1514">Permitir mensajes</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 992f9a1..3fa7dec 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
@@ -168,7 +168,6 @@
<entry key="153">انصراف</entry>
<entry key="154">حذف</entry>
<entry key="155">جديد ضبط</entry>
- <entry key="156">ضبط بيني باز</entry>
<entry key="157">ضبط حذف</entry>
<entry key="158">وضعيت</entry>
<entry key="159">صلاحيت فاقد</entry>
@@ -391,7 +390,7 @@
<entry key="399">:پيوستن</entry>
<entry key="400"></entry>
<entry key="401">:اطاق اين در كاربر</entry>
- <entry key="402">بيني باز</entry>
+ <entry key="refresh.label">بيني باز</entry>
<entry key="404">click on a room to get details</entry>
<entry key="405">Chat with the users in this Room:</entry>
<entry key="406">:اطاق</entry>
@@ -677,7 +676,6 @@
<entry key="701">Year</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 bce2674..b37d26a 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
@@ -168,7 +168,6 @@
<entry key="153">peruuta</entry>
<entry key="154">poista</entry>
<entry key="155">uusi tietue</entry>
- <entry key="156">päivitä tietue</entry>
<entry key="157">poista tietue</entry>
<entry key="158">tila</entry>
<entry key="159">pois käytöstä</entry>
@@ -391,7 +390,7 @@
<entry key="399">Liittynyt:</entry>
<entry key="400"></entry>
<entry key="401">Käyttäjiä huoneessa:</entry>
- <entry key="402">päivitä</entry>
+ <entry key="refresh.label">päivitä</entry>
<entry key="404">klikkaa huonetta saadaksesi lisätietoja</entry>
<entry key="405">Keskustele tämän huoneen käyttäjien kanssa:</entry>
<entry key="406">Huone:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Vuosi</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 ff2afde..9eeea04 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
@@ -168,7 +168,6 @@
<entry key="153">Annuler</entry>
<entry key="154">Effacer</entry>
<entry key="155">Nouvel enregistrement</entry>
- <entry key="156">Actualiser l'enregistrement</entry>
<entry key="157">Effacer l'enregistrement</entry>
<entry key="158">Statut</entry>
<entry key="159">Désactivé</entry>
@@ -391,7 +390,7 @@
<entry key="399">Inscrits :</entry>
<entry key="400"></entry>
<entry key="401">Utilisateur dans la salle :</entry>
- <entry key="402">Rafraichir</entry>
+ <entry key="refresh.label">Rafraichir</entry>
<entry key="404">Infos : Cliquez sur une salle</entry>
<entry key="405">Discutez avec les utilisateurs de cette salle :</entry>
<entry key="406">Salle :</entry>
@@ -677,7 +676,6 @@
<entry key="701">Année</entry>
<entry key="702">Ajouter un fichier</entry>
<entry key="703">Ajouter un dossier</entry>
- <entry key="704">Rafraichir</entry>
<entry key="705">Poubelle</entry>
<entry key="706">Mes fichiers personnels</entry>
<entry key="707">Les fichiers de la salle (Public)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Salles de l'utilisateur</entry>
<entry key="1509">Créer/Modifier salle particulière</entry>
<entry key="1510">Vous pouvez entrer plusieurs adresses sous le format : prénom1 nom1 <courriel1>,"prénom2 nom2" <courriel2>,'prénom3 nom3' <courriel3>, ...</entry>
- <entry key="1511">Ajuster le volume</entry>
+ <entry key="volume.label">Ajuster le volume</entry>
<entry key="1512">Ajuster le volume du micro</entry>
<entry key="1513">T'chat est-t-il modéré</entry>
<entry key="1514">Autoriser les messages</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 914010d..8c7609c 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
@@ -168,7 +168,6 @@
<entry key="153">Cancelar</entry>
<entry key="154">Eliminar</entry>
<entry key="155">Novo rexistro</entry>
- <entry key="156">Actualizar o rexistro</entry>
<entry key="157">Eliminar o rexistro</entry>
<entry key="158">Estado</entry>
<entry key="159">desactivado</entry>
@@ -391,7 +390,7 @@
<entry key="399">Unido:</entry>
<entry key="400"></entry>
<entry key="401">Usuarios na sala:</entry>
- <entry key="402">actualizar</entry>
+ <entry key="refresh.label">actualizar</entry>
<entry key="404">prema nunha sala para ver os detalles</entry>
<entry key="405">Conversar cos usuarios desta sala:</entry>
<entry key="406">Sala:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Ano</entry>
<entry key="702">Cargar un ficheiro</entry>
<entry key="703">Engadir un ficheiro</entry>
- <entry key="704">Actualizar</entry>
<entry key="705">Lixo</entry>
<entry key="706">Meus ficheiros Files (Dispositivo personal)</entry>
<entry key="707">Ficheiros da sala (Dispositivo público)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 3dcc448..40e2394 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
@@ -168,7 +168,6 @@
<entry key="153">mégse</entry>
<entry key="154">törlés</entry>
<entry key="155">új bejegyzés</entry>
- <entry key="156">bejegyzés frissítése</entry>
<entry key="157">bejegyzés törlése</entry>
<entry key="158">státusz</entry>
<entry key="159">tiltott</entry>
@@ -391,7 +390,7 @@
<entry key="399">Csatlakozott:</entry>
<entry key="400"></entry>
<entry key="401">Felhasználók ebben a szobában:</entry>
- <entry key="402">frissítés</entry>
+ <entry key="refresh.label">frissítés</entry>
<entry key="404">kattints a szobára az információkér</entry>
<entry key="405">Csevegés a felhasználókkal a szobában:</entry>
<entry key="406">Szoba:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Év</entry>
<entry key="702">File feltöltése</entry>
<entry key="703">Könyvtár létrehozása</entry>
- <entry key="704">Frissít</entry>
<entry key="705">Kuka (húzza bele a kiválasztott elemet)</entry>
<entry key="706">Saját fileok (Home Drive)</entry>
<entry key="707">Terem fileok (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">A felhasználó termei</entry>
<entry key="1509">Speciális találkzó szoba étrehozás/módosítás</entry>
<entry key="1510">Több cím megadása az alábbiak szerint: vezetéknév1 keresztnév1 <email1>,"vezetéknév2 keresztnév2" <email2>,'vezetéknév3 keresztnév3' <email3>, ...</entry>
- <entry key="1511">Stream hangerő változtatása</entry>
+ <entry key="volume.label">Hangerő változtatása</entry>
<entry key="1512">Mikrofon hangerő változtatása</entry>
<entry key="1513">A chat moderált</entry>
<entry key="1514">Üzenet engedélyezése</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 8015b11..34a8865 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
@@ -168,7 +168,6 @@
<entry key="153">batal</entry>
<entry key="154">hapus</entry>
<entry key="155">rekot baru</entry>
- <entry key="156">panggil ulang</entry>
<entry key="157">hapus rekot</entry>
<entry key="158">status</entry>
<entry key="159">abaikan</entry>
@@ -392,7 +391,7 @@
<entry key="399">Terkoneksi:</entry>
<entry key="400"></entry>
<entry key="401">Users dalam ruangan ini:</entry>
- <entry key="402">panggil ulang</entry>
+ <entry key="refresh.label">panggil ulang</entry>
<entry key="404">Klik pada Judul ruangan untuk melihat detilnya</entry>
<entry key="405">Chat dengan user dalam ruangan ini:</entry>
<entry key="406">Ruangan:</entry>
@@ -678,7 +677,6 @@
<entry key="701">Year</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1463,7 +1461,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 9a69b06..6f8d652 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
@@ -168,7 +168,6 @@
<entry key="153">Annulla</entry>
<entry key="154">Elimina</entry>
<entry key="155">Nuovo record</entry>
- <entry key="156">Aggiorna record</entry>
<entry key="157">Elimina record</entry>
<entry key="158">Stato</entry>
<entry key="159">Disabilitato</entry>
@@ -391,7 +390,7 @@
<entry key="399">Connessi</entry>
<entry key="400"></entry>
<entry key="401">Utenti nella stanza:</entry>
- <entry key="402">Aggiorna</entry>
+ <entry key="refresh.label">Aggiorna</entry>
<entry key="404">Clicca su una stanza per avere dettagli</entry>
<entry key="405">Parla con gli utenti nella stanza:</entry>
<entry key="406">Stanza:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Anno</entry>
<entry key="702">Carica File</entry>
<entry key="703">Carica cartella</entry>
- <entry key="704">Aggiorna</entry>
<entry key="705">Cestino (Trascina le voci qui)</entry>
<entry key="706">Miei File (Spazio privato)</entry>
<entry key="707">Files della stanza (Spazio pubblico)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Stanze dell'utente corrente</entry>
<entry key="1509">Crea/Modifica stanza speciale per l'appuntamento</entry>
<entry key="1510">Puoi inserire diversi indirizzi nel formato: nome1 cognome1 <email1>,"nome2 cognome2" <email2>,'nome3 cognome3' <email3>, ...</entry>
- <entry key="1511">Regola il volume del flusso</entry>
+ <entry key="volume.label">Regola il volume</entry>
<entry key="1512">Regola il volume del microfono</entry>
<entry key="1513">E' una chat moderata</entry>
<entry key="1514">Permetti messaggi</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 149559d..c8b04f8 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
@@ -168,7 +168,6 @@
<entry key="153">キャンセル</entry>
<entry key="154">削除</entry>
<entry key="155">新規作成</entry>
- <entry key="156">更新</entry>
<entry key="157">削除</entry>
<entry key="158">ステータス</entry>
<entry key="159">無効</entry>
@@ -391,7 +390,7 @@
<entry key="399">参加者数:</entry>
<entry key="400">会議室リスト</entry>
<entry key="401">会議室内のユーザー:</entry>
- <entry key="402">更新</entry>
+ <entry key="refresh.label">更新</entry>
<entry key="404">詳細表示</entry>
<entry key="405">会議室内のユーザーとチャット:</entry>
<entry key="406">会議室:</entry>
@@ -677,7 +676,6 @@
<entry key="701">年</entry>
<entry key="702">ファイルをアップロードする</entry>
<entry key="703">フォルダを追加する</entry>
- <entry key="704">リフレッシュ</entry>
<entry key="705">ゴミ箱 (アイテムをここにドラッグ&ドロップ)</entry>
<entry key="706">私のファイル (ホーム・ドライブ)</entry>
<entry key="707">会議室のファイル (パブリック・ドライブ)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">現ユーザーの会議室</entry>
<entry key="1509">イベント専用会議室を作成／編集する</entry>
<entry key="1510">複数のアドレスを書式に含めることができます: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">ストリーミング音量を調整する</entry>
+ <entry key="volume.label">ストリーミング音量を調整する</entry>
<entry key="1512">マイク音量を調整する</entry>
<entry key="1513">チャットを制限</entry>
<entry key="1514">メッセージを許可</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 a477032..68d9fab 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
@@ -168,7 +168,6 @@
<entry key="153">삭제</entry>
<entry key="154">삭제</entry>
<entry key="155">새로운 기록</entry>
- <entry key="156">기록을 다시 재생하다</entry>
<entry key="157">기록을 지우다</entry>
<entry key="158">상태</entry>
<entry key="159">무력하게 하다</entry>
@@ -393,7 +392,7 @@
<entry key="399">Joined:</entry>
<entry key="400"></entry>
<entry key="401">Users in this Room:</entry>
- <entry key="402">refresh</entry>
+ <entry key="refresh.label">refresh</entry>
<entry key="404">click on a room to get details</entry>
<entry key="405">Chat with the users in this Room:</entry>
<entry key="406">Room:</entry>
@@ -679,7 +678,6 @@
<entry key="701">Year</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1464,7 +1462,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 a2aefc8..4522ab7 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
@@ -168,7 +168,6 @@
<entry key="153">Annuleren</entry>
<entry key="154">Verwijderen</entry>
<entry key="155">Toevoegen</entry>
- <entry key="156">Vernieuwen</entry>
<entry key="157">Verwijderen</entry>
<entry key="158">Status</entry>
<entry key="159">Blokkeren</entry>
@@ -391,7 +390,7 @@
<entry key="399">Aanwezig:</entry>
<entry key="400"></entry>
<entry key="401">Active deelnemers:</entry>
- <entry key="402">vernieuwen</entry>
+ <entry key="refresh.label">vernieuwen</entry>
<entry key="404">Klik op een kamer voor meer informatie</entry>
<entry key="405">Chat met deelnemers:</entry>
<entry key="406">Overleg:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Jaar</entry>
<entry key="702">Bestand uploaden</entry>
<entry key="703">Directory toevoegen</entry>
- <entry key="704">Vernieuwen</entry>
<entry key="705">Vuilnisbak</entry>
<entry key="706">Mijn bestanden</entry>
<entry key="707">Bestanden in de kamer</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 06fa45f..976801a 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
@@ -168,7 +168,6 @@
<entry key="153">Anuluj</entry>
<entry key="154">Skasuj</entry>
<entry key="155">Nowy wpis</entry>
- <entry key="156">Odświerz wpis</entry>
<entry key="157">Skasuj wpis</entry>
<entry key="158">Status</entry>
<entry key="159">zablokowany</entry>
@@ -391,7 +390,7 @@
<entry key="399">Dołączyli:</entry>
<entry key="400"></entry>
<entry key="401">Użytkownicy w tym pokoju:</entry>
- <entry key="402">odśwież</entry>
+ <entry key="refresh.label">odśwież</entry>
<entry key="404">kliknij na pokój, aby zobaczyć szczegóły</entry>
<entry key="405">Czatuj z użytkownikami tego pokoju:</entry>
<entry key="406">Pokój:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Rok</entry>
<entry key="702">Prześlij plik</entry>
<entry key="703">Nowy filder</entry>
- <entry key="704">Odśwież</entry>
<entry key="705">Śmietnik</entry>
<entry key="706">Moje pliki</entry>
<entry key="707">Pliki publiczne (dla pokoju)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 b6a7267..5f27062 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
@@ -168,7 +168,6 @@
<entry key="153">cancelar</entry>
<entry key="154">excluir</entry>
<entry key="155">novo registro</entry>
- <entry key="156">atualizar registro</entry>
<entry key="157">excluir registro</entry>
<entry key="158">status</entry>
<entry key="159">desabilitado</entry>
@@ -391,7 +390,7 @@
<entry key="399">Entrou:</entry>
<entry key="400"></entry>
<entry key="401">Usuários nessa sala:</entry>
- <entry key="402">atualizar</entry>
+ <entry key="refresh.label">atualizar</entry>
<entry key="404">clique em uma sala para ver os detalhes</entry>
<entry key="405">Chat com os usuários dessa sala:</entry>
<entry key="406">Sala:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Year</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 5de434a..00fc1a2 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
@@ -168,7 +168,6 @@
<entry key="153">cancelar</entry>
<entry key="154">excluir</entry>
<entry key="155">novo registro</entry>
- <entry key="156">atualizar registro</entry>
<entry key="157">excluir registro</entry>
<entry key="158">Estado</entry>
<entry key="159">Desabilitado</entry>
@@ -391,7 +390,7 @@
<entry key="399">Entrou:</entry>
<entry key="400">Entrou:</entry>
<entry key="401">Usuários nessa sala:</entry>
- <entry key="402">atualizar</entry>
+ <entry key="refresh.label">atualizar</entry>
<entry key="404">clique em uma sala para ver os detalhes</entry>
<entry key="405">Chat com os usuários dessa sala:</entry>
<entry key="406">Sala:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Ano</entry>
<entry key="702">Upload de arquivo</entry>
<entry key="703">Adiciona pasta</entry>
- <entry key="704">Atualiza</entry>
<entry key="705">Lixeira</entry>
<entry key="706">Meus Arquivos (Home Drive)</entry>
<entry key="707">Arquivos da sala (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Salas do atual usuário</entry>
<entry key="1509">Crie / modifique sala especial de reunião</entry>
<entry key="1510">Você pode entrar com endereços múltiplos no formato : firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Ajuste volume da transmissão</entry>
+ <entry key="volume.label">Ajuste volume</entry>
<entry key="1512">Ajuste volume do microfone</entry>
<entry key="1513">É moderada por chat</entry>
<entry key="1514">Permite mensagens</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 ba4561e..5173442 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
@@ -168,7 +168,6 @@
<entry key="153">Отменить</entry>
<entry key="154">Удалить</entry>
<entry key="155">Создать запись</entry>
- <entry key="156">Заново загрузить запись</entry>
<entry key="157">Удалить запись</entry>
<entry key="158">Статус</entry>
<entry key="159">заблокировано</entry>
@@ -391,7 +390,7 @@
<entry key="399">Присоединившиеся:</entry>
<entry key="400"></entry>
<entry key="401">Участники в этой комнате:</entry>
- <entry key="402">обновить</entry>
+ <entry key="refresh.label">обновить</entry>
<entry key="404">Нажмите на комнату для деталей</entry>
<entry key="405">Чат с пользователями этой комнаты:</entry>
<entry key="406">Комната:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Год</entry>
<entry key="702">Загрузить файл</entry>
<entry key="703">Добавить папку</entry>
- <entry key="704">Обновить</entry>
<entry key="705">Корзина</entry>
<entry key="706">Мои файлы (Локальное устройство)</entry>
<entry key="707">Файлы из комнаты (Общее устройство)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Комнаты данного пользователя</entry>
<entry key="1509">Создать/редактировать комнату для этого события</entry>
<entry key="1510">Вы можете ввести несколько адресов в формате: Имя1 Фамилия1 <адрес1>,"Имя2 Фамилия2" <адрес2>,'Имя3 Фамилия3' <адрес3>, ...</entry>
- <entry key="1511">Регулировать поток</entry>
+ <entry key="volume.label">Регулировать громкость</entry>
<entry key="1512">Регулировать микрфон</entry>
<entry key="1513">Премодерируемый чат</entry>
<entry key="1514">Опубликовать сообщение</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 a556b74..2e5e1fc 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
@@ -168,7 +168,6 @@
<entry key="153">Zrušiť</entry>
<entry key="154">Zmazať</entry>
<entry key="155">Nové nahrávanie</entry>
- <entry key="156">Obnoviť nahrávanie</entry>
<entry key="157">Zmazať nahrávku</entry>
<entry key="158">Status</entry>
<entry key="159">Zablokované</entry>
@@ -391,7 +390,7 @@
<entry key="399">Pripojený</entry>
<entry key="400"></entry>
<entry key="401">Používatelia v tejto miestnosti</entry>
- <entry key="402">Obnoviť</entry>
+ <entry key="refresh.label">Obnoviť</entry>
<entry key="404">Kliknite na miestnosť pre informácie o miestnosti</entry>
<entry key="405">Chat s používateľmi v tejto miestnosti</entry>
<entry key="406">Miestnosť</entry>
@@ -677,7 +676,6 @@
<entry key="701">Rok</entry>
<entry key="702">Nahrať súbor</entry>
<entry key="703">Pridať súbor</entry>
- <entry key="704">Obnoviť</entry>
<entry key="705">Kôš</entry>
<entry key="706">Moje súbory</entry>
<entry key="707">Súbory v miestnosti(verejné)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 1ecc187..d845d9d 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
@@ -168,7 +168,6 @@
<entry key="153">Avbryt</entry>
<entry key="154">Radera</entry>
<entry key="155">Nytt innehåll</entry>
- <entry key="156">Uppdatera innehåll</entry>
<entry key="157">Radera innehåll</entry>
<entry key="158">Status</entry>
<entry key="159">Ej tillgänglig</entry>
@@ -391,7 +390,7 @@
<entry key="399">Anslöt sig:</entry>
<entry key="400"></entry>
<entry key="401">Användare i det här rummet:</entry>
- <entry key="402">Uppdatera</entry>
+ <entry key="refresh.label">Uppdatera</entry>
<entry key="404">Klicka på ett rum för att få mera detaljer</entry>
<entry key="405">Chatta med användarna i det här rummet:</entry>
<entry key="406">Rum:</entry>
@@ -677,7 +676,6 @@
<entry key="701">År</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 765975f..8c65216 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
@@ -168,7 +168,6 @@
<entry key="153">ยกเลิก</entry>
<entry key="154">ลบ</entry>
<entry key="155">บันทึกใหม่</entry>
- <entry key="156">รีเฟรชบันทึก</entry>
<entry key="157">ลบบันทึก</entry>
<entry key="158">สถานะ</entry>
<entry key="159">ยกเลิกแล้ว</entry>
@@ -391,7 +390,7 @@
<entry key="399">เข้าร่วม:</entry>
<entry key="400"></entry>
<entry key="401">ผู้ใช้ในห้องนี้:</entry>
- <entry key="402">รีเฟรช</entry>
+ <entry key="refresh.label">รีเฟรช</entry>
<entry key="404">คลิกที่ห้องเพื่อดูรายละเอียด</entry>
<entry key="405">แชทกับผู้ใช้ในห้องนี้</entry>
<entry key="406">ห้อง:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Year</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 22f470a..c7b23e4 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
@@ -168,7 +168,6 @@
<entry key="153">iptal</entry>
<entry key="154">sil</entry>
<entry key="155">yeni kayıt</entry>
- <entry key="156">kayıt yenile</entry>
<entry key="157">kayıt sil</entry>
<entry key="158">durum</entry>
<entry key="159">devre dışı</entry>
@@ -391,7 +390,7 @@
<entry key="399">Katılanlar:</entry>
<entry key="400"></entry>
<entry key="401">Bu odadaki kullanıcılar:</entry>
- <entry key="402">yenile</entry>
+ <entry key="refresh.label">yenile</entry>
<entry key="404">Detaylı bilgi için bir odanın üzerine tıklayınız</entry>
<entry key="405">Bu odanın içindeki kullanıcılar ile sohbet et:</entry>
<entry key="406">Oda:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Yıl</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 7922782..f82c7eb 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
@@ -168,7 +168,6 @@
<entry key="153">Скасувати</entry>
<entry key="154">Стери</entry>
<entry key="155">Створити запис</entry>
- <entry key="156">Оновити запис</entry>
<entry key="157">Стерти запис</entry>
<entry key="158">Статус</entry>
<entry key="159">Заблоковано</entry>
@@ -391,7 +390,7 @@
<entry key="399">Під'єднано:</entry>
<entry key="400"></entry>
<entry key="401">Користувачів в кімнаті:</entry>
- <entry key="402">Оновити</entry>
+ <entry key="refresh.label">Оновити</entry>
<entry key="404">Виберіть кімнату щоб взнати деталі</entry>
<entry key="405">Чат з користувачами даної кімнати:</entry>
<entry key="406">Кімната:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Рік</entry>
<entry key="702">Завантажити файл</entry>
<entry key="703">Додати папку</entry>
- <entry key="704">Оновити</entry>
<entry key="705">Кошик</entry>
<entry key="706">Мої файли (Локальний пристрій)</entry>
<entry key="707">Файли з кімнати (Загальне пристрій)</entry>
@@ -1463,7 +1461,7 @@
<entry key="1508">Кімнати даного користувача</entry>
<entry key="1509">Створити/редагувати кімнату для цієї події</entry>
<entry key="1510">Ви можете ввести декілька адрес у форматі: Имя1 Фамилия1 <адрес1>,"Имя2 Фамилия2" <адрес2>,'Имя3 Фамилия3' <адрес3> ...</entry>
- <entry key="1511">Регулювати потік</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Регулювати микрфон</entry>
<entry key="1513">Премодерируемый чат</entry>
<entry key="1514">Опублікувати повідомлення</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 362748a..19cb8bb 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
@@ -168,7 +168,6 @@
<entry key="153">取消</entry>
<entry key="154">删除</entry>
<entry key="155">新记录</entry>
- <entry key="156">刷新记录</entry>
<entry key="157">删除记录</entry>
<entry key="158">状态</entry>
<entry key="159">禁止</entry>
@@ -391,7 +390,7 @@
<entry key="399">已参加:</entry>
<entry key="400"></entry>
<entry key="401">此房间的用户:</entry>
- <entry key="402">刷新</entry>
+ <entry key="refresh.label">刷新</entry>
<entry key="404">点击房间获取详细信息</entry>
<entry key="405">与此房间内的用户讨论:</entry>
<entry key="406">房间:</entry>
@@ -677,7 +676,6 @@
<entry key="701">年</entry>
<entry key="702">上载文件</entry>
<entry key="703">新建目录</entry>
- <entry key="704">刷新</entry>
<entry key="705">回收站</entry>
<entry key="706">我的文件(Home Drive)</entry>
<entry key="707">会议室文件 (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">当前用户的房间</entry>
<entry key="1509">创建/修改特别约见室</entry>
<entry key="1510">您可以在格式中输入多个地址: 名1 姓1 <email1>,"名2 姓2" <email2>,'名3 姓3' <email3>, ...</entry>
- <entry key="1511">调整流体积</entry>
+ <entry key="volume.label">调整流体积</entry>
<entry key="1512">调整麦克风音量</entry>
<entry key="1513">聊天有主持吗</entry>
<entry key="1514">允许消息</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 ca59707..307ab2c 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
@@ -168,7 +168,6 @@
<entry key="153">取消</entry>
<entry key="154">刪除</entry>
<entry key="155">新紀錄</entry>
- <entry key="156">刷新紀錄</entry>
<entry key="157">刪除紀錄</entry>
<entry key="158">狀態</entry>
<entry key="159">關閉</entry>
@@ -391,7 +390,7 @@
<entry key="399">加入:</entry>
<entry key="400"></entry>
<entry key="401">用戶在這個房間:</entry>
- <entry key="402">刷新</entry>
+ <entry key="refresh.label">刷新</entry>
<entry key="404">點擊一個房間獲得細節</entry>
<entry key="405">和這個會議室的用户聊天:</entry>
<entry key="406">房間:</entry>
@@ -677,7 +676,6 @@
<entry key="701">Year</entry>
<entry key="702">Upload File</entry>
<entry key="703">Add Folder</entry>
- <entry key="704">Refresh</entry>
<entry key="705">Trash (Drag and Drop item here)</entry>
<entry key="706">My Files (Home Drive)</entry>
<entry key="707">Room Files (Public Drive)</entry>
@@ -1462,7 +1460,7 @@
<entry key="1508">Rooms of the current user</entry>
<entry key="1509">Create/Modify appointment special room</entry>
<entry key="1510">You can enter multiple addresses in the format: firstname1 lastname1 <email1>,"firstname2 lastname2" <email2>,'firstname3 lastname3' <email3>, ...</entry>
- <entry key="1511">Adjust stream volume</entry>
+ <entry key="volume.label">Adjust volume</entry>
<entry key="1512">Adjust microphone volume</entry>
<entry key="1513">Is chat moderated</entry>
<entry key="1514">Allow message</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 c24f3ff..39d8368 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:402,title:402"><wicket:message key="402"/></span>
+ <span wicket:id="refresh" wicket:message="alt:refresh.label,title:refresh.label"><wicket:message key="refresh.label"/></span>
</wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 e7329c8..eec2150 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:156" />
+ <input type="submit" value="" wicket:id="ajax-refresh-button" wicket:message="title:refresh.label" />
</div>
<wicket:child/>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 9e38d57..34220e7 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
@@ -40,7 +40,7 @@
<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:704"></span>
+ <span wicket:id="refresh" class="refresh om-icon big align-left clickable" wicket:message="title:refresh.label"></span>
<span wicket:id="trash"></span>
<div class="clear"></div>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 3f30083..d19ef2c 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
@@ -46,9 +46,14 @@
<div id="user-video">
<div class="video"></div>
</div>
+ <div id="video-refresh-btn">
+ <a class="ui-dialog-titlebar-volume ui-corner-all ui-state-default" href="#" wicket:message="title:refresh.label" role="button" data-toggle="dropdown">
+ <span class="ui-icon ui-icon-refresh"><wicket:message key="refresh.label"/></span>
+ </a>
+ </div>
<div id="video-volume-btn">
- <a class="ui-dialog-titlebar-volume ui-corner-all ui-state-default" href="#" title="volume" role="button" data-toggle="dropdown">
- <span class="ui-icon ui-icon-triangle-2-n-s">volume</span>
+ <a class="ui-dialog-titlebar-volume ui-corner-all ui-state-default" href="#" wicket:message="title:volume.label" role="button" data-toggle="dropdown">
+ <span class="ui-icon ui-icon-volume-off"><wicket:message key="volume.label"/></span>
</a>
<ul class="dropdown-menu video volume">
<li>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/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 9edcbff..a05e5e9 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
@@ -554,6 +554,19 @@ public class RoomPanel extends BasePanel {
}
}
break;
+ case audioActivity:
+ {
+ JSONObject obj = new JSONObject(((TextRoomMessage)m).getText());
+ Client c = getClientBySid(obj.getString("sid"));
+ if (c == null) {
+ log.error("Not existing user in audioActivity {} !!!!", obj);
+ return;
+ }
+ if (!getClient().getUid().equals(c.getUid())) {
+ handler.appendJavaScript(String.format("VideoManager.micActivity('%s', %s);", c.getUid(), obj.getBoolean("active")));
+ }
+ }
+ break;
}
}
}