Merge 1.1.0 changes back to master.

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json

@@ -106,6 +106,10 @@
                         "tr-tr-qwerty"
                     ]
                 },
+                {
+                    "name"  : "timezone",
+                    "type"  : "TEXT"
+                },
                 {
                     "name"    : "console",
                     "type"    : "BOOLEAN",

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json

@@ -94,6 +94,10 @@
                     "name"  : "locale",
                     "type"  : "TEXT"
                 },
+                {
+                    "name"  : "timezone",
+                    "type"  : "TEXT"
+                },
                 {
                     "name"  : "server-alive-interval",
                     "type"  : "NUMERIC"

guacamole/src/main/webapp/translations/en.json

@@ -432,6 +432,7 @@
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"        : "File browser root directory:",
         "FIELD_HEADER_SFTP_USERNAME"              : "Username:",
         "FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:",
+        "FIELD_HEADER_TIMEZONE"        : "Time zone:",
         "FIELD_HEADER_USERNAME"        : "Username:",
         "FIELD_HEADER_WIDTH"           : "Width:",
 
@@ -513,6 +514,7 @@
         "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_TIMEZONE"        : "Time zone ($TZ):",
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
         "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",