Merge 1.1.0 changes back to master.

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

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

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

@@ -498,6 +498,7 @@
         "FIELD_HEADER_ENABLE_SFTP"   : "Enable SFTP:",
         "FIELD_HEADER_HOST_KEY"      : "Public host key (Base64):",
         "FIELD_HEADER_HOSTNAME"      : "Hostname:",
+        "FIELD_HEADER_LOCALE"        : "Language/Locale ($LANG):",
         "FIELD_HEADER_USERNAME"      : "Username:",
         "FIELD_HEADER_PASSWORD"      : "Password:",
         "FIELD_HEADER_PASSPHRASE"    : "Passphrase:",