From f88c3ab56f6df078838e9563619120bec151ede1 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Sat, 2 Feb 2019 14:45:49 -0500 Subject: [PATCH 1/3] GUACAMOLE-354: Add ch-de-qwertz option for RDP keymap. --- .../src/main/resources/org/apache/guacamole/protocols/rdp.json | 1 + 1 file changed, 1 insertion(+) 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 0ee95ae1a..1d751fdea 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" : [ "", + "ch-de-qwertz", "de-de-qwertz", "en-gb-qwerty", "en-us-qwerty", From bc3b7e24e4bbdba79fcec3c0157b0a37351f465f Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Thu, 21 Feb 2019 17:53:47 -0500 Subject: [PATCH 2/3] GUACAMOLE-354: Add translation string for CH DE keyboard layout. --- guacamole/src/main/webapp/translations/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index e80ac90c7..f9f06f25d 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -447,6 +447,7 @@ "FIELD_OPTION_SECURITY_RDP" : "RDP encryption", "FIELD_OPTION_SECURITY_TLS" : "TLS encryption", + "FIELD_OPTION_SERVER_LAYOUT_CH_DE_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)", From 19fe85b92b6df6dfcb1834574fa94084ee2d0973 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Thu, 21 Feb 2019 17:56:18 -0500 Subject: [PATCH 3/3] GUACAMOLE-354: Correct order of LANG-COUNTRY in keymap names. --- .../src/main/resources/org/apache/guacamole/protocols/rdp.json | 2 +- guacamole/src/main/webapp/translations/en.json | 2 +- 2 files changed, 2 insertions(+), 2 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 1d751fdea..dde853df3 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,7 +91,7 @@ "type" : "ENUM", "options" : [ "", - "ch-de-qwertz", + "de-ch-qwertz", "de-de-qwertz", "en-gb-qwerty", "en-us-qwerty", diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index f9f06f25d..eed947387 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -447,7 +447,7 @@ "FIELD_OPTION_SECURITY_RDP" : "RDP encryption", "FIELD_OPTION_SECURITY_TLS" : "TLS encryption", - "FIELD_OPTION_SERVER_LAYOUT_CH_DE_QWERTZ" : "Swiss German (Qwertz)", + "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)",