Repository: incubator-guacamole-client Updated Branches: refs/heads/master 66dc1e6af -> c7756c4fd
GUACAMOLE-40: Define RD gateway and load balancing parameters for RDP. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/db594540 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/db594540 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/db594540 Branch: refs/heads/master Commit: db594540d66bc425ff618be697a7a820c39cc51e Parents: 5a9ad11 Author: Michael Jumper <[email protected]> Authored: Mon Apr 10 11:07:00 2017 -0700 Committer: Michael Jumper <[email protected]> Committed: Sat Apr 15 20:03:30 2017 -0700 ---------------------------------------------------------------------- .../org/apache/guacamole/protocols/rdp.json | 36 ++++++++++++++++++++ guacamole/src/main/webapp/translations/de.json | 5 +++ guacamole/src/main/webapp/translations/en.json | 8 +++++ guacamole/src/main/webapp/translations/fr.json | 5 +++ guacamole/src/main/webapp/translations/nl.json | 5 +++ guacamole/src/main/webapp/translations/no.json | 5 +++ guacamole/src/main/webapp/translations/ru.json | 5 +++ 7 files changed, 69 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/db594540/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json ---------------------------------------------------------------------- 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 ac6f863..d7681a9 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 @@ -50,6 +50,32 @@ }, { + "name" : "gateway", + "fields" : [ + { + "name" : "gateway-hostname", + "type" : "TEXT" + }, + { + "name" : "gateway-port", + "type" : "NUMERIC" + }, + { + "name" : "gateway-username", + "type" : "USERNAME" + }, + { + "name" : "gateway-password", + "type" : "PASSWORD" + }, + { + "name" : "gateway-domain", + "type" : "TEXT" + } + ] + }, + + { "name" : "basic-parameters", "fields" : [ { @@ -229,6 +255,16 @@ }, { + "name" : "load-balancing", + "fields" : [ + { + "name" : "load-balance-info", + "type" : "TEXT" + } + ] + }, + + { "name" : "recording", "fields" : [ { http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/db594540/guacamole/src/main/webapp/translations/de.json ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json index 9bdf787..9403402 100644 --- a/guacamole/src/main/webapp/translations/de.json +++ b/guacamole/src/main/webapp/translations/de.json @@ -302,6 +302,11 @@ "FIELD_HEADER_ENABLE_SFTP" : "Aktiviere SFTP:", "FIELD_HEADER_ENABLE_THEMING" : "Aktiviere Theming:", "FIELD_HEADER_ENABLE_WALLPAPER" : "Aktiviere Desktophintergrund:", + "FIELD_HEADER_GATEWAY_DOMAIN" : "Domäne:", + "FIELD_HEADER_GATEWAY_HOSTNAME" : "Hostname:", + "FIELD_HEADER_GATEWAY_PASSWORD" : "Passwort:", + "FIELD_HEADER_GATEWAY_PORT" : "Port:", + "FIELD_HEADER_GATEWAY_USERNAME" : "Benutzername:", "FIELD_HEADER_HEIGHT" : "Höhe:", "FIELD_HEADER_HOSTNAME" : "Hostname:", "FIELD_HEADER_IGNORE_CERT" : "Server Zertifikat ignorieren:", http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/db594540/guacamole/src/main/webapp/translations/en.json ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index d92c3e2..512524a 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -330,10 +330,16 @@ "FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:", "FIELD_HEADER_ENABLE_THEMING" : "Enable theming:", "FIELD_HEADER_ENABLE_WALLPAPER" : "Enable wallpaper:", + "FIELD_HEADER_GATEWAY_DOMAIN" : "Domain:", + "FIELD_HEADER_GATEWAY_HOSTNAME" : "Hostname:", + "FIELD_HEADER_GATEWAY_PASSWORD" : "Password:", + "FIELD_HEADER_GATEWAY_PORT" : "Port:", + "FIELD_HEADER_GATEWAY_USERNAME" : "Username:", "FIELD_HEADER_HEIGHT" : "Height:", "FIELD_HEADER_HOSTNAME" : "Hostname:", "FIELD_HEADER_IGNORE_CERT" : "Ignore server certificate:", "FIELD_HEADER_INITIAL_PROGRAM" : "Initial program:", + "FIELD_HEADER_LOAD_BALANCE_INFO" : "Load balance info/cookie:", "FIELD_HEADER_PASSWORD" : "Password:", "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_PRECONNECTION_BLOB" : "Preconnection BLOB (VM ID):", @@ -390,6 +396,8 @@ "SECTION_HEADER_BASIC_PARAMETERS" : "Basic Settings", "SECTION_HEADER_DEVICE_REDIRECTION" : "Device Redirection", "SECTION_HEADER_DISPLAY" : "Display", + "SECTION_HEADER_GATEWAY" : "Remote Desktop Gateway", + "SECTION_HEADER_LOAD_BALANCING" : "Load Balancing", "SECTION_HEADER_NETWORK" : "Network", "SECTION_HEADER_PERFORMANCE" : "Performance", "SECTION_HEADER_PRECONNECTION_PDU" : "Preconnection PDU / Hyper-V", http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/db594540/guacamole/src/main/webapp/translations/fr.json ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json index ca4a5bd..d59c384 100644 --- a/guacamole/src/main/webapp/translations/fr.json +++ b/guacamole/src/main/webapp/translations/fr.json @@ -302,6 +302,11 @@ "FIELD_HEADER_ENABLE_SFTP" : "Activer SFTP:", "FIELD_HEADER_ENABLE_THEMING" : "Activer thématisation:", "FIELD_HEADER_ENABLE_WALLPAPER" : "Activer fond d'écran:", + "FIELD_HEADER_GATEWAY_DOMAIN" : "Nom du domaine:", + "FIELD_HEADER_GATEWAY_HOSTNAME" : "Nom d'hôte:", + "FIELD_HEADER_GATEWAY_PASSWORD" : "Mot de passe:", + "FIELD_HEADER_GATEWAY_PORT" : "Port:", + "FIELD_HEADER_GATEWAY_USERNAME" : "Identifiant:", "FIELD_HEADER_HEIGHT" : "Hauteur:", "FIELD_HEADER_HOSTNAME" : "Nom d'hôte:", "FIELD_HEADER_IGNORE_CERT" : "Ignorer le certificat du serveur:", http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/db594540/guacamole/src/main/webapp/translations/nl.json ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json index da1df10..7cc867b 100644 --- a/guacamole/src/main/webapp/translations/nl.json +++ b/guacamole/src/main/webapp/translations/nl.json @@ -303,6 +303,11 @@ "FIELD_HEADER_ENABLE_SFTP" : "Inschakelen SFTP:", "FIELD_HEADER_ENABLE_THEMING" : "Inschakelen thema's:", "FIELD_HEADER_ENABLE_WALLPAPER" : "Inschakelen achtergrond:", + "FIELD_HEADER_GATEWAY_DOMAIN" : "Domein:", + "FIELD_HEADER_GATEWAY_HOSTNAME" : "Servernaam:", + "FIELD_HEADER_GATEWAY_PASSWORD" : "Password:", + "FIELD_HEADER_GATEWAY_PORT" : "Poort:", + "FIELD_HEADER_GATEWAY_USERNAME" : "Gebruikersnaam:", "FIELD_HEADER_HEIGHT" : "Hoogte:", "FIELD_HEADER_HOSTNAME" : "Servernaam:", "FIELD_HEADER_IGNORE_CERT" : "Negeer server certificaat:", http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/db594540/guacamole/src/main/webapp/translations/no.json ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/translations/no.json b/guacamole/src/main/webapp/translations/no.json index 694e734..8b20b5d 100644 --- a/guacamole/src/main/webapp/translations/no.json +++ b/guacamole/src/main/webapp/translations/no.json @@ -287,6 +287,11 @@ "FIELD_HEADER_ENABLE_SFTP" : "Aktiver SFTP:", "FIELD_HEADER_ENABLE_THEMING" : "Aktiver tema:", "FIELD_HEADER_ENABLE_WALLPAPER" : "Ativer bakgrunnsbilde:", + "FIELD_HEADER_GATEWAY_DOMAIN" : "Domene:", + "FIELD_HEADER_GATEWAY_HOSTNAME" : "Vertsnavn:", + "FIELD_HEADER_GATEWAY_PASSWORD" : "Passord:", + "FIELD_HEADER_GATEWAY_PORT" : "Port:", + "FIELD_HEADER_GATEWAY_USERNAME" : "Brukernavn:", "FIELD_HEADER_HEIGHT" : "Høyde:", "FIELD_HEADER_HOSTNAME" : "Vertsnavn:", "FIELD_HEADER_IGNORE_CERT" : "Ignorer serversertifikat:", http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/db594540/guacamole/src/main/webapp/translations/ru.json ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json index 5e305a5..0e47f60 100644 --- a/guacamole/src/main/webapp/translations/ru.json +++ b/guacamole/src/main/webapp/translations/ru.json @@ -281,6 +281,11 @@ "FIELD_HEADER_ENABLE_DRIVE" : "ÐклÑÑиÑÑ Ð´Ð¸Ñк:", "FIELD_HEADER_ENABLE_PRINTING" : "ÐклÑÑиÑÑ Ð¿ÐµÑаÑÑ:", "FIELD_HEADER_ENABLE_SFTP" : "ÐклÑÑиÑÑ SFTP:", + "FIELD_HEADER_GATEWAY_DOMAIN" : "Ðомен:", + "FIELD_HEADER_GATEWAY_HOSTNAME" : "Ðазвание ÑеÑвеÑа:", + "FIELD_HEADER_GATEWAY_PASSWORD" : "ÐаÑолÑ:", + "FIELD_HEADER_GATEWAY_PORT" : "ÐоÑÑ:", + "FIELD_HEADER_GATEWAY_USERNAME" : "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ:", "FIELD_HEADER_HEIGHT" : "ÐÑÑоÑа:", "FIELD_HEADER_HOSTNAME" : "Ðазвание ÑеÑвеÑа:", "FIELD_HEADER_IGNORE_CERT" : "ÐгноÑиÑоваÑÑ ÑеÑÑиÑÐ¸ÐºÐ°Ñ ÑеÑвеÑа:",
