You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2019/02/25 03:42:42 UTC
[guacamole-client] branch master updated: GUACAMOLE-381: Add
definitions for "disable-copy" and "disable-paste" connection parameters.
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
The following commit(s) were added to refs/heads/master by this push:
new e99b207 GUACAMOLE-381: Add definitions for "disable-copy" and "disable-paste" connection parameters.
new d48d55f GUACAMOLE-381: Merge add definitions for "disable-copy" and "disable-paste" connection parameters.
e99b207 is described below
commit e99b207a5844556f63d0dad011b939201eae1a81
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Tue Feb 19 12:38:12 2019 -0800
GUACAMOLE-381: Add definitions for "disable-copy" and "disable-paste" connection parameters.
---
.../resources/org/apache/guacamole/protocols/rdp.json | 16 ++++++++++++++++
.../resources/org/apache/guacamole/protocols/ssh.json | 17 +++++++++++++++++
.../org/apache/guacamole/protocols/telnet.json | 16 ++++++++++++++++
.../resources/org/apache/guacamole/protocols/vnc.json | 10 ++++++++++
guacamole/src/main/webapp/translations/de.json | 3 +++
guacamole/src/main/webapp/translations/en.json | 11 +++++++++++
guacamole/src/main/webapp/translations/es.json | 3 +++
guacamole/src/main/webapp/translations/fr.json | 3 +++
guacamole/src/main/webapp/translations/it.json | 3 +++
guacamole/src/main/webapp/translations/nl.json | 3 +++
guacamole/src/main/webapp/translations/no.json | 3 +++
guacamole/src/main/webapp/translations/ru.json | 14 ++++++++++----
guacamole/src/main/webapp/translations/zh.json | 3 +++
13 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
index e3de15f..b2adfb7 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
@@ -148,6 +148,22 @@
},
{
+ "name" : "clipboard",
+ "fields" : [
+ {
+ "name" : "disable-copy",
+ "type" : "BOOLEAN",
+ "options" : [ "true" ]
+ },
+ {
+ "name" : "disable-paste",
+ "type" : "BOOLEAN",
+ "options" : [ "true" ]
+ }
+ ]
+ },
+
+ {
"name" : "device-redirection",
"fields" : [
{
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
index a71e1fb..8b7e80b 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
@@ -68,6 +68,22 @@
},
{
+ "name" : "clipboard",
+ "fields" : [
+ {
+ "name" : "disable-copy",
+ "type" : "BOOLEAN",
+ "options" : [ "true" ]
+ },
+ {
+ "name" : "disable-paste",
+ "type" : "BOOLEAN",
+ "options" : [ "true" ]
+ }
+ ]
+ },
+
+ {
"name" : "session",
"fields" : [
{
@@ -80,6 +96,7 @@
}
]
},
+
{
"name" : "behavior",
"fields" : [
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
index 42d5be0..81d74e3 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
@@ -72,6 +72,22 @@
},
{
+ "name" : "clipboard",
+ "fields" : [
+ {
+ "name" : "disable-copy",
+ "type" : "BOOLEAN",
+ "options" : [ "true" ]
+ },
+ {
+ "name" : "disable-paste",
+ "type" : "BOOLEAN",
+ "options" : [ "true" ]
+ }
+ ]
+ },
+
+ {
"name" : "behavior",
"fields" : [
{
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
index bdeaebc..cc0a75a 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
@@ -59,6 +59,16 @@
"name" : "clipboard-encoding",
"type" : "ENUM",
"options" : [ "", "ISO8859-1", "UTF-8", "UTF-16", "CP1252" ]
+ },
+ {
+ "name" : "disable-copy",
+ "type" : "BOOLEAN",
+ "options" : [ "true" ]
+ },
+ {
+ "name" : "disable-paste",
+ "type" : "BOOLEAN",
+ "options" : [ "true" ]
}
]
},
diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json
index 9e24ba7..b3c67db 100644
--- a/guacamole/src/main/webapp/translations/de.json
+++ b/guacamole/src/main/webapp/translations/de.json
@@ -354,6 +354,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Authentifizierung",
"SECTION_HEADER_BASIC_PARAMETERS" : "Basiseinstellungen",
+ "SECTION_HEADER_CLIPBOARD" : "Zwischenablage",
"SECTION_HEADER_DEVICE_REDIRECTION" : "Geräteumleitung",
"SECTION_HEADER_DISPLAY" : "Bildschirm",
"SECTION_HEADER_NETWORK" : "Netzwerk",
@@ -403,6 +404,7 @@
"NAME" : "SSH",
"SECTION_HEADER_AUTHENTICATION" : "Authentifizierung",
+ "SECTION_HEADER_CLIPBOARD" : "Zwischenablage",
"SECTION_HEADER_DISPLAY" : "Bildschirm",
"SECTION_HEADER_NETWORK" : "Netzwerk",
"SECTION_HEADER_SESSION" : "Sitzung / Umgebung",
@@ -447,6 +449,7 @@
"NAME" : "Telnet",
"SECTION_HEADER_AUTHENTICATION" : "Authentifizierung",
+ "SECTION_HEADER_CLIPBOARD" : "Zwischenablage",
"SECTION_HEADER_DISPLAY" : "Bildschirm",
"SECTION_HEADER_NETWORK" : "Netzwerk"
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 9fc69ef..42afa22 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -373,6 +373,8 @@
"FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:",
"FIELD_HEADER_DISABLE_AUDIO" : "Disable audio:",
"FIELD_HEADER_DISABLE_AUTH" : "Disable authentication:",
+ "FIELD_HEADER_DISABLE_COPY" : "Disable copying from remote desktop:",
+ "FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:",
"FIELD_HEADER_DOMAIN" : "Domain:",
"FIELD_HEADER_DPI" : "Resolution (DPI):",
"FIELD_HEADER_DRIVE_NAME" : "Drive name:",
@@ -466,6 +468,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
"SECTION_HEADER_BASIC_PARAMETERS" : "Basic Settings",
+ "SECTION_HEADER_CLIPBOARD" : "Clipboard",
"SECTION_HEADER_DEVICE_REDIRECTION" : "Device Redirection",
"SECTION_HEADER_DISPLAY" : "Display",
"SECTION_HEADER_GATEWAY" : "Remote Desktop Gateway",
@@ -486,6 +489,8 @@
"FIELD_HEADER_COMMAND" : "Execute command:",
"FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:",
"FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:",
+ "FIELD_HEADER_DISABLE_COPY" : "Disable copying from terminal:",
+ "FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:",
"FIELD_HEADER_FONT_NAME" : "Font name:",
"FIELD_HEADER_FONT_SIZE" : "Font size:",
"FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:",
@@ -546,6 +551,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
"SECTION_HEADER_BEHAVIOR" : "Terminal behavior",
+ "SECTION_HEADER_CLIPBOARD" : "Clipboard",
"SECTION_HEADER_DISPLAY" : "Display",
"SECTION_HEADER_NETWORK" : "Network",
"SECTION_HEADER_RECORDING" : "Screen Recording",
@@ -561,6 +567,8 @@
"FIELD_HEADER_COLOR_SCHEME" : "Color scheme:",
"FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:",
"FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:",
+ "FIELD_HEADER_DISABLE_COPY" : "Disable copying from terminal:",
+ "FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:",
"FIELD_HEADER_FONT_NAME" : "Font name:",
"FIELD_HEADER_FONT_SIZE" : "Font size:",
"FIELD_HEADER_HOSTNAME" : "Hostname:",
@@ -619,6 +627,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
"SECTION_HEADER_BEHAVIOR" : "Terminal behavior",
+ "SECTION_HEADER_CLIPBOARD" : "Clipboard",
"SECTION_HEADER_DISPLAY" : "Display",
"SECTION_HEADER_RECORDING" : "Screen Recording",
"SECTION_HEADER_TYPESCRIPT" : "Typescript (Text Session Recording)",
@@ -635,6 +644,8 @@
"FIELD_HEADER_CURSOR" : "Cursor:",
"FIELD_HEADER_DEST_HOST" : "Destination host:",
"FIELD_HEADER_DEST_PORT" : "Destination port:",
+ "FIELD_HEADER_DISABLE_COPY" : "Disable copying from remote desktop:",
+ "FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:",
"FIELD_HEADER_ENABLE_AUDIO" : "Enable audio:",
"FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:",
"FIELD_HEADER_HOSTNAME" : "Hostname:",
diff --git a/guacamole/src/main/webapp/translations/es.json b/guacamole/src/main/webapp/translations/es.json
index c165d5c..fd305db 100644
--- a/guacamole/src/main/webapp/translations/es.json
+++ b/guacamole/src/main/webapp/translations/es.json
@@ -399,6 +399,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Autenticación",
"SECTION_HEADER_BASIC_PARAMETERS" : "Configuración básica",
+ "SECTION_HEADER_CLIPBOARD" : "Portapapeles",
"SECTION_HEADER_DEVICE_REDIRECTION" : "Redirección dispositivo",
"SECTION_HEADER_DISPLAY" : "Visualización",
"SECTION_HEADER_GATEWAY" : "Puerta de enlace remota",
@@ -460,6 +461,7 @@
"NAME" : "SSH",
"SECTION_HEADER_AUTHENTICATION" : "Autenticación",
+ "SECTION_HEADER_CLIPBOARD" : "Portapapeles",
"SECTION_HEADER_DISPLAY" : "Mostrar",
"SECTION_HEADER_NETWORK" : "Red",
"SECTION_HEADER_RECORDING" : "Grabación de pantalla",
@@ -512,6 +514,7 @@
"NAME" : "Telnet",
"SECTION_HEADER_AUTHENTICATION" : "Autenticación",
+ "SECTION_HEADER_CLIPBOARD" : "Portapapeles",
"SECTION_HEADER_DISPLAY" : "Mostrar",
"SECTION_HEADER_RECORDING" : "Grabación pantalla",
"SECTION_HEADER_TYPESCRIPT" : "Script de escritura (Próxima sesión de grabación)",
diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json
index 9407178..1b45451 100644
--- a/guacamole/src/main/webapp/translations/fr.json
+++ b/guacamole/src/main/webapp/translations/fr.json
@@ -356,6 +356,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Authentification",
"SECTION_HEADER_BASIC_PARAMETERS" : "Paramètres de base",
+ "SECTION_HEADER_CLIPBOARD" : "Presse-papiers",
"SECTION_HEADER_DEVICE_REDIRECTION" : "Redirection Périphérique",
"SECTION_HEADER_DISPLAY" : "Affichage",
"SECTION_HEADER_NETWORK" : "Réseau",
@@ -406,6 +407,7 @@
"NAME" : "SSH",
"SECTION_HEADER_AUTHENTICATION" : "Authentification",
+ "SECTION_HEADER_CLIPBOARD" : "Presse-papiers",
"SECTION_HEADER_DISPLAY" : "Affichage",
"SECTION_HEADER_NETWORK" : "Réseau",
"SECTION_HEADER_SESSION" : "Session / Environnement",
@@ -450,6 +452,7 @@
"NAME" : "Telnet",
"SECTION_HEADER_AUTHENTICATION" : "Authentification",
+ "SECTION_HEADER_CLIPBOARD" : "Presse-papiers",
"SECTION_HEADER_DISPLAY" : "Affichage",
"SECTION_HEADER_NETWORK" : "Réseau"
diff --git a/guacamole/src/main/webapp/translations/it.json b/guacamole/src/main/webapp/translations/it.json
index 442e709..6e6daea 100644
--- a/guacamole/src/main/webapp/translations/it.json
+++ b/guacamole/src/main/webapp/translations/it.json
@@ -332,6 +332,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
"SECTION_HEADER_BASIC_PARAMETERS" : "Basic Settings",
+ "SECTION_HEADER_CLIPBOARD" : "Appunti",
"SECTION_HEADER_DEVICE_REDIRECTION" : "Device Redirection",
"SECTION_HEADER_DISPLAY" : "Display",
"SECTION_HEADER_NETWORK" : "Network",
@@ -372,6 +373,7 @@
"NAME" : "SSH",
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
+ "SECTION_HEADER_CLIPBOARD" : "Appunti",
"SECTION_HEADER_DISPLAY" : "Display",
"SECTION_HEADER_NETWORK" : "Network",
"SECTION_HEADER_SFTP" : "SFTP"
@@ -407,6 +409,7 @@
"NAME" : "Telnet",
"SECTION_HEADER_AUTHENTICATION" : "Authentication",
+ "SECTION_HEADER_CLIPBOARD" : "Appunti",
"SECTION_HEADER_DISPLAY" : "Display",
"SECTION_HEADER_NETWORK" : "Network"
diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json
index 00ed1f6..b257e11 100644
--- a/guacamole/src/main/webapp/translations/nl.json
+++ b/guacamole/src/main/webapp/translations/nl.json
@@ -365,6 +365,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Authenticatie",
"SECTION_HEADER_BASIC_PARAMETERS" : "Basis Instellingen",
+ "SECTION_HEADER_CLIPBOARD" : "Klembord",
"SECTION_HEADER_DEVICE_REDIRECTION" : "Apparaat Verbindingen",
"SECTION_HEADER_DISPLAY" : "Scherm",
"SECTION_HEADER_NETWORK" : "Netwerk",
@@ -422,6 +423,7 @@
"NAME" : "SSH",
"SECTION_HEADER_AUTHENTICATION" : "Authenticatie",
+ "SECTION_HEADER_CLIPBOARD" : "Klembord",
"SECTION_HEADER_DISPLAY" : "Scherm",
"SECTION_HEADER_NETWORK" : "Netwerk",
"SECTION_HEADER_RECORDING" : "Scherm Opname",
@@ -474,6 +476,7 @@
"NAME" : "Telnet",
"SECTION_HEADER_AUTHENTICATION" : "Authenticatie",
+ "SECTION_HEADER_CLIPBOARD" : "Klembord",
"SECTION_HEADER_DISPLAY" : "Scherm",
"SECTION_HEADER_RECORDING" : "Scherm Opname",
"SECTION_HEADER_TYPESCRIPT" : "Typescript (Tekst Sessie Opname)",
diff --git a/guacamole/src/main/webapp/translations/no.json b/guacamole/src/main/webapp/translations/no.json
index bdec130..50e366c 100644
--- a/guacamole/src/main/webapp/translations/no.json
+++ b/guacamole/src/main/webapp/translations/no.json
@@ -348,6 +348,7 @@
"SECTION_HEADER_AUTHENTICATION" : "Autentisering",
"SECTION_HEADER_BASIC_PARAMETERS" : "Grunnleggende Innstillinger",
+ "SECTION_HEADER_CLIPBOARD" : "Utklippstavle",
"SECTION_HEADER_DEVICE_REDIRECTION" : "Enhet omdirigering",
"SECTION_HEADER_DISPLAY" : "Skjerm",
"SECTION_HEADER_NETWORK" : "Nettverk",
@@ -404,6 +405,7 @@
"NAME" : "SSH",
"SECTION_HEADER_AUTHENTICATION" : "Autentisering",
+ "SECTION_HEADER_CLIPBOARD" : "Utklippstavle",
"SECTION_HEADER_DISPLAY" : "Skjerm",
"SECTION_HEADER_NETWORK" : "Nettverk",
"SECTION_HEADER_RECORDING" : "Skjermopptak",
@@ -455,6 +457,7 @@
"NAME" : "Telnet",
"SECTION_HEADER_AUTHENTICATION" : "Autentisering",
+ "SECTION_HEADER_CLIPBOARD" : "Utklippstavle",
"SECTION_HEADER_DISPLAY" : "Skjerm",
"SECTION_HEADER_RECORDING" : "Skjermopptak",
"SECTION_HEADER_TYPESCRIPT" : "Typescript (Opptak av tekstsesjon)",
diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json
index d6b2d47..a70c988 100644
--- a/guacamole/src/main/webapp/translations/ru.json
+++ b/guacamole/src/main/webapp/translations/ru.json
@@ -327,9 +327,11 @@
"FIELD_OPTION_SERVER_LAYOUT_FR_FR_AZERTY" : "French (Azerty)",
"FIELD_OPTION_SERVER_LAYOUT_IT_IT_QWERTY" : "Italian (Qwerty)",
"FIELD_OPTION_SERVER_LAYOUT_SV_SE_QWERTY" : "Swedish (Qwerty)",
- "FIELD_OPTION_SERVER_LAYOUT_RU_RU_QWERTY" : "Russian (Qwerty)",
+ "FIELD_OPTION_SERVER_LAYOUT_RU_RU_QWERTY" : "Russian (Qwerty)",
- "NAME" : "RDP"
+ "NAME" : "RDP",
+
+ "SECTION_HEADER_CLIPBOARD" : "Буфер обмена"
},
@@ -362,7 +364,9 @@
"FIELD_OPTION_FONT_SIZE_96" : "96",
"FIELD_OPTION_FONT_SIZE_EMPTY" : "",
- "NAME" : "SSH"
+ "NAME" : "SSH",
+
+ "SECTION_HEADER_CLIPBOARD" : "Буфер обмена"
},
@@ -393,7 +397,9 @@
"FIELD_OPTION_FONT_SIZE_96" : "96",
"FIELD_OPTION_FONT_SIZE_EMPTY" : "",
- "NAME" : "Telnet"
+ "NAME" : "Telnet",
+
+ "SECTION_HEADER_CLIPBOARD" : "Буфер обмена"
},
diff --git a/guacamole/src/main/webapp/translations/zh.json b/guacamole/src/main/webapp/translations/zh.json
index eca8656..6b3d4b0 100644
--- a/guacamole/src/main/webapp/translations/zh.json
+++ b/guacamole/src/main/webapp/translations/zh.json
@@ -410,6 +410,7 @@
"SECTION_HEADER_AUTHENTICATION" : "认证",
"SECTION_HEADER_BASIC_PARAMETERS" : "基础设置",
+ "SECTION_HEADER_CLIPBOARD" : "剪贴板",
"SECTION_HEADER_DEVICE_REDIRECTION" : "设备重定向",
"SECTION_HEADER_DISPLAY" : "显示",
"SECTION_HEADER_GATEWAY" : "远程桌面网关",
@@ -480,6 +481,7 @@
"SECTION_HEADER_AUTHENTICATION" : "认证",
"SECTION_HEADER_BEHAVIOR" : "终端行为",
+ "SECTION_HEADER_CLIPBOARD" : "剪贴板",
"SECTION_HEADER_DISPLAY" : "显示",
"SECTION_HEADER_NETWORK" : "网络",
"SECTION_HEADER_RECORDING" : "屏幕录像",
@@ -541,6 +543,7 @@
"SECTION_HEADER_AUTHENTICATION" : "认证",
"SECTION_HEADER_BEHAVIOR" : "终端行为",
+ "SECTION_HEADER_CLIPBOARD" : "剪贴板",
"SECTION_HEADER_DISPLAY" : "显示",
"SECTION_HEADER_RECORDING" : "屏幕录像",
"SECTION_HEADER_TYPESCRIPT" : "打字稿（文本会话录像）",