Merge 1.1.0 changes back to master.

Conflicts:

 * extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
 * extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
 * guacamole/src/main/webapp/translations/de.json
This commit is contained in:
Michael Jumper
2019-09-09 18:57:01 -07:00
18 changed files with 572 additions and 131 deletions

View File

@@ -10,6 +10,7 @@
],
"translations" : [
"translations/de.json",
"translations/en.json",
"translations/ja.json"
],

View File

@@ -0,0 +1,13 @@
{
"DATA_SOURCE_RADIUS" : {
"NAME" : "RADIUS Backend"
},
"LOGIN" : {
"FIELD_HEADER_GUAC_RADIUS_CHALLENGE_RESPONSE" : "",
"FIELD_HEADER_GUAC_RADIUS_STATE" : "",
"INFO_RADIUS_ADDL_REQUIRED" : "Bitte zusätzliche Logindaten eingeben."
}
}