From edecaa46b252d052b2689dc25809df57cbded785 Mon Sep 17 00:00:00 2001 From: Jim Chen Date: Tue, 5 Jun 2018 22:33:50 -0400 Subject: [PATCH] GUACAMOLE-565: Add en translations for terminal-type parameter. Add en translations for the terminal-type parameter and its enum values. Also add an empty value to the terminal-type enum lists. --- .../org/apache/guacamole/protocols/ssh.json | 2 +- .../org/apache/guacamole/protocols/telnet.json | 2 +- guacamole/src/main/webapp/translations/en.json | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) 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 a0cb7d819..b3efda348 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 @@ -87,7 +87,7 @@ { "name" : "terminal-type", "type" : "ENUM", - "options" : [ "xterm", "xterm-256color", "vt220", "vt100", "ansi", "linux" ] + "options" : [ "", "xterm", "xterm-256color", "vt220", "vt100", "ansi", "linux" ] } ] }, 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 5d6028139..e3094d834 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 @@ -70,7 +70,7 @@ { "name" : "terminal-type", "type" : "ENUM", - "options" : [ "xterm", "xterm-256color", "vt220", "vt100", "ansi", "linux" ] + "options" : [ "", "xterm", "xterm-256color", "vt220", "vt100", "ansi", "linux" ] } ] }, diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index ca8acb8e1..2d927266f 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -446,6 +446,7 @@ "FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server keepalive interval:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", + "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", @@ -475,6 +476,14 @@ "FIELD_OPTION_FONT_SIZE_96" : "96", "FIELD_OPTION_FONT_SIZE_EMPTY" : "", + "FIELD_OPTION_TERMINAL_TYPE_ANSI" : "ansi", + "FIELD_OPTION_TERMINAL_TYPE_EMPTY" : "", + "FIELD_OPTION_TERMINAL_TYPE_LINUX" : "linux", + "FIELD_OPTION_TERMINAL_TYPE_VT100" : "vt100", + "FIELD_OPTION_TERMINAL_TYPE_VT220" : "vt220", + "FIELD_OPTION_TERMINAL_TYPE_XTERM" : "xterm", + "FIELD_OPTION_TERMINAL_TYPE_XTERM_256COLOR" : "xterm-256color", + "NAME" : "SSH", "SECTION_HEADER_AUTHENTICATION" : "Authentication", @@ -507,6 +516,7 @@ "FIELD_HEADER_RECORDING_INCLUDE_KEYS" : "Include key events:", "FIELD_HEADER_RECORDING_NAME" : "Recording name:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:", + "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", @@ -536,6 +546,14 @@ "FIELD_OPTION_FONT_SIZE_96" : "96", "FIELD_OPTION_FONT_SIZE_EMPTY" : "", + "FIELD_OPTION_TERMINAL_TYPE_ANSI" : "ansi", + "FIELD_OPTION_TERMINAL_TYPE_EMPTY" : "", + "FIELD_OPTION_TERMINAL_TYPE_LINUX" : "linux", + "FIELD_OPTION_TERMINAL_TYPE_VT100" : "vt100", + "FIELD_OPTION_TERMINAL_TYPE_VT220" : "vt220", + "FIELD_OPTION_TERMINAL_TYPE_XTERM" : "xterm", + "FIELD_OPTION_TERMINAL_TYPE_XTERM_256COLOR" : "xterm-256color", + "NAME" : "Telnet", "SECTION_HEADER_AUTHENTICATION" : "Authentication",