You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2016/03/20 03:22:22 UTC

[42/50] incubator-guacamole-client git commit: GUAC-1164: Add definitions and translation strings for resize method parameter.

GUAC-1164: Add definitions and translation strings for resize method parameter.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/862e24ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/862e24ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/862e24ff

Branch: refs/heads/master
Commit: 862e24ff64858ae593656b4bed9832aa62180254
Parents: fd2ed95
Author: Michael Jumper <mi...@guac-dev.org>
Authored: Wed Mar 16 14:48:51 2016 -0700
Committer: Michael Jumper <mi...@guac-dev.org>
Committed: Wed Mar 16 14:48:51 2016 -0700

----------------------------------------------------------------------
 .../main/resources/org/glyptodon/guacamole/protocols/rdp.json   | 5 +++++
 guacamole/src/main/webapp/translations/en.json                  | 5 +++++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/862e24ff/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json
index e2a5375..c213984 100644
--- a/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/glyptodon/guacamole/protocols/rdp.json
@@ -101,6 +101,11 @@
                     "name"    : "color-depth",
                     "type"    : "ENUM",
                     "options" : [ "", "8", "16", "24", "32" ]
+                },
+                {
+                    "name"    : "resize-method",
+                    "type"    : "ENUM",
+                    "options" : [ "", "reconnect", "display-update" ]
                 }
             ]
         },

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/862e24ff/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 4fe89cc..b0f9e56 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -299,6 +299,7 @@
         "FIELD_HEADER_PRECONNECTION_ID"   : "RDP source ID:",
         "FIELD_HEADER_RECORDING_NAME" : "Recording name:",
         "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
+        "FIELD_HEADER_RESIZE_METHOD" : "Resize method:",
         "FIELD_HEADER_REMOTE_APP_ARGS" : "Parameters:",
         "FIELD_HEADER_REMOTE_APP_DIR"  : "Working directory:",
         "FIELD_HEADER_REMOTE_APP"      : "Program:",
@@ -321,6 +322,10 @@
         "FIELD_OPTION_COLOR_DEPTH_8"     : "256 color",
         "FIELD_OPTION_COLOR_DEPTH_EMPTY" : "",
 
+        "FIELD_OPTION_RESIZE_METHOD_DISPLAY_UPDATE" : "\"Display Update\" virtual channel (RDP 8.1+)",
+        "FIELD_OPTION_RESIZE_METHOD_EMPTY"          : "",
+        "FIELD_OPTION_RESIZE_METHOD_RECONNECT"      : "Reconnect",
+
         "FIELD_OPTION_SECURITY_ANY"   : "Any",
         "FIELD_OPTION_SECURITY_EMPTY" : "",
         "FIELD_OPTION_SECURITY_NLA"   : "NLA (Network Level Authentication)",