Repository: openmeetings Updated Branches: refs/heads/4.0.x 4a9a75230 -> db75fdbca
[OPENMEETINGS-1775] enter/ctrl option button is added Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/db75fdbc Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/db75fdbc Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/db75fdbc Branch: refs/heads/4.0.x Commit: db75fdbcaecd9313dce0831399b33779a81ce651 Parents: 4a9a752 Author: Maxim Solodovnik <[email protected]> Authored: Mon Dec 25 23:31:22 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Dec 25 23:31:22 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/web/app/Application.properties.xml | 2 ++ .../web/app/Application_ar.properties.xml | 2 ++ .../web/app/Application_bg.properties.xml | 2 ++ .../web/app/Application_ca.properties.xml | 2 ++ .../web/app/Application_cs.properties.xml | 2 ++ .../web/app/Application_da.properties.xml | 2 ++ .../web/app/Application_de.properties.xml | 2 ++ .../web/app/Application_el.properties.xml | 2 ++ .../web/app/Application_es.properties.xml | 2 ++ .../web/app/Application_fa.properties.xml | 2 ++ .../web/app/Application_fi.properties.xml | 2 ++ .../web/app/Application_fr.properties.xml | 2 ++ .../web/app/Application_gl.properties.xml | 2 ++ .../web/app/Application_he.properties.xml | 2 ++ .../web/app/Application_hu.properties.xml | 2 ++ .../web/app/Application_id.properties.xml | 2 ++ .../web/app/Application_it.properties.xml | 2 ++ .../web/app/Application_ja.properties.xml | 2 ++ .../web/app/Application_ko.properties.xml | 2 ++ .../web/app/Application_nl.properties.xml | 2 ++ .../web/app/Application_pl.properties.xml | 2 ++ .../web/app/Application_pt.properties.xml | 2 ++ .../web/app/Application_pt_BR.properties.xml | 2 ++ .../web/app/Application_ru.properties.xml | 2 ++ .../web/app/Application_sk.properties.xml | 2 ++ .../web/app/Application_sv.properties.xml | 2 ++ .../web/app/Application_th.properties.xml | 2 ++ .../web/app/Application_tr.properties.xml | 2 ++ .../web/app/Application_uk.properties.xml | 2 ++ .../web/app/Application_zh_CN.properties.xml | 2 ++ .../web/app/Application_zh_TW.properties.xml | 2 ++ .../openmeetings/web/user/chat/ChatToolbar.html | 1 + openmeetings-web/src/main/webapp/css/chat.css | 5 +++++ .../src/main/webapp/css/images/key_ctrl.png | Bin 0 -> 836 bytes 34 files changed, 68 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 bdac5a9..16d3bad 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 a8dfa38..3e3d810 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 7d74c31..0f57dce 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 c963d69..0d89800 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 6eb1f46..268e180 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 eb11bf4..f4323ee 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 1949026..2ee8243 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 @@ -1008,4 +1008,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[hat den Raum verlassen.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Mathe Formeln]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 4bcd31a..26a5dcc 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 404526f..da6a47c 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 @@ -1001,4 +1001,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[ha salido de la sala.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 3610e47..ec09a5a 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 4ad7b0d..38443d0 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 9d63e65..59e6ba6 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 @@ -995,4 +995,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[a quitté la salle.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 63c8d53..743cbd1 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml index bdac5a9..16d3bad 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 bd65f7b..fab98eb 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 @@ -991,4 +991,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[kilépett a szobából.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 c7995cc..2f93fc0 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 fb128c7..4a8dd3d 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 @@ -1004,4 +1004,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[ha lasciato la stanza.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 a782ea7..1dcb6be 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[ããã¯ä¼è°å®¤ããé室ãã¾ãã]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 6f0498f..bc0a118 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 69d969b..b5dd4d3 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 38d5645..c667eb1 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 8ce0418..ffe2138 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 dd5ea5b..62327f0 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[saiu da sala.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 85390ed..fddc01a 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 @@ -1004,4 +1004,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[Ð¿Ð¾ÐºÐ¸Ð´Ð°ÐµÑ ÐºÐ¾Ð¼Ð½Ð°ÑÑ.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[ÐаÑемаÑиÑеÑÐºÐ°Ñ ÑоÑмÑла]]></entry> <entry key="lbl.update"><![CDATA[ÐзмениÑÑ]]></entry> + <entry key="send.on.enter"><![CDATA[ÐÑпÑавиÑÑ Ð¿Ð¾ Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[ÐÑпÑавиÑÑ Ð¿Ð¾ Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 89df466..a6f9406 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 5e5107b..597abfd 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 3602e80..76b34e7 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 a6322c4..90d0e7b 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 0444aa7..07ff504 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 @@ -1004,4 +1004,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[залиÑÐ°Ñ ÐºÑмнаÑÑ.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 546f319..54610be 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 @@ -993,4 +993,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[离å¼äºä¼è®®å®¤.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/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 b42bb7c..8d69ecb 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 @@ -1003,4 +1003,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="activities.msg.exit"><![CDATA[has left the room.]]></entry> <entry key="wb.tool.math.formula"><![CDATA[Math formula]]></entry> <entry key="lbl.update"><![CDATA[Update]]></entry> + <entry key="send.on.enter"><![CDATA[Send on Enter]]></entry> + <entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry> </properties> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html index f06be00..38e972e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html @@ -79,6 +79,7 @@ <li><a class="chat-btn chat-tool-icon btn btn-default save" wicket:message="title:197" wicket:id="save"></a></li> <li><a class="chat-btn chat-tool-icon btn btn-default delete" wicket:message="title:442" wicket:id="delete"></a></li> <li><a class="chat-btn chat-tool-icon btn btn-default audio" wicket:message="data-sound-enabled:sound.mute,data-sound-muted:sound.enable"> </a></li> + <li><a class="chat-btn chat-tool-icon btn btn-default send-ctrl" wicket:message="data-send-enter:send.on.enter,data-send-ctrl:send.on.ctrl.enter"><b>↵</b></a></li> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/openmeetings-web/src/main/webapp/css/chat.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/chat.css b/openmeetings-web/src/main/webapp/css/chat.css index 83b4787..5ee814c 100644 --- a/openmeetings-web/src/main/webapp/css/chat.css +++ b/openmeetings-web/src/main/webapp/css/chat.css @@ -123,6 +123,11 @@ #chat #fontStyle span { background-image: url(images/settings.png); } +.send-ctrl.chat-tool-icon { + background-image: url(images/key_ctrl.png); + background-position: 0px 0px; + background-size: 25px; +} #chat .chat-btn { display: inline-block; float: right; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db75fdbc/openmeetings-web/src/main/webapp/css/images/key_ctrl.png ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/images/key_ctrl.png b/openmeetings-web/src/main/webapp/css/images/key_ctrl.png new file mode 100644 index 0000000..53e04a5 Binary files /dev/null and b/openmeetings-web/src/main/webapp/css/images/key_ctrl.png differ
