safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56 from glyptodon/blank-default

Browse Source 
GUAC-987: Ensure all enum parameters have legal blank values.
This commit is contained in:
James Muehlner
2015-01-05 00:46:12 -08:00
parent a8e4f952d9 91761641eb
commit c36a9948ab
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.xml
View File

@@ -12,6 +12,7 @@
<param name="height" type="numeric" title="Display height"/> <param name="height" type="numeric" title="Display height"/>
<param name="dpi" type="numeric" title="Display resolution (DPI)"/> <param name="dpi" type="numeric" title="Display resolution (DPI)"/>
<param name="color-depth" type="enum" title="Color depth"> <param name="color-depth" type="enum" title="Color depth">
<option value=""></option>
<option value="8">256 color</option> <option value="8">256 color</option>
<option value="16">Low color (16-bit)</option> <option value="16">Low color (16-bit)</option>
<option value="24">True color (24-bit)</option> <option value="24">True color (24-bit)</option>
@@ -19,7 +20,7 @@
</param> </param>
<param name="server-layout" type="enum" title="Keyboard layout"> <param name="server-layout" type="enum" title="Keyboard layout">
<option value="">(default)</option> <option value=""></option>
<option value="en-us-qwerty">US English (Qwerty)</option> <option value="en-us-qwerty">US English (Qwerty)</option>
<option value="fr-fr-azerty">French (Azerty)</option> <option value="fr-fr-azerty">French (Azerty)</option>
<option value="de-de-qwertz">German (Qwertz)</option> <option value="de-de-qwertz">German (Qwertz)</option>
@@ -35,7 +36,7 @@
<param name="drive-path" type="text" title="Drive path"/> <param name="drive-path" type="text" title="Drive path"/>
<param name="security" type="enum" title="Security mode"> <param name="security" type="enum" title="Security mode">
<option value="">(default)</option> <option value=""></option>
<option value="rdp">RDP encryption</option> <option value="rdp">RDP encryption</option>
<option value="tls">TLS encryption</option> <option value="tls">TLS encryption</option>
<option value="nla">NLA (Network Level Authentication)</option> <option value="nla">NLA (Network Level Authentication)</option>

2
guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/vnc.xml
View File

@@ -8,11 +8,13 @@
<param name="swap-red-blue" type="boolean" title="Swap red/blue components" value="true"/> <param name="swap-red-blue" type="boolean" title="Swap red/blue components" value="true"/>
<param name="cursor" type="enum" title="Cursor"> <param name="cursor" type="enum" title="Cursor">
<option value=""></option>
<option value="local">Local</option> <option value="local">Local</option>
<option value="remote">Remote</option> <option value="remote">Remote</option>
</param> </param>
<param name="color-depth" type="enum" title="Color depth"> <param name="color-depth" type="enum" title="Color depth">
<option value=""></option>
<option value="8">256 color</option> <option value="8">256 color</option>
<option value="16">Low color (16-bit)</option> <option value="16">Low color (16-bit)</option>
<option value="24">True color (24-bit)</option> <option value="24">True color (24-bit)</option>

15
guacamole/src/main/webapp/translations/en_US.json
View File

@@ -263,15 +263,16 @@
"FIELD_OPTION_COLOR_DEPTH_24" : "True color (24-bit)", "FIELD_OPTION_COLOR_DEPTH_24" : "True color (24-bit)",
"FIELD_OPTION_COLOR_DEPTH_32" : "True color (32-bit)", "FIELD_OPTION_COLOR_DEPTH_32" : "True color (32-bit)",
"FIELD_OPTION_COLOR_DEPTH_8" : "256 color", "FIELD_OPTION_COLOR_DEPTH_8" : "256 color",
"FIELD_OPTION_COLOR_DEPTH_EMPTY" : "",
"FIELD_OPTION_SECURITY_ANY" : "Any", "FIELD_OPTION_SECURITY_ANY" : "Any",
"FIELD_OPTION_SECURITY_EMPTY" : "(default)", "FIELD_OPTION_SECURITY_EMPTY" : "",
"FIELD_OPTION_SECURITY_NLA" : "NLA (Network Level Authentication)", "FIELD_OPTION_SECURITY_NLA" : "NLA (Network Level Authentication)",
"FIELD_OPTION_SECURITY_RDP" : "RDP encryption", "FIELD_OPTION_SECURITY_RDP" : "RDP encryption",
"FIELD_OPTION_SECURITY_TLS" : "TLS encryption", "FIELD_OPTION_SECURITY_TLS" : "TLS encryption",
"FIELD_OPTION_SERVER_LAYOUT_DE_DE_QWERTZ" : "German (Qwertz)", "FIELD_OPTION_SERVER_LAYOUT_DE_DE_QWERTZ" : "German (Qwertz)",
"FIELD_OPTION_SERVER_LAYOUT_EMPTY" : "(default)", "FIELD_OPTION_SERVER_LAYOUT_EMPTY" : "",
"FIELD_OPTION_SERVER_LAYOUT_EN_US_QWERTY" : "US English (Qwerty)", "FIELD_OPTION_SERVER_LAYOUT_EN_US_QWERTY" : "US English (Qwerty)",
"FIELD_OPTION_SERVER_LAYOUT_FAILSAFE" : "Unicode", "FIELD_OPTION_SERVER_LAYOUT_FAILSAFE" : "Unicode",
"FIELD_OPTION_SERVER_LAYOUT_FR_FR_AZERTY" : "French (Azerty)", "FIELD_OPTION_SERVER_LAYOUT_FR_FR_AZERTY" : "French (Azerty)",
@@ -357,11 +358,13 @@
"FIELD_HEADER_READ_ONLY" : "Read-only:", "FIELD_HEADER_READ_ONLY" : "Read-only:",
"FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:", "FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:",
"FIELD_OPTION_COLOR_DEPTH_8" : "256 color", "FIELD_OPTION_COLOR_DEPTH_8" : "256 color",
"FIELD_OPTION_COLOR_DEPTH_16" : "Low color (16-bit)", "FIELD_OPTION_COLOR_DEPTH_16" : "Low color (16-bit)",
"FIELD_OPTION_COLOR_DEPTH_24" : "True color (24-bit)", "FIELD_OPTION_COLOR_DEPTH_24" : "True color (24-bit)",
"FIELD_OPTION_COLOR_DEPTH_32" : "True color (32-bit)", "FIELD_OPTION_COLOR_DEPTH_32" : "True color (32-bit)",
"FIELD_OPTION_COLOR_DEPTH_EMPTY" : "",
"FIELD_OPTION_CURSOR_EMPTY" : "",
"FIELD_OPTION_CURSOR_LOCAL" : "Local", "FIELD_OPTION_CURSOR_LOCAL" : "Local",
"FIELD_OPTION_CURSOR_REMOTE" : "Remote", "FIELD_OPTION_CURSOR_REMOTE" : "Remote",