commit 8ec139098a26b52f5646e5fd24e6be01bb1a8ebe
author Virtually Nick <necouchman@users.noreply.github.com> Sat Jun 22 17:39:05 2019 -0400
committer GitHub <noreply@github.com> Sat Jun 22 17:39:05 2019 -0400
tree a2b6e079b4bdb43d39de75164fa83bc239b5a348
parent 5f1c70e737ca0b0e7726d5df62ef1631eac078d0
parent e412742b5997b4945f06fa0da75884b3724e2881

GUACAMOLE-723: Merge allow connection name to display cleanly in menu.

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

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 cd84142..36b2631 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
@@ -91,6 +91,7 @@
                     "type"    : "ENUM",
                     "options" : [
                         "",
+                        "de-ch-qwertz",
                         "de-de-qwertz",
                         "en-gb-qwerty",
                         "en-us-qwerty",

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

diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 458ed2e..a22dfea 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -452,6 +452,7 @@
         "FIELD_OPTION_SECURITY_RDP"   : "RDP encryption",
         "FIELD_OPTION_SECURITY_TLS"   : "TLS encryption",
 
+        "FIELD_OPTION_SERVER_LAYOUT_DE_CH_QWERTZ" : "Swiss German (Qwertz)",
         "FIELD_OPTION_SERVER_LAYOUT_DE_DE_QWERTZ" : "German (Qwertz)",
         "FIELD_OPTION_SERVER_LAYOUT_EMPTY"        : "",
         "FIELD_OPTION_SERVER_LAYOUT_EN_GB_QWERTY" : "UK English (Qwerty)",