From 1f1d64e2c8a598bb70643399d2651fe21a17c227 Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Mon, 26 Feb 2018 15:14:41 -0500
Subject: [PATCH] GUACAMOLE-269: Move options to new section, fix translations.

---
 .../main/resources/org/apache/guacamole/protocols/ssh.json | 7 ++++++-
 .../resources/org/apache/guacamole/protocols/telnet.json   | 2 +-
 guacamole/src/main/webapp/translations/en.json             | 7 ++++---
 3 files changed, 11 insertions(+), 5 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 952b77bb1..442214a3c 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
@@ -73,7 +73,12 @@
                 {
                     "name"  : "server-alive-interval",
                     "type"  : "NUMERIC"
-                },
+                }
+            ]
+        },
+        {
+            "name" : "behavior",
+            "fields" : [
                 {
                     "name"    : "backspace",
                     "type"    : "ENUM",
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 7acdcd8c3..5b960f844 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
@@ -60,7 +60,7 @@
         },
 
         {
-            "name" : "session",
+            "name" : "behavior",
             "fields" : [
                 {
                     "name"    : "backspace",
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index c33b14fda..55da7f2a5 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -476,6 +476,7 @@
         "NAME" : "SSH",
 
         "SECTION_HEADER_AUTHENTICATION" : "Authentication",
+        "SECTION_HEADER_BEHAVIOR"       : "Terminal behavior",
         "SECTION_HEADER_DISPLAY"        : "Display",
         "SECTION_HEADER_NETWORK"        : "Network",
         "SECTION_HEADER_RECORDING"      : "Screen Recording",
@@ -507,8 +508,8 @@
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
         "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
 
-        "FIELD_OPTION_BACKSPACE_0X08"  : "Backspace (Ctrl-H)",
-        "FIELD_OPTION_BACKSPACE_0X7F"  : "Delete (Ctrl-?)",
+        "FIELD_OPTION_BACKSPACE_127"  : "Backspace (Ctrl-H)",
+        "FIELD_OPTION_BACKSPACE_8"  : "Delete (Ctrl-?)",
 
         "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Black on white",
         "FIELD_OPTION_COLOR_SCHEME_EMPTY"       : "",
@@ -535,9 +536,9 @@
         "NAME" : "Telnet",
 
         "SECTION_HEADER_AUTHENTICATION" : "Authentication",
+        "SECTION_HEADER_BEHAVIOR"       : "Terminal behavior",
         "SECTION_HEADER_DISPLAY"        : "Display",
         "SECTION_HEADER_RECORDING"      : "Screen Recording",
-        "SECTION_HEADER_SESSION"        : "Session / Environment",
         "SECTION_HEADER_TYPESCRIPT"     : "Typescript (Text Session Recording)",
         "SECTION_HEADER_NETWORK"        : "Network"