From 48ce083ad7bba0678b88756b40a38d1bc0079f9f Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Fri, 14 Jun 2019 10:43:40 -0700
Subject: [PATCH] GUACAMOLE-815: Remove duplicated "timezone" field definitions
 and translations.

---
 .../main/resources/org/apache/guacamole/protocols/rdp.json    | 4 ----
 .../main/resources/org/apache/guacamole/protocols/ssh.json    | 4 ----
 guacamole/src/main/webapp/translations/en.json                | 1 -
 3 files changed, 9 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 58753ff87..bebc27e2c 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
@@ -199,10 +199,6 @@
                 {
                     "name"  : "static-channels",
                     "type"  : "TEXT"
-                },
-                {
-                    "name"  : "timezone",
-                    "type"  : "TIMEZONE"
                 }
             ]
         },
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 8baa51ef9..a16648f6d 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
@@ -100,10 +100,6 @@
                     "name"    : "terminal-type",
                     "type"    : "ENUM",
                     "options" : [ "", "xterm", "xterm-256color", "vt220", "vt100", "ansi", "linux" ]
-                },
-                {
-                    "name"    : "timezone",
-                    "type"    : "TIMEZONE"
                 }
             ]
         },
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 9c3c183d2..716adb1c6 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -415,7 +415,6 @@
         "FIELD_HEADER_REMOTE_APP_ARGS" : "Parameters:",
         "FIELD_HEADER_REMOTE_APP_DIR"  : "Working directory:",
         "FIELD_HEADER_REMOTE_APP"      : "Program:",
-        "FIELD_HEADER_TIMEZONE"        : "Timezone:",
         "FIELD_HEADER_SECURITY"        : "Security mode:",
         "FIELD_HEADER_SERVER_LAYOUT"   : "Keyboard layout:",
         "FIELD_HEADER_SFTP_DIRECTORY"             : "Default upload directory:",