Merge 1.1.0 changes back to master.

This commit is contained in:
Michael Jumper
2019-06-17 18:38:29 -07:00
2 changed files with 2 additions and 0 deletions

View File

@@ -91,6 +91,7 @@
"type" : "ENUM",
"options" : [
"",
"de-ch-qwertz",
"de-de-qwertz",
"en-gb-qwerty",
"en-us-qwerty",

View File

@@ -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)",