Repository: openmeetings Updated Branches: refs/heads/master 46b7fcdaa -> cb0294886
[OPENMEETINGS-1706] show clipboard is implemented Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/cb029488 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/cb029488 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/cb029488 Branch: refs/heads/master Commit: cb0294886c3964db23f990c835b1a86db52ada0e Parents: 46b7fcd Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Thu Sep 21 13:02:35 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Thu Sep 21 13:02:35 2017 +0700 ---------------------------------------------------------------------- .../main/flex/org/apache/openmeetings/OmVideo.as | 6 +----- .../web/app/Application.properties.xml | 1 + .../web/app/Application_ar.properties.xml | 1 + .../web/app/Application_bg.properties.xml | 1 + .../web/app/Application_ca.properties.xml | 1 + .../web/app/Application_cs.properties.xml | 1 + .../web/app/Application_da.properties.xml | 1 + .../web/app/Application_de.properties.xml | 1 + .../web/app/Application_el.properties.xml | 1 + .../web/app/Application_es.properties.xml | 1 + .../web/app/Application_fa.properties.xml | 1 + .../web/app/Application_fi.properties.xml | 1 + .../web/app/Application_fr.properties.xml | 1 + .../web/app/Application_gl.properties.xml | 1 + .../web/app/Application_hu.properties.xml | 1 + .../web/app/Application_id.properties.xml | 2 +- .../web/app/Application_it.properties.xml | 1 + .../web/app/Application_ja.properties.xml | 1 + .../web/app/Application_ko.properties.xml | 3 +-- .../web/app/Application_nl.properties.xml | 1 + .../web/app/Application_pl.properties.xml | 1 + .../web/app/Application_pt.properties.xml | 1 + .../web/app/Application_pt_BR.properties.xml | 1 + .../web/app/Application_ru.properties.xml | 1 + .../web/app/Application_sk.properties.xml | 1 + .../web/app/Application_sv.properties.xml | 1 + .../web/app/Application_th.properties.xml | 1 + .../web/app/Application_tr.properties.xml | 1 + .../web/app/Application_uk.properties.xml | 1 + .../web/app/Application_zh_CN.properties.xml | 1 + .../web/app/Application_zh_TW.properties.xml | 1 + .../apache/openmeetings/web/room/RoomPanel.html | 3 +++ .../org/apache/openmeetings/web/room/room.js | 19 +++++++++++++++++++ 33 files changed, 53 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 741b72e..9c97710 100644 --- a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as +++ b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as @@ -17,8 +17,6 @@ * under the License. */ package org.apache.openmeetings { -import flash.desktop.Clipboard; -import flash.desktop.ClipboardFormats; import flash.events.AsyncErrorEvent; import flash.events.NetStatusEvent; import flash.external.ExternalInterface; @@ -277,9 +275,7 @@ public class OmVideo { } , sendVarsToMessageWithClient: function(obj:Object):void { if ("copiedText" === obj[0]) { - debug("sendVarsToMessageWithClient :: copiedText " + obj[1]); - Clipboard.generalClipboard.clear(); - Clipboard.generalClipboard.setData(ClipboardFormats.TEXT_FORMAT, obj[1] as String); + ExternalInterface.call("Room.showClipboard", obj[1]); } } }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 96c3317..9630666 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to user name" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the login in the LDAP is stored including the domain name. Example: user enters "hans" domain is specified as "localhost.com", login that is verified against LDAP is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add domain to user name]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 7f9d3d3..d78e365 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 f498978..b8b72ad 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 f8d912b..6fbd4e1 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 cd69b5c..d5b0b13 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 f4ce561..dfd3ebd 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 a4bbf84..978cf90 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[Wenn Sie "Domain zum Nutzernamen hinzufügen" aktivieren wird der Eingabe des Nutzers beim Login derim Feld 'Domain' hinterlegte Wert hinzugefügt. Dies ist sinnvoll wenn in einem LDAP System der Nutzer mit einer Domainangabe geführt wird. Beispiel. Der Nutzer gibt beim Login 'Hans' ein. Die Domain ist mit 'localhost.com' eingetragen. Im LDAP wird h...@localhost.com geprüft.]]></entry> <entry key="1117"><![CDATA[Domain zum Nutzernamen hinzufügen]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Text aus Remote Zwischenablage</entry> <entry key="1131"><![CDATA[Nutzer in Konferenzraum einladen]]></entry> <entry key="1132"><![CDATA[Konferenzraum auswählen. Die eingeladenen Nutzer erhalten eine Nachricht mit Ihrem Namen und dem Link zum Raum.]]></entry> <entry key="1134"><![CDATA[Nach Einladungsversand Raum betreten]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 21e5c9a..d7e4f20 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 2131578..70f3fc0 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[Si activa "Añadir Dominio al nombre de usuario" el valor del campo "dominio" se añade a cada registro que el usuario introduce en la casilla de login. Esto es útil si el Login en el Ldap se almacena incluyendo el nombre de dominio. Ejemplo: supongamos que el usuario introduce "hans" y el dominio está especificado como "localhost.com". El login que se verificará contra el Ldap será: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Añadir Dominio al nombre de usuario]]></entry> <entry key="1118"><![CDATA[Dominio]]></entry> + <entry key="1121">Texto remoto en Portapapeles</entry> <entry key="1131"><![CDATA[Invitar usuario a sala de conferencias]]></entry> <entry key="1132"><![CDATA[Escoja sala de conferencias. El usuario invitado verá un mensaje con tu nombre y un link a la sala.]]></entry> <entry key="1134"><![CDATA[Entrar a sala tras enviar invitación]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 9cd667d..e4544fd 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 648d026..9e6d1e6 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 b741d21..89d6562 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[Si vous activez "Ajouter le domaine au nom d'utilisateur" la veleur du champ "domaine" sera ajoutée à chaque login entré dans la fenêtre de login. Ceci peut-être utile si le login dans le Ldap est enregistré en incluant le nom de domaine. Par exemple : un utilisateur entre "hans" le domaine spécifié étant "localhost.com", le login vérifié avec Ldap sera : h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Ajouter le domaine]]></entry> <entry key="1118"><![CDATA[Domaine]]></entry> + <entry key="1121">Texte du presse-papier distant</entry> <entry key="1131"><![CDATA[Inviter l'utilisateur dans la salle de conférence]]></entry> <entry key="1132"><![CDATA[Choisissez une salle de conférence. L'utilisateur invité recevra un message avec votre nom et un lien vers la salle.]]></entry> <entry key="1134"><![CDATA[Entrer dans la salle après l'envoi de l'invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 3e7f439..fab453e 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 7a6bc12..f0e414b 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[Ha negedélyezi a "Tartomány hozzáadása a felhasználó névhez" a "Tartomány" (domain) mezŠértéke hozzáadódik minden bejelentkezéshez mikor a felhasználó belép. Használja ezt, ha az LDAP bejelentezés támogatja a tartomány kezelést. Pl.: Felhasználó belép "hans", tartomány meghatározva mint "localhost.com", a belpést az LDAP ellenÅrzi mint: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Tartomány hozzáadása a felhasználó névhez]]></entry> <entry key="1118"><![CDATA[Tartomány]]></entry> + <entry key="1121">Távoli vágólap tartalma</entry> <entry key="1131"><![CDATA[Felhasználó meghÃvása a konferenciába]]></entry> <entry key="1132"><![CDATA[Válasszon konferencia szobát. A meghÃvott felhasználó üzenetet kap a Nevével és a belépési linkkel.]]></entry> <entry key="1134"><![CDATA[Belépés a konferencia szobába a meghÃvó küldés után]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 ef481bb..faa87a8 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 @@ -164,7 +164,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="327"><![CDATA[ubah Password]]></entry> <entry key="328"><![CDATA[Password baru]]></entry> <entry key="332"><![CDATA[Password sudah di seting. Anda dapat login sekarang.]]></entry> - <entry key="335"><![CDATA[Username/email and/or password are incorrect.]]></entry> <entry key="348"><![CDATA[Editor Bahasa]]></entry> <entry key="353"><![CDATA[Nilai Kolom]]></entry> <entry key="360"><![CDATA[expor]]></entry> @@ -423,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 9693674..0a0348d 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[Se abiliti "Aggiungi Dominio al nome utente" il valore del campo "Dominio" sarà aggiunto a quanto inserito nella finestra di accesso. Questo è utile se il Login nel server LDAP è memorizzato con il dominio compreso. Esempio: L'utente inserisce "hans", nel dominio è specificato "localhost.com", verrà verificato il login sul server LDAP con: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Aggiunge dominio all'utente]]></entry> <entry key="1118"><![CDATA[Dominio]]></entry> + <entry key="1121">Testo della Clipboard remota</entry> <entry key="1131"><![CDATA[Invita un utente nella stanza conferenze]]></entry> <entry key="1132"><![CDATA[Scegli una stanza conferenze. Gli utenti invitati riceveranno un messaggio con il nome ed il link alla stanza.]]></entry> <entry key="1134"><![CDATA[Entra nella stanza dopo l'invio degli inviti]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 5a96cbe..d2ac114 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[ããã¡ã¤ã³ãã¦ã¼ã¶ã¼åã«ä»å ããããé¸æããã¨ãæå®ãããã¡ã¤ã³ãããã°ã¤ã³ç»é¢ã§æå®ãããã°ã¤ã³åã«èªåçã«ä»å ããã¾ããããLDAPã«ããã¡ã¤ã³åä»ãã®ãã°ã¤ã³åãä¿åããã¦ããå ´åã«å©ç¨ãã¦ãã ãããä¾: ãã°ã¤ã³åãhansãããã¡ã¤ã³åãlocalhost.comãã®å ´åããh...@localhost.comãã§LDAPèªè¨¼ãè¡ãã¾ãã]]></entry> <entry key="1117"><![CDATA[ãã¡ã¤ã³ãã¦ã¼ã¶ã¼åã«ä»å ãã]]></entry> <entry key="1118"><![CDATA[ãã¡ã¤ã³]]></entry> + <entry key="1121">ãªã¢ã¼ãPCã®ã¯ãªãããã¼ãã»ããã¹ã</entry> <entry key="1131"><![CDATA[ã¦ã¼ã¶ã¼ãä¼è°å®¤ã«æå¾ ãã]]></entry> <entry key="1132"><![CDATA[ä¼è°å®¤ãé¸æãã¦ãã ãããåå ä¾é ¼ãåããã¦ã¼ã¶ã¼ã«ã¯ãããªãã®ååãã¡ãã»ã¼ã¸ã¨ã¨ãã«ä¼è°å®¤ã¸ã®ãªã³ã¯ãçºè¡ããã¾ãã]]></entry> <entry key="1134"><![CDATA[åå ä¾é ¼ã®éä¿¡å¾ã«å ¥å®¤ãã]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 cac73ad..1c8e6d4 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 @@ -129,8 +129,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="256"><![CDATA[Go to previous Page]]></entry> <entry key="259"><![CDATA[Zoom --]]></entry> <entry key="260"><![CDATA[Zoom ++]]></entry> - <entry key="261"><![CDATA[Mr.]]></entry> - <entry key="262"><![CDATA[Ms.]]></entry> <entry key="263"><![CDATA[Configuration]]></entry> <entry key="265"><![CDATA[Key]]></entry> <entry key="266"><![CDATA[Configuration]]></entry> @@ -424,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 10dc1c3..5a606b9 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 6201933..0017f4f 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 d666d5e..1a4a8f3 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 dce771c..b89258c 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[Se você escolheu "Adicionar domÃnio para nome de usuário" o valor no campo "domÃnio" é adicionado para cada login que o usuário digitar no box de login. Isso é útil se o login no LDAP é salvo incluindo o nome do domÃnio. Exemplo: Usuário entra com "Maria" especificado como "localhost.com". O login que é verificado em relação ao LDAP é ma...@localhost.com]]></entry> <entry key="1117"><![CDATA[Adicionar DomÃnio ao usuário]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Texto da área de transferência remota</entry> <entry key="1131"><![CDATA[Convidar usuário a sala de conferência]]></entry> <entry key="1132"><![CDATA[Escolha uma sala de conferência. O usuário convidado irá receber uma mensagem com seu nome e um link para a sala.]]></entry> <entry key="1134"><![CDATA[Entre na sala após o envio de convite]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 e5a039b..344aa95 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[ÐÑли Ð²Ñ Ð²ÐºÐ»ÑÑиÑе "добавиÑÑ Ð´Ð¾Ð¼ÐµÐ½ к имени", знаÑение Ð¿Ð¾Ð»Ñ "домен" добавиÑÑÑ Ðº ÐºÐ°Ð¶Ð´Ð¾Ð¼Ñ Ð»Ð¾Ð³Ð¸Ð½Ñ, коÑоÑÑй вводиÑÑÑ Ð¿Ñи Ð²Ñ Ð¾Ð´Ðµ в ÑиÑÑемÑ. ÐÑо Ñдобно, еÑли логин в Ldap запоминаеÑÑÑ Ñ Ð´Ð¾Ð¼ÐµÐ½Ð½Ñм именем. ÐапÑимеÑ: полÑзоваÑÐµÐ»Ñ Ð²Ð²Ð¾Ð´Ð¸Ñ "hans", домен ÑÑÑановлен в "localhost.com", логин, коÑоÑÑй пÑовеÑÑеÑÑÑ Ð´Ð»Ñ Ldap бÑдеÑ: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[ÐобавиÑÑ Ð´Ð¾Ð¼ÐµÐ½ к имени]]></entry> <entry key="1118"><![CDATA[Ðомен]]></entry> + <entry key="1121">ТекÑÑ Ð¸Ð· бÑÑеÑа обмена</entry> <entry key="1131"><![CDATA[ÐÑиглаÑиÑÑ Ð¿Ð¾Ð»Ñз-Ð»Ñ Ð² комнаÑÑ Ð´Ð»Ñ ÐºÐ¾Ð½ÑеÑенÑий]]></entry> <entry key="1132"><![CDATA[ÐÑбÑаÑÑ ÐºÐ¾Ð¼Ð½Ð°ÑÑ Ð´Ð»Ñ ÐºÐ¾Ð½ÑеÑенÑий. ÐÑиглаÑÑннÑй ÑÑаÑÑник полÑÑÐ¸Ñ ÑообÑение Ñ Ð²Ð°Ñим именем и ÑÑÑÐ»ÐºÑ Ð½Ð° комнаÑÑ.]]></entry> <entry key="1134"><![CDATA[ÐойдиÑе в комнаÑÑ Ð¿Ð¾Ñле оÑпÑавки пÑиглаÑениÑ]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 f5912c7..1aa5352 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 bc2ba6d..c6959d4 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 34a551d..6ad5e3b 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 51fa18b..0d49331 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 6101933..8fdde93 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[ЯкÑо ви вклÑÑиÑе "додаÑи домен до ÑменÑ", знаÑÐµÐ½Ð½Ñ Ð¿Ð¾Ð»Ñ "домен" додаÑÑÑÑÑ Ð´Ð¾ кожного логÑном, Ñкий вводиÑÑÑÑ Ð¿Ñи Ð²Ñ Ð¾Ð´Ñ Ð² ÑиÑÑемÑ. Це зÑÑÑно, ÑкÑо логÑн Ñ Ldap запам'ÑÑовÑÑÑÑÑÑ Ð· доменним Ñм'Ñм. ÐапÑиклад: коÑиÑÑÑÐ²Ð°Ñ Ð²Ð²Ð¾Ð´Ð¸ÑÑ "hans", домен вÑÑановлений в "localhost.com", логÑн, Ñкий пеÑевÑÑÑÑÑÑÑÑ Ð´Ð»Ñ Ldap бÑде: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[ÐодаÑи домен до ÑменÑ]]></entry> <entry key="1118"><![CDATA[Ðомен]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[ÐапÑоÑиÑи коÑиÑ-Ð»Ñ Ð² кÑмнаÑÑ Ð´Ð»Ñ Ð½Ð°Ñад]]></entry> <entry key="1132"><![CDATA[ÐибÑаÑи кÑмнаÑÑ Ð´Ð»Ñ Ð½Ð°Ñад. ÐапÑоÑений ÑÑаÑник оÑÑÐ¸Ð¼Ð°Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· ваÑим Ñм'Ñм Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° кÑмнаÑÑ.]]></entry> <entry key="1134"><![CDATA[УвÑйдÑÑÑ Ð² кÑмнаÑÑ Ð¿ÑÑÐ»Ñ Ð²ÑдпÑÐ°Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð¿ÑоÑеннÑ]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 a5d50bd..fc0809d 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[å¦ææ¨å¾éäºâå¢å åé项âï¼åå¨ç»å½çé¢ä¸å°åºç°âåâéæ©ä¸ææ¡é项ãè¿é¡¹åè½å¨LDAPç®å½æå¡çé ç½®ä¸æ¯é常æç¨çãå¦ï¼å¦æç¨æ·ä½¿ç¨h...@localhost.comä½ä¸ºldapç®å½æå¡çç»å½åï¼åå¨ç¨æ·åä¸åªéè¦è¾å ¥hansï¼èåé项åéæ©localhost.com]]></entry> <entry key="1117"><![CDATA[å¨ç¨æ·ååå å ¥åå]]></entry> <entry key="1118"><![CDATA[åå]]></entry> + <entry key="1121">è¿ç¨ç²è´´æ¿ä¸çææ¬</entry> <entry key="1131"><![CDATA[é请ç¨æ·åä¸ä¼è®®]]></entry> <entry key="1132"><![CDATA[éæ©ä¸ä¸ªä¼è®®å®¤ï¼è¢«é请è ä¼åå°ä¸æ¡æ¨çåååè¿å ¥ä¼è®®å®¤çé¾æ¥]]></entry> <entry key="1134"><![CDATA[é请åè¿å ¥ä¼è®®å®¤]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 537a6e6..950b901 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 @@ -422,6 +422,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: h...@localhost.com]]></entry> <entry key="1117"><![CDATA[Add Domain to username]]></entry> <entry key="1118"><![CDATA[Domain]]></entry> + <entry key="1121">Remote clipboard text</entry> <entry key="1131"><![CDATA[Invite user to conference room]]></entry> <entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry> <entry key="1134"><![CDATA[Enter room after sending invitation]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/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 419e8ed..807ccf6 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 @@ -74,6 +74,9 @@ <br/> <input id="exclusive-confirm-dont-show" type="checkbox"/><label for="exclusive-confirm-dont-show"><wicket:message key="64"/></label> </div> + <div id="clipboard-dialog" wicket:message="title:1121,data-btn-ok:54"> + <p><span class="ui-icon ui-icon-alert" style="float:left; margin:12px 12px 20px 0;"></span><span class="text"></span></p> + </div> </div> </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb029488/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index d70ba7f..a57c1c6 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -635,6 +635,24 @@ var Room = (function() { $('.ui-dialog.user-video').remove(); $(window).off('keyup', _keyHandler); } + function _showClipboard(txt) { + let dlg = $('#clipboard-dialog'); + dlg.find('p .text').text(txt); + dlg.dialog({ + resizable: false + , height: "auto" + , width: 400 + , modal: true + , buttons: [ + { + text: dlg.data('btn-ok') + , click: function() { + $(this).dialog('close'); + } + } + ] + }); + } self.init = _init; self.getOptions = function() { return JSON.parse(JSON.stringify(options)); }; @@ -643,6 +661,7 @@ var Room = (function() { self.keyHandler = _keyHandler; self.load = _load; self.unload = _unload; + self.showClipboard = _showClipboard; return self; })(); function startPrivateChat(el) {
