[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 <[email protected]> Authored: Wed Aug 23 22:41:57 2017 +0700 Committer: Maxim Solodovnik <[email protected]> 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; } } }
