guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [3/6] incubator-guacamole-client git commit: GUACAMOLE-208: Define translation strings for new status codes.
Date Thu, 16 Feb 2017 06:05:44 GMT
GUACAMOLE-208: Define translation strings for new status codes.


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/dd6964af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/dd6964af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/dd6964af

Branch: refs/heads/master
Commit: dd6964afb1e55733b99284c7b23afabf2258b34c
Parents: 3835eae
Author: Michael Jumper <mjumper@apache.org>
Authored: Sat Feb 11 15:13:46 2017 -0800
Committer: Michael Jumper <mjumper@apache.org>
Committed: Wed Feb 15 21:24:55 2017 -0800

----------------------------------------------------------------------
 .../main/webapp/app/client/controllers/clientController.js   | 6 +++++-
 guacamole/src/main/webapp/translations/en.json               | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dd6964af/guacamole/src/main/webapp/app/client/controllers/clientController.js
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index a66a0ce..908d1ff 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/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,

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/dd6964af/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 c78fd0b..3dba567 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/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.",


Mime
View raw message