GUACAMOLE-208: Merge new codes and translations.

guacamole-common-js/src/main/webapp/modules/Status.js

@@ -140,6 +140,45 @@ Guacamole.Status.Code = {
      */
     "RESOURCE_CLOSED": 0x0206,
 
+    /**
+     * The operation could not be performed because the upstream server does
+     * not appear to exist.
+     *
+     * @type {Number}
+     */
+    "UPSTREAM_NOT_FOUND": 0x0207,
+
+    /**
+     * The operation could not be performed because the upstream server is not
+     * available to service the request.
+     *
+     * @type {Number}
+     */
+    "UPSTREAM_UNAVAILABLE": 0x0208,
+
+    /**
+     * The session within the upstream server has ended because it conflicted
+     * with another session.
+     *
+     * @type {Number}
+     */
+    "SESSION_CONFLICT": 0x0209,
+
+    /**
+     * The session within the upstream server has ended because it appeared to
+     * be inactive.
+     *
+     * @type {Number}
+     */
+    "SESSION_TIMEOUT": 0x020A,
+
+    /**
+     * The session within the upstream server has been forcibly terminated.
+     *
+     * @type {Number}
+     */
+    "SESSION_CLOSED": 0x020B,
+
     /**
      * The operation could not be performed because bad parameters were given.
      *

guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java

@@ -71,6 +71,41 @@ public enum GuacamoleStatus {
      */
     RESOURCE_CONFLICT(409, 1008, 0x0205),
 
+    /**
+     * The operation could not be performed as the requested resource is now
+     * closed.
+     */
+    RESOURCE_CLOSED(404, 1002, 0x0206),
+
+    /**
+     * The operation could not be performed because the upstream server does
+     * not appear to exist.
+     */
+    UPSTREAM_NOT_FOUND(502, 1011, 0x0207),
+
+    /**
+     * The operation could not be performed because the upstream server is not
+     * available to service the request.
+     */
+    UPSTREAM_UNAVAILABLE(502, 1011, 0x0208),
+
+    /**
+     * The session within the upstream server has ended because it conflicted
+     * with another session.
+     */
+    SESSION_CONFLICT(409, 1008, 0x0209),
+
+    /**
+     * The session within the upstream server has ended because it appeared to
+     * be inactive.
+     */
+    SESSION_TIMEOUT(408, 1002, 0x020A),
+
+    /**
+     * The session within the upstream server has been forcibly terminated.
+     */
+    SESSION_CLOSED(404, 1002, 0x020B),
+
     /**
      * The operation could not be performed because bad parameters were given.
      */

guacamole/src/main/webapp/app/client/controllers/clientController.js

@@ -83,7 +83,11 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         0x0201: true,
         0x0202: true,
         0x0203: true,
-        0x0205: true,
+        0x0207: true,
+        0x0208: true,
+        0x0209: true,
+        0x020A: true,
+        0x020B: true,
         0x0301: true,
         0x0303: true,
         0x0308: true,
@@ -98,6 +102,8 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         0x0200: true,
         0x0202: true,
         0x0203: true,
+        0x0207: true,
+        0x0208: true,
         0x0301: true,
         0x0308: true
     };
@@ -113,6 +119,8 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         0x0203: true,
         0x0204: true,
         0x0205: true,
+        0x0207: true,
+        0x0208: true,
         0x0301: true,
         0x0303: true,
         0x0308: true,
@@ -127,6 +135,8 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
         0x0200: true,
         0x0202: true,
         0x0203: true,
+        0x0207: true,
+        0x0208: true,
         0x0308: true
     };
 

guacamole/src/main/webapp/translations/en.json

@@ -67,9 +67,13 @@
         "ERROR_CLIENT_201"     : "This connection has been closed because the server is busy. Please wait a few minutes and try again.",
         "ERROR_CLIENT_202"     : "The Guacamole server has closed the connection because the remote desktop is taking too long to respond. Please try again or contact your system administrator.",
         "ERROR_CLIENT_203"     : "The remote desktop server encountered an error and has closed the connection. Please try again or contact your system administrator.",
-        "ERROR_CLIENT_205"     : "This connection has been closed because it conflicts with another connection. Please try again later.",
+        "ERROR_CLIENT_207"     : "The remote desktop server is currently unreachable. If the problem persists, please notify your system administrator, or check your system logs.",
+        "ERROR_CLIENT_208"     : "The remote desktop server is currently unavailable. If the problem persists, please notify your system administrator, or check your system logs.",
+        "ERROR_CLIENT_209"     : "The remote desktop server has closed the connection because it conflicts with another connection. Please try again later.",
+        "ERROR_CLIENT_20A"     : "The remote desktop server has closed the connection because it appeared to be inactive. If this is undesired or unexpected, please notify your system administrator, or check your system settings.",
+        "ERROR_CLIENT_20B"     : "The remote desktop server has forcibly closed the connection. If this is undesired or unexpected, please notify your system administrator, or check your system logs.",
         "ERROR_CLIENT_301"     : "Log in failed. Please reconnect and try again.",
-        "ERROR_CLIENT_303"     : "You do not have permission to access this connection. If you require access, please ask your system administrator to add you the list of allowed users, or check your system settings.",
+        "ERROR_CLIENT_303"     : "The remote desktop server has denied access to this connection. If you require access, please ask your system administrator to grant your account access, or check your system settings.",
         "ERROR_CLIENT_308"     : "The Guacamole server has closed the connection because there has been no response from your browser for long enough that it appeared to be disconnected. This is commonly caused by network problems, such as spotty wireless signal, or simply very slow network speeds. Please check your network and try again.",
         "ERROR_CLIENT_31D"     : "The Guacamole server is denying access to this connection because you have exhausted the limit for simultaneous connection use by an individual user. Please close one or more connections and try again.",
         "ERROR_CLIENT_DEFAULT" : "An internal error has occurred within the Guacamole server, and the connection has been terminated. If the problem persists, please notify your system administrator, or check your system logs.",
@@ -79,6 +83,8 @@
         "ERROR_TUNNEL_203"     : "The server encountered an error and has closed the connection. Please try again or contact your system administrator.",
         "ERROR_TUNNEL_204"     : "The requested connection does not exist. Please check the connection name and try again.",
         "ERROR_TUNNEL_205"     : "This connection is currently in use, and concurrent access to this connection is not allowed. Please try again later.",
+        "ERROR_TUNNEL_207"     : "The Guacamole server is not currently reachable. Please check your network and try again.",
+        "ERROR_TUNNEL_208"     : "The Guacamole server is not accepting connections. Please check your network and try again.",
         "ERROR_TUNNEL_301"     : "You do not have permission to access this connection because you are not logged in. Please log in and try again.",
         "ERROR_TUNNEL_303"     : "You do not have permission to access this connection. If you require access, please ask your system administrator to add you the list of allowed users, or check your system settings.",
         "ERROR_TUNNEL_308"     : "The Guacamole server has closed the connection because there has been no response from your browser for long enough that it appeared to be disconnected. This is commonly caused by network problems, such as spotty wireless signal, or simply very slow network speeds. Please check your network and try again.",