diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index d5367c31e..93c50cc63 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -138,7 +138,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
      * showStatus.
      */
     var RECONNECT_ACTION = {
-        name        : "client.action.reconnect",
+        name        : "CLIENT.ACTION_RECONNECT",
         // Handle reconnect action
         callback    : function reconnectCallback() {
             $scope.id = uniqueId;
@@ -151,7 +151,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
      * automatic, timed reconnect.
      */
     var RECONNECT_COUNTDOWN = {
-        text: "client.action.reconnectCountdown",
+        text: "CLIENT.TEXT_RECONNECT_COUNTDOWN",
         callback: RECONNECT_ACTION.callback,
         remaining: 15
     };
@@ -380,8 +380,8 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
         // Show new status if not yet connected
         if (status !== "connected") {
             $scope.showStatus({
-                title: "client.status.connectingStatusTitle",
-                text: "client.status.clientStates." + status
+                title: "CLIENT.DIALOG_HEADER_CONNECTING",
+                text: "CLIENT.TEXT_CLIENT_STATUS_" + status.toUpperCase()
             });
         }
 
@@ -406,8 +406,8 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
         // Show error status
         $scope.showStatus({
             className: "error",
-            title: "client.error.connectionErrorTitle",
-            text: "client.error.clientErrors." + errorName,
+            title: "CLIENT.DIALOG_HEADER_CONNECTION_ERROR",
+            text: "CLIENT.ERROR_CLIENT_" + errorName,
             countdown: countdown,
             actions: [ RECONNECT_ACTION ]
         });
@@ -424,8 +424,8 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
             $scope.id = null;
 
             $scope.showStatus({
-                title: "client.status.closedStatusTitle",
-                text: "client.status.tunnelStates." + status
+                title: "CLIENT.DIALOG_HEADER_DISCONNECTED",
+                text: "CLIENT.TEXT_TUNNEL_STATUS_" + status.toUpperCase()
             });
         }
 
@@ -446,8 +446,8 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
         // Show error status
         $scope.showStatus({
             className: "error",
-            title: "client.error.connectionErrorTitle",
-            text: "client.error.tunnelErrors." + errorName,
+            title: "CLIENT.DIALOG_HEADER_CONNECTION_ERROR",
+            text: "CLIENT.ERROR_TUNNEL_" + errorName,
             countdown: countdown,
             actions: [ RECONNECT_ACTION ]
         });
@@ -549,7 +549,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
             
             var notification = {
                 className  : 'download',
-                title      : 'client.fileTransfer.downloadTitle',
+                title      : 'CLIENT.DIALOG_TITLE_FILE_TRANSFER',
                 text       : filename
             };
             
@@ -564,7 +564,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
             
             var notification = downloadNotifications[streamIndex];
             if (notification)
-                notification.progress = getFileProgress('client.fileTransfer.progressText', length);
+                notification.progress = getFileProgress('CLIENT.TEXT_FILE_TRANSFER_PROGRESS', length);
             
         });
     });
@@ -590,7 +590,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
                 delete notification.progress;
                 notification.actions = [
                     {
-                        name       : 'client.fileTransfer.save',
+                        name       : 'CLIENT.ACTION_SAVE_FILE',
                         callback   : saveFile
                     }
                 ];
@@ -610,7 +610,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
             
             var notification = {
                 className  : 'upload',
-                title      : 'client.fileTransfer.uploadTitle',
+                title      : 'CLIENT.DIALOG_TITLE_FILE_TRANSFER',
                 text       : filename
             };
             
@@ -625,7 +625,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
             
             var notification = uploadNotifications[streamIndex];
             if (notification)
-                notification.progress = getFileProgress('client.fileTransfer.progressText', offset, length);
+                notification.progress = getFileProgress('CLIENT.TEXT_FILE_TRANSFER_PROGRESS', offset, length);
             
         });
     });
@@ -650,7 +650,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
                 delete notification.progress;
                 notification.actions = [
                     {
-                        name       : 'client.fileTransfer.ok',
+                        name       : 'CLIENT.ACTION_ACKNOWLEDGE',
                         callback   : closeNotification
                     }
                 ];
@@ -682,11 +682,11 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
                 delete notification.progress;
                 notification.actions = [
                     {
-                        name       : 'client.fileTransfer.ok',
+                        name       : 'CLIENT.ACTION_ACKNOWLEDGE',
                         callback   : closeNotification
                     }
                 ];
-                notification.text = "client.error.uploadErrors." + errorName;
+                notification.text = "CLIENT.ERROR_UPLOAD_" + errorName;
                 notification.className = "upload error";
             }
             
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index bde23deee..02ba4dd26 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -48,51 +48,51 @@
 
 <!-- On-screen keyboard -->
 <div class="keyboard-container" ng-class="{shown: showOSK}">
-    <guac-osk layout="'client.oskLayout' | translate"/>
+    <guac-osk layout="'CLIENT.URL_OSK_LAYOUT' | translate"/>
 </div>
 
 <!-- Menu -->
 <div ng-class="{open: menuShown}" id="menu" guac-touch-drag="menuDrag">
-    <h2>{{'client.clipboard' | translate}}</h2>
+    <h2>{{'CLIENT.SECTION_HEADER_CLIPBOARD' | translate}}</h2>
     <div class="content" id="clipboard-settings">
-        <p class="description">{{'client.copiedText' | translate}}</p>
+        <p class="description">{{'CLIENT.HELP_CLIPBOARD' | translate}}</p>
         <textarea ng-model="clipboardData" rows="10" cols="40" id="clipboard"></textarea>
     </div>
 
-    <h2>{{'client.inputMethod' | translate}}</h2>
+    <h2>{{'CLIENT.SECTION_HEADER_INPUT_METHOD' | translate}}</h2>
     <div class="content" id="keyboard-settings">
 
         <!-- No IME -->
         <div class="choice">
-            <label><input id="ime-none" name="input-method" ng-change="closeMenu()" ng-model="inputMethod" type="radio" value="none"/> {{'client.none' | translate}}</label>
-            <p class="caption"><label for="ime-none">{{'client.noneDesc' | translate}}</label></p>
+            <label><input id="ime-none" name="input-method" ng-change="closeMenu()" ng-model="inputMethod" type="radio" value="none"/> {{'CLIENT.NAME_INPUT_METHOD_NONE' | translate}}</label>
+            <p class="caption"><label for="ime-none">{{'CLIENT.HELP_INPUT_METHOD_NONE' | translate}}</label></p>
         </div>
 
         <!-- Text input -->
         <div class="choice">
             <div class="figure"><label for="ime-text"><img src="images/settings/tablet-keys.png" alt=""/></label></div>
-            <label><input id="ime-text" name="input-method" ng-change="closeMenu()" ng-model="inputMethod" type="radio" value="text"/> {{'client.textInput' | translate}}</label>
-            <p class="caption"><label for="ime-text">{{'client.textInputDesc' | translate}} </label></p>
+            <label><input id="ime-text" name="input-method" ng-change="closeMenu()" ng-model="inputMethod" type="radio" value="text"/> {{'CLIENT.NAME_INPUT_METHOD_TEXT' | translate}}</label>
+            <p class="caption"><label for="ime-text">{{'CLIENT.HELP_INPUT_METHOD_TEXT' | translate}} </label></p>
         </div>
 
         <!-- Guac OSK -->
         <div class="choice">
-            <label><input id="ime-osk" name="input-method" ng-change="closeMenu()" ng-model="inputMethod" type="radio" value="osk"/> {{'client.osk' | translate}}</label>
-            <p class="caption"><label for="ime-osk">{{'client.oskDesc' | translate}}</label></p>
+            <label><input id="ime-osk" name="input-method" ng-change="closeMenu()" ng-model="inputMethod" type="radio" value="osk"/> {{'CLIENT.NAME_INPUT_METHOD_OSK' | translate}}</label>
+            <p class="caption"><label for="ime-osk">{{'CLIENT.HELP_INPUT_METHOD_OSK' | translate}}</label></p>
         </div>
 
     </div>
 
-    <h2>{{'client.mouseMode' | translate}}</h2>
+    <h2>{{'CLIENT.SECTION_HEADER_MOUSE_MODE' | translate}}</h2>
     <div class="content" id="mouse-settings">
-        <p class="description">{{'client.mouseModeDesc' | translate}}</p>
+        <p class="description">{{'CLIENT.HELP_MOUSE_MODE' | translate}}</p>
 
         <!-- Touchscreen -->
         <div class="choice">
             <input name="mouse-mode" ng-change="closeMenu()" ng-model="clientProperties.emulateAbsoluteMouse" type="radio" ng-value="true" checked="checked" id="absolute"/>
             <div class="figure">
-                <label for="absolute"><img src="images/settings/touchscreen.png" alt="{{'client.touchscreen' | translate}}"/></label>
-                <p class="caption"><label for="absolute">{{'client.touchscreenDesc' | translate}}</label></p>
+                <label for="absolute"><img src="images/settings/touchscreen.png" alt="{{'CLIENT.NAME_MOUSE_MODE_ABSOLUTE' | translate}}"/></label>
+                <p class="caption"><label for="absolute">{{'CLIENT.HELP_MOUSE_MODE_ABSOLUTE' | translate}}</label></p>
             </div>
         </div>
 
@@ -100,21 +100,21 @@
         <div class="choice">
             <input name="mouse-mode" ng-change="closeMenu()" ng-model="clientProperties.emulateAbsoluteMouse" type="radio" ng-value="false" id="relative"/>
             <div class="figure">
-                <label for="relative"><img src="images/settings/touchpad.png" alt="{{'client.touchpad' | translate}}"/></label>
-                <p class="caption"><label for="relative">{{'client.touchpadDesc' | translate}}</label></p>
+                <label for="relative"><img src="images/settings/touchpad.png" alt="{{'CLIENT.NAME_MOUSE_MODE_RELATIVE' | translate}}"/></label>
+                <p class="caption"><label for="relative">{{'CLIENT.HELP_MOUSE_MODE_RELATIVE' | translate}}</label></p>
             </div>
         </div>
 
     </div>
 
-    <h2>{{'client.display' | translate}}</h2>
+    <h2>{{'CLIENT.SECTION_HEADER_DISPLAY' | translate}}</h2>
     <div class="content">
         <div id="zoom-settings">
             <div ng-click="zoomOut()" id="zoom-out"><img src="images/settings/zoom-out.png" alt="-"/></div>
             <div id="zoom-state">{{formattedScale()}}%</div>
             <div ng-click="zoomIn()" id="zoom-in"><img src="images/settings/zoom-in.png" alt="+"/></div>
         </div>
-        <div><label><input ng-model="autoFit" ng-change="changeAutoFit()" ng-disabled="autoFitDisabled()" type="checkbox" id="auto-fit"/> {{'client.autoFit' | translate}}</label></div>
+        <div><label><input ng-model="autoFit" ng-change="changeAutoFit()" ng-disabled="autoFitDisabled()" type="checkbox" id="auto-fit"/> {{'CLIENT.TEXT_ZOOM_AUTO_FIT' | translate}}</label></div>
     </div>
     
 </div>
diff --git a/guacamole/src/main/webapp/app/home/templates/guacRecentConnections.html b/guacamole/src/main/webapp/app/home/templates/guacRecentConnections.html
index 152fe8eff..763cda747 100644
--- a/guacamole/src/main/webapp/app/home/templates/guacRecentConnections.html
+++ b/guacamole/src/main/webapp/app/home/templates/guacRecentConnections.html
@@ -22,7 +22,7 @@
     -->
 
     <!-- Text displayed if no recent connections exist -->
-    <p class="no-recent" ng-hide="recentConnections.length">{{'home.noRecentConnections' | translate}}</p>
+    <p class="no-recent" ng-hide="recentConnections.length">{{'HOME.INFO_NO_RECENT_CONNECTIONS' | translate}}</p>
 
     <!-- All recent connections -->
     <div ng-repeat="recentConnection in recentConnections" class="connection">
diff --git a/guacamole/src/main/webapp/app/home/templates/home.html b/guacamole/src/main/webapp/app/home/templates/home.html
index 384e1b5f8..9e8bf7eb8 100644
--- a/guacamole/src/main/webapp/app/home/templates/home.html
+++ b/guacamole/src/main/webapp/app/home/templates/home.html
@@ -23,18 +23,18 @@
 <div class="connection-list-ui">
 
     <div class="logout-panel">
-        <a class="manage button" ng-show="currentUserHasUpdate" href="#/manage">{{'home.manage' | translate}}</a>
-        <a class="logout button" ng-click="logout()">{{'home.logout' | translate}}</a>
+        <a class="manage button" ng-show="currentUserHasUpdate" href="#/manage">{{'HOME.ACTION_MANAGE' | translate}}</a>
+        <a class="logout button" ng-click="logout()">{{'HOME.ACTION_LOGOUT' | translate}}</a>
     </div>
 
     <!-- The recent connections for this user -->
-    <h2>{{'home.recentConnections' | translate}}</h2>
+    <h2>{{'HOME.SECTION_HEADER_RECENT_CONNECTIONS' | translate}}</h2>
     <div class="recent-connections" ng-class="{loading: loading}">
         <guac-recent-connections root-group="rootConnectionGroup"/>
     </div>
 
     <!-- All connections for this user -->
-    <h2>{{'home.allConnections' | translate}}</h2>
+    <h2>{{'HOME.SECTION_HEADER_ALL_CONNECTIONS' | translate}}</h2>
     <div class="all-connections" ng-class="{loading: loading}">
         <guac-group-list
             connection-group="rootConnectionGroup"
diff --git a/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js b/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js
index cf2434586..a739d2fdd 100644
--- a/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js
+++ b/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js
@@ -31,37 +31,37 @@ angular.module('index').config(['$routeProvider', '$locationProvider',
     
     $routeProvider
         .when('/', {
-            title: 'application.title',
+            title: 'APP.NAME',
             bodyClassName: 'home',
             templateUrl: 'app/home/templates/home.html',
             controller: 'homeController'
         })
         .when('/manage/', {
-            title: 'application.title',
+            title: 'APP.NAME',
             bodyClassName: 'manage',
             templateUrl: 'app/manage/templates/manage.html',
             controller: 'manageController'
         })
         .when('/manage/connections/:id?', {
-            title: 'application.title',
+            title: 'APP.NAME',
             bodyClassName: 'manage',
             templateUrl: 'app/manage/templates/manageConnection.html',
             controller: 'manageConnectionController'
         })
         .when('/manage/connectionGroups/:id?', {
-            title: 'application.title',
+            title: 'APP.NAME',
             bodyClassName: 'manage',
             templateUrl: 'app/manage/templates/manageConnectionGroup.html',
             controller: 'manageConnectionGroupController'
         })
         .when('/manage/users/:id', {
-            title: 'application.title',
+            title: 'APP.NAME',
             bodyClassName: 'manage',
             templateUrl: 'app/manage/templates/manageUser.html',
             controller: 'manageUserController'
         })
         .when('/login/', {
-            title: 'application.title',
+            title: 'APP.NAME',
             bodyClassName: 'login',
             templateUrl: 'app/login/templates/login.html',
             controller: 'loginController'
diff --git a/guacamole/src/main/webapp/app/locale/localeModule.js b/guacamole/src/main/webapp/app/locale/localeModule.js
new file mode 100644
index 000000000..ef6c16f01
--- /dev/null
+++ b/guacamole/src/main/webapp/app/locale/localeModule.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2014 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Module for handling common localization-related tasks.
+ */
+angular.module('locale', []);
diff --git a/guacamole/src/main/webapp/app/locale/services/translationStringService.js b/guacamole/src/main/webapp/app/locale/services/translationStringService.js
new file mode 100644
index 000000000..4a0e56692
--- /dev/null
+++ b/guacamole/src/main/webapp/app/locale/services/translationStringService.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Service for manipulating translation strings and translation table
+ * identifiers.
+ */
+angular.module('locale').factory('translationStringService', [function translationStringService() {
+
+    var service = {};
+        
+    /**
+     * Given an arbitrary identifier, returns the corresponding translation
+     * table identifier. Translation table identifiers are uppercase strings,
+     * word components separated by single underscores. For example, the
+     * string "Swap red/blue" would become "SWAP_RED_BLUE".
+     *
+     * @param {String} identifier
+     *     The identifier to transform into a translation table identifier.
+     *
+     * @returns {String}
+     *     The translation table identifier.
+     */
+    service.canonicalize = function canonicalize(identifier) {
+        return identifier.replace(/[^a-zA-Z0-9]+/g, '_').toUpperCase();
+    };
+
+    return service;
+
+}]);
diff --git a/guacamole/src/main/webapp/app/login/templates/login.html b/guacamole/src/main/webapp/app/login/templates/login.html
index e64605c61..2d764abce 100644
--- a/guacamole/src/main/webapp/app/login/templates/login.html
+++ b/guacamole/src/main/webapp/app/login/templates/login.html
@@ -23,7 +23,7 @@ THE SOFTWARE.
 <div class="login-ui" ng-class="{error: loginError}" >
 
     <!-- Login error message -->
-    <p class="login-error">{{'login.loginError' | translate}}</p>
+    <p class="login-error">{{'LOGIN.ERROR_INVALID_LOGIN' | translate}}</p>
 
     <div class="login-dialog-middle">
 
@@ -33,17 +33,17 @@ THE SOFTWARE.
 
                 <!-- Guacamole version -->
                 <img class="logo" src="images/guac-tricolor.png" alt=""/>
-                <div class="version">{{'application.title' | translate}}</div>
+                <div class="version">{{'APP.NAME' | translate}}</div>
 
                 <!-- Login fields (username + password) -->
                 <div class="login-fields">
-                    <input ng-model="username" placeholder="{{'login.username' | translate}}" type="text" name="username" autofocus="autofocus" class="username"/>
-                    <input ng-model="password" placeholder="{{'login.password' | translate}}" type="password" name="password" class="password"/>
+                    <input ng-model="username" placeholder="{{'LOGIN.FIELD_PLACEHOLDER_USERNAME' | translate}}" type="text" name="username" autofocus="autofocus" class="username"/>
+                    <input ng-model="password" placeholder="{{'LOGIN.FIELD_PLACEHOLDER_PASSWORD' | translate}}" type="password" name="password" class="password"/>
                 </div>
 
                 <!-- Submit button -->
                 <div class="buttons">
-                    <input type="submit" name="login" class="login" value="{{'login.login' | translate}}"/>
+                    <input type="submit" name="login" class="login" value="{{'LOGIN.ACTION_LOGIN' | translate}}"/>
                 </div>
 
             </form>
diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageConnectionController.js b/guacamole/src/main/webapp/app/manage/controllers/manageConnectionController.js
index 22d6c8837..16058192b 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageConnectionController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageConnectionController.js
@@ -33,18 +33,19 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
     var PermissionSet       = $injector.get('PermissionSet');
 
     // Required services
-    var $location              = $injector.get('$location');
-    var $routeParams           = $injector.get('$routeParams');
-    var connectionService      = $injector.get('connectionService');
-    var connectionGroupService = $injector.get('connectionGroupService');
-    var protocolService        = $injector.get('protocolService');
+    var $location                = $injector.get('$location');
+    var $routeParams             = $injector.get('$routeParams');
+    var connectionService        = $injector.get('connectionService');
+    var connectionGroupService   = $injector.get('connectionGroupService');
+    var protocolService          = $injector.get('protocolService');
+    var translationStringService = $injector.get('translationStringService');
 
     /**
      * An action to be provided along with the object sent to showStatus which
      * closes the currently-shown status dialog.
      */
     var ACKNOWLEDGE_ACTION = {
-        name        : "manage.error.action.acknowledge",
+        name        : "MANAGE_CONNECTION.ACTION_ACKNOWLEDGE",
         // Handle action
         callback    : function acknowledgeCallback() {
             $scope.showStatus(false);
@@ -103,6 +104,41 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
         $scope.parameters = {};
     }
 
+    /**
+     * Given the internal name of a protocol, produces the translation string
+     * for the localized version of that protocol's name.
+     *
+     * @param {String} protocolName
+     *     The name of the protocol.
+     * 
+     * @returns {String}
+     *     The translation string which produces the localized name of the
+     *     protocol specified.
+     */
+    $scope.getProtocolName = function getProtocolName(protocolName) {
+        return 'PROTOCOL_' + translationStringService.canonicalize(protocolName) + '.NAME';
+    };
+
+    /**
+     * Given the internal name of a protocol and the internal name of a
+     * parameter for that protocol, produces the translation string
+     * for the localized, human-readable name of that protocol parameter.
+     *
+     * @param {String} protocolName
+     *     The name of the protocol.
+     * 
+     * @param {String} parameterName
+     *     The name of the protocol parameter.
+     * 
+     * @returns {String}
+     *     The translation string which produces the translated name of the
+     *     protocol parameter specified.
+     */
+    $scope.getProtocolParameterName = function getProtocolParameterName(protocolName, parameterName) {
+        return 'PROTOCOL_'      + translationStringService.canonicalize(protocolName)
+             + '.FIELD_HEADER_' + translationStringService.canonicalize(parameterName);
+    };
+
     /**
      * Cancels all pending edits, returning to the management page.
      */
@@ -128,7 +164,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
         .error(function connectionSaveFailed(error) {
             $scope.showStatus({
                 'className'  : 'error',
-                'title'      : 'manage.error.title',
+                'title'      : 'MANAGE_CONNECTION.DIALOG_HEADER_ERROR',
                 'text'       : error.message,
                 'actions'    : [ ACKNOWLEDGE_ACTION ]
             });
@@ -141,7 +177,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
      * immediately deletes the current connection.
      */
     var DELETE_ACTION = {
-        name        : "manage.edit.connection.delete",
+        name        : "MANAGE_CONNECTION.ACTION_DELETE",
         className   : "danger",
         // Handle action
         callback    : function deleteCallback() {
@@ -155,7 +191,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
      * closes the currently-shown status dialog.
      */
     var CANCEL_ACTION = {
-        name        : "manage.edit.connection.cancel",
+        name        : "MANAGE_CONNECTION.ACTION_CANCEL",
         // Handle action
         callback    : function cancelCallback() {
             $scope.showStatus(false);
@@ -178,7 +214,7 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
         .error(function connectionDeletionFailed(error) {
             $scope.showStatus({
                 'className'  : 'error',
-                'title'      : 'manage.error.title',
+                'title'      : 'MANAGE_CONNECTION.DIALOG_HEADER_ERROR',
                 'text'       : error.message,
                 'actions'    : [ ACKNOWLEDGE_ACTION ]
             });
@@ -194,8 +230,8 @@ angular.module('manage').controller('manageConnectionController', ['$scope', '$i
 
         // Confirm deletion request
         $scope.showStatus({
-            'title'      : 'manage.edit.connection.confirmDelete.title',
-            'text'       : 'manage.edit.connection.confirmDelete.text',
+            'title'      : 'MANAGE_CONNECTION.DIALOG_HEADER_CONFIRM_DELETE',
+            'text'       : 'MANAGE_CONNECTION.TEXT_CONFIRM_DELETE',
             'actions'    : [ DELETE_ACTION, CANCEL_ACTION]
         });
 
diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageConnectionGroupController.js b/guacamole/src/main/webapp/app/manage/controllers/manageConnectionGroupController.js
index 2aa6a2177..38010b37a 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageConnectionGroupController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageConnectionGroupController.js
@@ -40,7 +40,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
      * closes the currently-shown status dialog.
      */
     var ACKNOWLEDGE_ACTION = {
-        name        : "manage.error.action.acknowledge",
+        name        : "MANAGE_CONNECTION_GROUP.ACTION_ACKNOWLEDGE",
         // Handle action
         callback    : function acknowledgeCallback() {
             $scope.showStatus(false);
@@ -80,11 +80,11 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
      */
     $scope.types = [
         {
-            label: "organizational",
+            label: "MANAGE_CONNECTION_GROUP.NAME_TYPE_ORGANIZATIONAL",
             value: ConnectionGroup.Type.ORGANIZATIONAL
         },
         {
-            label : "balancing",
+            label: "MANAGE_CONNECTION_GROUP.NAME_TYPE_BALANCING",
             value : ConnectionGroup.Type.BALANCING
         }
     ];
@@ -112,7 +112,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
         .error(function connectionGroupSaveFailed(error) {
             $scope.showStatus({
                 'className'  : 'error',
-                'title'      : 'manage.error.title',
+                'title'      : 'MANAGE_CONNECTION_GROUP.DIALOG_HEADER_ERROR',
                 'text'       : error.message,
                 'actions'    : [ ACKNOWLEDGE_ACTION ]
             });
@@ -125,7 +125,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
      * immediately deletes the current connection group.
      */
     var DELETE_ACTION = {
-        name        : "manage.edit.connectionGroup.delete",
+        name        : "MANAGE_CONNECTION_GROUP.ACTION_DELETE",
         className   : "danger",
         // Handle action
         callback    : function deleteCallback() {
@@ -139,7 +139,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
      * closes the currently-shown status dialog.
      */
     var CANCEL_ACTION = {
-        name        : "manage.edit.connectionGroup.cancel",
+        name        : "MANAGE_CONNECTION_GROUP.ACTION_CANCEL",
         // Handle action
         callback    : function cancelCallback() {
             $scope.showStatus(false);
@@ -162,7 +162,7 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
         .error(function connectionGroupDeletionFailed(error) {
             $scope.showStatus({
                 'className'  : 'error',
-                'title'      : 'manage.error.title',
+                'title'      : 'MANAGE_CONNECTION_GROUP.DIALOG_HEADER_ERROR',
                 'text'       : error.message,
                 'actions'    : [ ACKNOWLEDGE_ACTION ]
             });
@@ -178,8 +178,8 @@ angular.module('manage').controller('manageConnectionGroupController', ['$scope'
 
         // Confirm deletion request
         $scope.showStatus({
-            'title'      : 'manage.edit.connectionGroup.confirmDelete.title',
-            'text'       : 'manage.edit.connectionGroup.confirmDelete.text',
+            'title'      : 'MANAGE_CONNECTION_GROUP.DIALOG_HEADER_CONFIRM_DELETE',
+            'text'       : 'MANAGE_CONNECTION_GROUP.TEXT_CONFIRM_DELETE',
             'actions'    : [ DELETE_ACTION, CANCEL_ACTION]
         });
 
diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageController.js b/guacamole/src/main/webapp/app/manage/controllers/manageController.js
index d83073cd3..b4ae57306 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageController.js
@@ -40,7 +40,7 @@ angular.module('manage').controller('manageController', ['$scope', '$injector',
      * closes the currently-shown status dialog.
      */
     var ACKNOWLEDGE_ACTION = {
-        name        : "manage.error.action.acknowledge",
+        name        : "MANAGE.ACTION_ACKNOWLEDGE",
         // Handle action
         callback    : function acknowledgeCallback() {
             $scope.showStatus(false);
@@ -90,7 +90,7 @@ angular.module('manage').controller('manageController', ['$scope', '$injector',
         .error(function userCreationFailed(error) {
             $scope.showStatus({
                 'className'  : 'error',
-                'title'      : 'manage.error.title',
+                'title'      : 'MANAGE.DIALOG_HEADER_ERROR',
                 'text'       : error.message,
                 'actions'    : [ ACKNOWLEDGE_ACTION ]
             });
diff --git a/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js b/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
index a45fef809..bf860a78e 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/manageUserController.js
@@ -43,7 +43,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
      * closes the currently-shown status dialog.
      */
     var ACKNOWLEDGE_ACTION = {
-        name        : "manage.error.action.acknowledge",
+        name        : "MANAGE_USER.ACTION_ACKNOWLEDGE",
         // Handle action
         callback    : function acknowledgeCallback() {
             $scope.showStatus(false);
@@ -81,19 +81,19 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
      */
     $scope.systemPermissionTypes = [
         {
-            label: "manage.edit.user.administerSystem",
+            label: "MANAGE_USER.FIELD_HEADER_ADMINISTER_SYSTEM",
             value: PermissionSet.SystemPermissionType.ADMINISTER
         },
         {
-            label: "manage.edit.user.createUser",
+            label: "MANAGE_USER.FIELD_HEADER_CREATE_NEW_USERS",
             value: PermissionSet.SystemPermissionType.CREATE_USER
         },
         {
-            label: "manage.edit.user.createConnection",
+            label: "MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS",
             value: PermissionSet.SystemPermissionType.CREATE_CONNECTION
         },
         {
-            label: "manage.edit.user.createConnectionGroup",
+            label: "MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS",
             value: PermissionSet.SystemPermissionType.CREATE_CONNECTION_GROUP
         }
     ];
@@ -328,8 +328,8 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
         if ($scope.passwordMatch !== $scope.user.password) {
             $scope.showStatus({
                 'className'  : 'error',
-                'title'      : 'manage.error.title',
-                'text'       : 'manage.edit.user.passwordMismatch',
+                'title'      : 'MANAGE_USER.DIALOG_HEADER_ERROR',
+                'text'       : 'MANAGE_USER.ERROR_PASSWORD_MISMATCH',
                 'actions'    : [ ACKNOWLEDGE_ACTION ]
             });
             return;
@@ -349,7 +349,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
             .error(function userPermissionsPatchFailed(error) {
                 $scope.showStatus({
                     'className'  : 'error',
-                    'title'      : 'manage.error.title',
+                    'title'      : 'MANAGE_USER.DIALOG_HEADER_ERROR',
                     'text'       : error.message,
                     'actions'    : [ ACKNOWLEDGE_ACTION ]
                 });
@@ -361,7 +361,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
         .error(function userSaveFailed(error) {
             $scope.showStatus({
                 'className'  : 'error',
-                'title'      : 'manage.error.title',
+                'title'      : 'MANAGE_USER.DIALOG_HEADER_ERROR',
                 'text'       : error.message,
                 'actions'    : [ ACKNOWLEDGE_ACTION ]
             });
@@ -374,7 +374,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
      * immediately deletes the current user.
      */
     var DELETE_ACTION = {
-        name        : "manage.edit.user.delete",
+        name        : "MANAGE_USER.ACTION_DELETE",
         className   : "danger",
         // Handle action
         callback    : function deleteCallback() {
@@ -388,7 +388,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
      * closes the currently-shown status dialog.
      */
     var CANCEL_ACTION = {
-        name        : "manage.edit.user.cancel",
+        name        : "MANAGE_USER.ACTION_CANCEL",
         // Handle action
         callback    : function cancelCallback() {
             $scope.showStatus(false);
@@ -411,7 +411,7 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
         .error(function userDeletionFailed(error) {
             $scope.showStatus({
                 'className'  : 'error',
-                'title'      : 'manage.error.title',
+                'title'      : 'MANAGE_USER.DIALOG_HEADER_ERROR',
                 'text'       : error.message,
                 'actions'    : [ ACKNOWLEDGE_ACTION ]
             });
@@ -427,8 +427,8 @@ angular.module('manage').controller('manageUserController', ['$scope', '$injecto
 
         // Confirm deletion request
         $scope.showStatus({
-            'title'      : 'manage.edit.user.confirmDelete.title',
-            'text'       : 'manage.edit.user.confirmDelete.text',
+            'title'      : 'MANAGE_USER.DIALOG_HEADER_CONFIRM_DELETE',
+            'text'       : 'MANAGE_USER.TEXT_CONFIRM_DELETE',
             'actions'    : [ DELETE_ACTION, CANCEL_ACTION]
         });
 
diff --git a/guacamole/src/main/webapp/app/manage/directives/connectionParameter.js b/guacamole/src/main/webapp/app/manage/directives/connectionParameter.js
index c720ecc17..49d74d6c4 100644
--- a/guacamole/src/main/webapp/app/manage/directives/connectionParameter.js
+++ b/guacamole/src/main/webapp/app/manage/directives/connectionParameter.js
@@ -57,7 +57,11 @@ angular.module('manage').directive('guacConnectionParameter', [function connecti
 
         },
         templateUrl: 'app/manage/templates/connectionParameter.html',
-        controller: ['$scope', '$q', function connectionParameterController($scope, $q) {
+        controller: ['$scope', '$injector', function connectionParameterController($scope, $injector) {
+
+            // Required services
+            var $q                       = $injector.get('$q');
+            var translationStringService = $injector.get('translationStringService');
 
             /**
              * Deferred load of the parameter definition, pending availability
@@ -152,6 +156,31 @@ angular.module('manage').directive('guacConnectionParameter', [function connecti
 
             }); // end watch typedValue
 
+            /**
+             * Given the internal name of a protocol, the internal name of a
+             * parameter for that protocol, and the internal name for a valid
+             * value of that parameter, produces the translation string for the
+             * localized, human-readable name of that parameter value.
+             *
+             * @param {String} protocolName
+             *     The name of the protocol.
+             * 
+             * @param {String} parameterName
+             *     The name of the protocol parameter.
+             * 
+             * @param {String} parameterValue
+             *     The name of the parameter value.
+             * 
+             * @returns {String}
+             *     The translation string which produces the translated name of the
+             *     parameter value specified.
+             */
+            $scope.getProtocolParameterOption = function getProtocolParameterOption(protocolName, parameterName, parameterValue) {
+                return 'PROTOCOL_'      + translationStringService.canonicalize(protocolName)
+                     + '.FIELD_OPTION_' + translationStringService.canonicalize(parameterName)
+                     + '_'              + translationStringService.canonicalize(parameterValue || 'EMPTY');
+            };
+
         }] // end controller
     };
     
diff --git a/guacamole/src/main/webapp/app/manage/manageModule.js b/guacamole/src/main/webapp/app/manage/manageModule.js
index 93eaa4ad2..2a16f479c 100644
--- a/guacamole/src/main/webapp/app/manage/manageModule.js
+++ b/guacamole/src/main/webapp/app/manage/manageModule.js
@@ -23,5 +23,5 @@
 /**
  * The module for the administration functionality.
  */
-angular.module('manage', ['btford.modal', 'groupList', 'rest']);
+angular.module('manage', ['btford.modal', 'groupList', 'locale', 'rest']);
 
diff --git a/guacamole/src/main/webapp/app/manage/templates/connectionParameter.html b/guacamole/src/main/webapp/app/manage/templates/connectionParameter.html
index 540f7e5fa..b073049c1 100644
--- a/guacamole/src/main/webapp/app/manage/templates/connectionParameter.html
+++ b/guacamole/src/main/webapp/app/manage/templates/connectionParameter.html
@@ -26,5 +26,5 @@
     <input ng-show="parameter.type === 'USERNAME'" type="text" ng-model="typedValue"/>
     <input ng-show="parameter.type === 'PASSWORD'" type="password" ng-model="typedValue"/>
     <input ng-show="parameter.type === 'BOOLEAN'" type="checkbox" ng-model="typedValue"/>
-    <select ng-show="parameter.type === 'ENUM'" ng-model="typedValue" ng-options="option.value as 'protocol.' + protocol.name + '.parameters.' + parameter.name + '.options.' + (option.value || 'empty') | translate for option in parameter.options | orderBy: value"></select>
+    <select ng-show="parameter.type === 'ENUM'" ng-model="typedValue" ng-options="option.value as getProtocolParameterOption(protocol.name, parameter.name, option.value) | translate for option in parameter.options | orderBy: value"></select>
 </span>
\ No newline at end of file
diff --git a/guacamole/src/main/webapp/app/manage/templates/manage.html b/guacamole/src/main/webapp/app/manage/templates/manage.html
index 3a45f3f24..e0d539287 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manage.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manage.html
@@ -21,22 +21,22 @@ THE SOFTWARE.
 -->
 
 <div class="logout-panel">
-    <a class="back button" href="#/">{{'manage.back' | translate}}</a>
-    <a class="logout button" ng-click="logout()">{{'home.logout' | translate}}</a>
+    <a class="back button" href="#/">{{'MANAGE.ACTION_NAVIGATE_BACK' | translate}}</a>
+    <a class="logout button" ng-click="logout()">{{'MANAGE.ACTION_LOGOUT' | translate}}</a>
 </div>
 
-<h2>{{'manage.administration' | translate}}</h2>
+<h2>{{'MANAGE.SECTION_HEADER_ADMINISTRATION' | translate}}</h2>
 <div ng-show="currentUserHasUpdate" class="settings section">
 
-    <h3 class="require-manage-users">{{'manage.users' | translate}}</h3>
+    <h3 class="require-manage-users">{{'MANAGE.SECTION_HEADER_USERS' | translate}}</h3>
     <div class="require-manage-users users">
 
-        <p>{{'manage.usersDescription' | translate}}</p>
+        <p>{{'MANAGE.HELP_USERS' | translate}}</p>
 
         <!-- Control to create a new user -->
         <div class="user-add-form">
             <input type="text" ng-model="newUsername" class="name username"/>
-            <button class="add-user" ng-click="newUser()">{{'manage.addUser' | translate}}</button>
+            <button class="add-user" ng-click="newUser()">{{'MANAGE.ACTION_NEW_USER' | translate}}</button>
         </div>
 
         <!-- List of users this user has access to -->
@@ -50,15 +50,15 @@ THE SOFTWARE.
         </div>
     </div>
 
-    <h3 class="require-manage-connections">{{'manage.connections' | translate}}</h3>
+    <h3 class="require-manage-connections">{{'MANAGE.SECTION_HEADER_CONNECTIONS' | translate}}</h3>
     <div class="require-manage-connections connections">
 
-        <p>{{'manage.connectionsDescription' | translate}}</p>
+        <p>{{'MANAGE.HELP_CONNECTIONS' | translate}}</p>
 
         <!-- Control to create a new connection or group -->
         <div class="connection-add-form">
-            <a class="add-connection button" href="#/manage/connections/">{{'manage.newConnection' | translate}}</a>
-            <a class="add-connection-group button" href="#/manage/connectionGroups/">{{'manage.newGroup' | translate}}</a>
+            <a class="add-connection button" href="#/manage/connections/">{{'MANAGE.ACTION_NEW_CONNECTION' | translate}}</a>
+            <a class="add-connection-group button" href="#/manage/connectionGroups/">{{'MANAGE.ACTION_NEW_CONNECTION_GROUP' | translate}}</a>
         </div>
 
         <!-- List of connections and groups this user has access to -->
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
index e204f501c..b86004eca 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
@@ -21,25 +21,25 @@ THE SOFTWARE.
 -->
 
 <div class="logout-panel">
-    <a class="back button" href="#/manage/">{{'manage.back' | translate}}</a>
-    <a class="logout button" ng-click="logout()">{{'home.logout' | translate}}</a>
+    <a class="back button" href="#/manage/">{{'MANAGE_CONNECTION.ACTION_NAVIGATE_BACK' | translate}}</a>
+    <a class="logout button" ng-click="logout()">{{'MANAGE_CONNECTION.ACTION_LOGOUT' | translate}}</a>
 </div>
 
 <!-- Main property editor -->
-<h2>{{'manage.edit.connection.title' | translate}}</h2>
+<h2>{{'MANAGE_CONNECTION.SECTION_HEADER_EDIT_CONNECTION' | translate}}</h2>
 <div class="section">
     <table class="properties">
         
         <!-- Edit connection name -->
         <tr>
-            <th>{{'manage.edit.connection.name' | translate}}</th>
+            <th>{{'MANAGE_CONNECTION.FIELD_HEADER_NAME' | translate}}</th>
           
             <td><input type="text" ng-model="connection.name"/></td>
         </tr>
         
         <!-- Edit connection location -->
         <tr>
-            <th>{{'manage.edit.connection.location' | translate}}</th>
+            <th>{{'MANAGE_CONNECTION.FIELD_HEADER_LOCATION' | translate}}</th>
           
             <td>
                 <location-chooser value="connection.parentIdentifier" root-group="rootGroup"></location-chooser>
@@ -49,22 +49,22 @@ THE SOFTWARE.
         
         <!-- Edit connection protocol -->
         <tr>
-            <th>{{'manage.edit.connection.protocol' | translate}}</th>
+            <th>{{'MANAGE_CONNECTION.FIELD_HEADER_PROTOCOL' | translate}}</th>
             <td>
-                <select ng-model="connection.protocol" ng-options="name as 'protocol.' + protocol.name + '.label' | translate for (name, protocol) in protocols | orderBy: name"></select>
+                <select ng-model="connection.protocol" ng-options="name as getProtocolName(protocol.name) | translate for (name, protocol) in protocols | orderBy: name"></select>
             </td>
         </tr>
     </table>
 </div>
 
 <!-- Connection parameters -->
-<h2>{{'manage.edit.connection.parameters' | translate}}</h2>
+<h2>{{'MANAGE_CONNECTION.SECTION_HEADER_PARAMETERS' | translate}}</h2>
 <div class="section" ng-class="{loading: !parameters}">
     <table class="properties">
         
         <!-- All the different possible editable field types -->
         <tr ng-repeat="parameter in protocols[connection.protocol].parameters">
-            <th>{{'protocol.' + connection.protocol + '.parameters.' + parameter.name + '.label' | translate}}:</th>
+            <th>{{getProtocolParameterName(connection.protocol, parameter.name) | translate}}</th>
             <td>
                 <guac-connection-parameter protocol="protocols[connection.protocol]" name="parameter.name" parameters="parameters"/>
             </td>
@@ -74,21 +74,21 @@ THE SOFTWARE.
 
 <!-- Form action buttons -->
 <div class="action-buttons">
-    <button ng-click="saveConnection()">{{'manage.edit.connection.save' | translate}}</button>
-    <button ng-click="cancel()">{{'manage.edit.connection.cancel' | translate}}</button>
-    <button ng-click="deleteConnection()" class="danger">{{'manage.edit.connection.delete' | translate}}</button>
+    <button ng-click="saveConnection()">{{'MANAGE_CONNECTION.ACTION_SAVE' | translate}}</button>
+    <button ng-click="cancel()">{{'MANAGE_CONNECTION.ACTION_CANCEL' | translate}}</button>
+    <button ng-click="deleteConnection()" class="danger">{{'MANAGE_CONNECTION.ACTION_DELETE' | translate}}</button>
 </div>
 
 <!-- Connection history -->
-<h2>{{'manage.edit.connection.history.usageHistory' | translate}}</h2>
+<h2>{{'MANAGE_CONNECTION.SECTION_HEADER_HISTORY' | translate}}</h2>
 <div class="history section" ng-class="{loading: !historyEntryWrappers}">
-    <p ng-hide="historyEntryWrappers.length">{{'manage.edit.connection.history.connectionNotUsed' | translate}}</p>
+    <p ng-hide="historyEntryWrappers.length">{{'MANAGE_CONNECTION.INFO_CONNECTION_NOT_USED' | translate}}</p>
     <table ng-show="historyEntryWrappers.length">
         <thead>
             <tr>
-                <th>{{'manage.edit.connection.history.username' | translate}}</th>
-                <th>{{'manage.edit.connection.history.startTime' | translate}}</th>
-                <th>{{'manage.edit.connection.history.duration' | translate}}</th>
+                <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_USERNAME' | translate}}</th>
+                <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_START' | translate}}</th>
+                <th>{{'MANAGE_CONNECTION.TABLE_HEADER_HISTORY_DURATION' | translate}}</th>
             </tr>
         </thead>
         <tbody>
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html
index 56a6ddc96..9257eed52 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html
@@ -21,25 +21,25 @@ THE SOFTWARE.
 -->
 
 <div class="logout-panel">
-    <a class="back button" href="#/manage/">{{'manage.back' | translate}}</a>
-    <a class="logout button" ng-click="logout()">{{'home.logout' | translate}}</a>
+    <a class="back button" href="#/manage/">{{'MANAGE_CONNECTION_GROUP.ACTION_NAVIGATE_BACK' | translate}}</a>
+    <a class="logout button" ng-click="logout()">{{'MANAGE_CONNECTION_GROUP.ACTION_LOGOUT' | translate}}</a>
 </div>
 
 <!-- Main property editor -->
-<h2>{{'manage.edit.connectionGroup.title' | translate}}</h2>
+<h2>{{'MANAGE_CONNECTION_GROUP.SECTION_HEADER_EDIT_CONNECTION_GROUP' | translate}}</h2>
 <div class="section">
     <table class="properties">
                     
         <!-- Edit connection group name -->
         <tr>
-            <th>{{'manage.edit.connectionGroup.name' | translate}}</th>
+            <th>{{'MANAGE_CONNECTION_GROUP.FIELD_HEADER_NAME' | translate}}</th>
                       
             <td><input type="text" ng-model="connectionGroup.name"/></td>
         </tr>
                     
         <!-- Edit connection group location -->
         <tr>
-            <th>{{'manage.edit.connectionGroup.location' | translate}}</th>
+            <th>{{'MANAGE_CONNECTION_GROUP.FIELD_HEADER_LOCATION' | translate}}</th>
                       
             <td>
                 <location-chooser value="connectionGroup.parentIdentifier" root-group="rootGroup"/>
@@ -49,9 +49,9 @@ THE SOFTWARE.
                     
         <!-- Edit connection group type -->
         <tr>
-            <th>{{'manage.edit.connectionGroup.type.label' | translate}}</th>
+            <th>{{'MANAGE_CONNECTION_GROUP.FIELD_HEADER_TYPE' | translate}}</th>
             <td>
-                <select ng-model="connectionGroup.type" ng-options="type.value as 'manage.edit.connectionGroup.type.' + type.label | translate for type in types | orderBy: name"></select>
+                <select ng-model="connectionGroup.type" ng-options="type.value as type.label | translate for type in types | orderBy: name"></select>
             </td>
         </tr>
     </table>
@@ -59,7 +59,7 @@ THE SOFTWARE.
 
 <!-- Form action buttons -->
 <div class="action-buttons">
-    <button ng-click="saveConnectionGroup()">{{'manage.edit.connectionGroup.save' | translate}}</button>
-    <button ng-click="cancel()">{{'manage.edit.connectionGroup.cancel' | translate}}</button>
-    <button ng-click="deleteConnectionGroup()" class="danger">{{'manage.edit.connectionGroup.delete' | translate}}</button>
+    <button ng-click="saveConnectionGroup()">{{'MANAGE_CONNECTION_GROUP.ACTION_SAVE' | translate}}</button>
+    <button ng-click="cancel()">{{'MANAGE_CONNECTION_GROUP.ACTION_CANCEL' | translate}}</button>
+    <button ng-click="deleteConnectionGroup()" class="danger">{{'MANAGE_CONNECTION_GROUP.ACTION_DELETE' | translate}}</button>
 </div>
\ No newline at end of file
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageUser.html b/guacamole/src/main/webapp/app/manage/templates/manageUser.html
index e11d5224c..a460077b8 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageUser.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageUser.html
@@ -21,26 +21,26 @@ THE SOFTWARE.
 -->
 
 <div class="logout-panel">
-    <a class="back button" href="#/manage/">{{'manage.back' | translate}}</a>
-    <a class="logout button" ng-click="logout()">{{'home.logout' | translate}}</a>
+    <a class="back button" href="#/manage/">{{'MANAGE_USER.ACTION_NAVIGATE_BACK' | translate}}</a>
+    <a class="logout button" ng-click="logout()">{{'MANAGE_USER.ACTION_LOGOUT' | translate}}</a>
 </div>
 
 <!-- Main property editor -->
-<h2>{{'manage.edit.user.title' | translate}}</h2>
+<h2>{{'MANAGE_USER.SECTION_HEADER_EDIT_USER' | translate}}</h2>
 <div class="section">
     <table class="properties">
         <tr>
-            <th>{{'manage.edit.user.username' | translate}}</th>
+            <th>{{'MANAGE_USER.FIELD_HEADER_USERNAME' | translate}}</th>
                       
             <td>{{user.username}}</td>
         </tr>
         <tr>
-            <th>{{'manage.edit.user.password' | translate}}</th>
+            <th>{{'MANAGE_USER.FIELD_HEADER_PASSWORD' | translate}}</th>
                         
             <td><input ng-model="user.password" type="password" /></td>
         </tr>
         <tr>
-            <th>{{'manage.edit.user.passwordMatch' | translate}}</th>
+            <th>{{'MANAGE_USER.FIELD_HEADER_PASSWORD_AGAIN' | translate}}</th>
                         
             <td><input ng-model="passwordMatch" type="password" /></td>
         </tr>
@@ -48,7 +48,7 @@ THE SOFTWARE.
 </div>
 
 <!-- System permissions section -->
-<h2>{{'manage.edit.user.permissions' | translate}}</h2>
+<h2>{{'MANAGE_USER.SECTION_HEADER_PERMISSIONS' | translate}}</h2>
 <div class="section">
     <table class="properties">
         <tr ng-repeat="systemPermissionType in systemPermissionTypes">
@@ -60,7 +60,7 @@ THE SOFTWARE.
 </div>
     
 <!-- Connection and connection group permission section -->
-<h2>{{'manage.edit.user.connections' | translate}}</h2>
+<h2>{{'MANAGE_USER.SECTION_HEADER_CONNECTIONS' | translate}}</h2>
 <div class="section" ng-class="{loading: !rootGroup}">
     <guac-group-list
         context="groupListContext"
@@ -71,7 +71,7 @@ THE SOFTWARE.
 
 <!-- Form action buttons -->
 <div class="action-buttons">
-    <button ng-click="saveUser()">{{'manage.edit.user.save' | translate}}</button>
-    <button ng-click="cancel()">{{'manage.edit.user.cancel' | translate}}</button>
-    <button ng-click="deleteUser()" class="danger">{{'manage.edit.user.delete' | translate}}</button>
+    <button ng-click="saveUser()">{{'MANAGE_USER.ACTION_SAVE' | translate}}</button>
+    <button ng-click="cancel()">{{'MANAGE_USER.ACTION_CANCEL' | translate}}</button>
+    <button ng-click="deleteUser()" class="danger">{{'MANAGE_USER.ACTION_DELETE' | translate}}</button>
 </div>
diff --git a/guacamole/src/main/webapp/app/manage/types/HistoryEntryWrapper.js b/guacamole/src/main/webapp/app/manage/types/HistoryEntryWrapper.js
index d7aa9b588..f8ad26e1d 100644
--- a/guacamole/src/main/webapp/app/manage/types/HistoryEntryWrapper.js
+++ b/guacamole/src/main/webapp/app/manage/types/HistoryEntryWrapper.js
@@ -59,15 +59,15 @@ angular.module('manage').factory('HistoryEntryWrapper', ['HistoryEntryDuration',
          * 
          * @type String
          */
-        this.durationText = 'manage.edit.connection.history.formattedDuration';
+        this.durationText = 'MANAGE_CONNECTION.TEXT_HISTORY_DURATION';
 
         // Notify if connection is active right now
         if (historyEntry.active)
-            this.durationText = 'manage.edit.connection.history.activeNow';
+            this.durationText = 'MANAGE_CONNECTION.INFO_CONNECTION_ACTIVE_NOW';
 
         // If connection is not active, inform use if end date is not known
         else if (!historyEntry.endDate)
-            this.durationText = 'manage.edit.connection.history.unknownEnd';
+            this.durationText = 'MANAGE_CONNECTION.INFO_CONNECTION_DURATION_UNKNOWN';
 
         // Set the duration if the necessary information is present
         if (historyEntry.endDate && historyEntry.startDate)
diff --git a/guacamole/src/main/webapp/app/textInput/templates/guacTextInput.html b/guacamole/src/main/webapp/app/textInput/templates/guacTextInput.html
index 3adcdd737..1a804d94f 100644
--- a/guacamole/src/main/webapp/app/textInput/templates/guacTextInput.html
+++ b/guacamole/src/main/webapp/app/textInput/templates/guacTextInput.html
@@ -22,6 +22,6 @@
     -->
 
     <!-- Text input target -->
-    <div class="text-input-field"><div class="sent-history"><div class="sent-text" ng-repeat="text in sentText track by $index">{{text}}</div></div><textarea rows="1" class="target"></textarea></div><div class="text-input-buttons"><guac-key keysym="65507" sticky="true" text="'client.ctrl'" pressed="ctrlPressed"></guac-key><guac-key keysym="65513" sticky="true" text="'client.alt'" pressed="altPressed"></guac-key><guac-key keysym="65307" text="'client.esc'"></guac-key><guac-key keysym="65289" text="'client.tab'"></guac-key></div>
+    <div class="text-input-field"><div class="sent-history"><div class="sent-text" ng-repeat="text in sentText track by $index">{{text}}</div></div><textarea rows="1" class="target"></textarea></div><div class="text-input-buttons"><guac-key keysym="65507" sticky="true" text="'CLIENT.NAME_KEY_CTRL'" pressed="ctrlPressed"></guac-key><guac-key keysym="65513" sticky="true" text="'CLIENT.NAME_KEY_ALT'" pressed="altPressed"></guac-key><guac-key keysym="65307" text="'CLIENT.NAME_KEY_ESC'"></guac-key><guac-key keysym="65289" text="'CLIENT.NAME_KEY_TAB'"></guac-key></div>
 
 </div>
diff --git a/guacamole/src/main/webapp/translations/en_US.json b/guacamole/src/main/webapp/translations/en_US.json
index de2127c9a..d64372bb3 100644
--- a/guacamole/src/main/webapp/translations/en_US.json
+++ b/guacamole/src/main/webapp/translations/en_US.json
@@ -1,319 +1,332 @@
 {
-    "application": {
-        "title" : "Guacamole ${project.version}"
+
+    "APP" : {
+
+        "ACTION_ACKNOWLEDGE"   : "OK",
+        "ACTION_CANCEL"        : "Cancel",
+        "ACTION_DELETE"        : "Delete",
+        "ACTION_LOGIN"         : "Login",
+        "ACTION_LOGOUT"        : "Logout",
+        "ACTION_MANAGE"        : "Manage",
+        "ACTION_NAVIGATE_BACK" : "Back",
+        "ACTION_SAVE"          : "Save",
+
+        "NAME" : "Guacamole ${project.version}"
+
+    },
+
+    "CLIENT" : {
+
+        "ACTION_RECONNECT"   : "Reconnect",
+        "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
+        "ACTION_SAVE_FILE"   : "@:APP.ACTION_SAVE",
+
+        "DIALOG_HEADER_CONNECTING"       : "Connecting",
+        "DIALOG_HEADER_CONNECTION_ERROR" : "Connection Error",
+        "DIALOG_HEADER_DISCONNECTED"     : "Disconnected",
+        "DIALOG_HEADER_FILE_TRANSFER"    : "File Transfer",
+
+        "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_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_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.",
+
+        "ERROR_TUNNEL_201"     : "The Guacamole server has rejected this connection attempt because there are too many active connections. Please wait a few minutes and try again.",
+        "ERROR_TUNNEL_202"     : "The connection has been closed because the server is taking too long to respond. This is usually caused by network problems, such as a spotty wireless signal, or slow network speeds. Please check your network connection and try again or contact your system administrator.",
+        "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_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.",
+        "ERROR_TUNNEL_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_TUNNEL_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.",
+
+        "ERROR_UPLOAD_100"     : "File transfer is either not supported or not enabled. Please contact your system administrator, or check your system logs.",
+        "ERROR_UPLOAD_201"     : "Too many files are currently being transferred. Please wait for existing transfers to complete, and then try again.",
+        "ERROR_UPLOAD_202"     : "The file cannot be transferred because the remote desktop server is taking too long to respond. Please try again or or contact your system administrator.",
+        "ERROR_UPLOAD_203"     : "The remote desktop server encountered an error during transfer. Please try again or contact your system administrator.",
+        "ERROR_UPLOAD_204"     : "The destination for the file transfer does not exist. Please check that the destionation exists and try again.",
+        "ERROR_UPLOAD_205"     : "The destination for the file transfer is currently locked. Please wait for any in-progress tasks to complete and try again.",
+        "ERROR_UPLOAD_301"     : "You do not have permission to upload this file because you are not logged in. Please log in and try again.",
+        "ERROR_UPLOAD_303"     : "You do not have permission to upload this file. If you require access, please check your system settings, or check with your system administrator.",
+        "ERROR_UPLOAD_308"     : "The file transfer has stalled. 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_UPLOAD_31D"     : "Too many files are currently being transferred. Please wait for existing transfers to complete, and then try again.",
+        "ERROR_UPLOAD_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.",
+
+        "HELP_CLIPBOARD"           : "Text copied/cut within Guacamole will appear here. Changes to the text below will affect the remote clipboard.",
+        "HELP_INPUT_METHOD_NONE"   : "No input method is used. Keyboard input is accepted from a connected, physical keyboard.",
+        "HELP_INPUT_METHOD_OSK"    : "Display and accept input from the built-in Guacamole on-screen keyboard. The on-screen keyboard allows typing of key combinations that may otherwise be impossible (such as Ctrl-Alt-Del).",
+        "HELP_INPUT_METHOD_TEXT"   : "Allow typing of text, and emulate keyboard events based on the typed text. This is necessary for devices such as mobile phones that lack a physical keyboard.",
+        "HELP_MOUSE_MODE"          : "Determines how the remote mouse behaves with respect to touches.",
+        "HELP_MOUSE_MODE_ABSOLUTE" : "Tap to click. The click occurs at the location of the touch.",
+        "HELP_MOUSE_MODE_RELATIVE" : "Drag to move the mouse pointer and tap to click. The click occurs at the location of the pointer.",
+
+        "NAME_INPUT_METHOD_NONE"   : "None",
+        "NAME_INPUT_METHOD_OSK"    : "On-screen keyboard",
+        "NAME_INPUT_METHOD_TEXT"   : "Text input",
+        "NAME_KEY_CTRL"            : "Ctrl",
+        "NAME_KEY_ALT"             : "Alt",
+        "NAME_KEY_ESC"             : "Esc",
+        "NAME_KEY_TAB"             : "Tab",
+        "NAME_MOUSE_MODE_ABSOLUTE" : "Touchscreen",
+        "NAME_MOUSE_MODE_RELATIVE" : "Touchpad",
+
+        "SECTION_HEADER_CLIPBOARD"    : "Clipboard",
+        "SECTION_HEADER_INPUT_METHOD" : "Input method",
+        "SECTION_HEADER_DISPLAY"      : "Display",
+        "SECTION_HEADER_MOUSE_MODE"   : "Mouse emulation mode",
+
+        "TEXT_ZOOM_AUTO_FIT"            : "Automatically fit to browser window",
+        "TEXT_CLIENT_STATUS_IDLE"       : "Idle.",
+        "TEXT_CLIENT_STATUS_CONNECTING" : "Connecting to Guacamole...",
+        "TEXT_CLIENT_STATUS_WAITING"    : "Connected to Guacamole. Waiting for response...",
+        "TEXT_TUNNEL_STATUS_CLOSED"     :  "You have been disconnected. Reload the page to reconnect.",
+        "TEXT_RECONNECT_COUNTDOWN"      : "Reconnecting in {REMAINING} {REMAINING, plural, one{second} other{seconds}}...",
+        "TEXT_FILE_TRANSFER_PROGRESS"   : "{PROGRESS} {UNIT, select, b{B} kb{KB} mb{MB} gb{GB} other{}}",
+
+        "URL_OSK_LAYOUT" : "layouts/en-us-qwerty.xml"
+
+    },
+
+    "HOME" : {
+
+        "ACTION_LOGOUT" : "@:APP.ACTION_LOGOUT",
+        "ACTION_MANAGE" : "@:APP.ACTION_MANAGE",
+
+        "INFO_NO_RECENT_CONNECTIONS" : "No recent Connections.",
+
+        "SECTION_HEADER_RECENT_CONNECTIONS" : "Recent Connections",
+        "SECTION_HEADER_ALL_CONNECTIONS"    : "All Connections"
+
+    },
+
+    "LOGIN": {
+
+        "ACTION_LOGIN"               : "@:APP.ACTION_LOGIN",
+
+        "ERROR_INVALID_LOGIN"        : "Invalid Login",
+
+        "FIELD_PLACEHOLDER_USERNAME" : "Username",
+        "FIELD_PLACEHOLDER_PASSWORD" : "Password"
+
     },
     
-    "login": {
-        "loginError" : "Invalid Login",
-        "username"   : "Username",
-        "password"   : "Password",
-        "login"      : "Login"
+    "MANAGE" : {
+
+        "ACTION_ACKNOWLEDGE"          : "@:APP.ACTION_ACKNOWLEDGE",
+        "ACTION_LOGOUT"               : "@:APP.ACTION_LOGOUT",
+        "ACTION_NAVIGATE_BACK"        : "@:APP.ACTION_NAVIGATE_BACK",
+        "ACTION_NEW_USER"             : "New User",
+        "ACTION_NEW_CONNECTION"       : "New Connection",
+        "ACTION_NEW_CONNECTION_GROUP" : "New Group",
+
+        "DIALOG_HEADER_ERROR"           : "Error",
+
+        "HELP_CONNECTIONS" : "Click or tap on a connection below to manage that connection. Depending on your access level, connections can be added and deleted, and their properties (protocol, hostname, port, etc.) can be changed.",
+        "HELP_USERS"       : "Click or tap on a user below to manage that user. Depending on your access level, users can be added and deleted, and their passwords can be changed.",
+
+        "SECTION_HEADER_ADMINISTRATION" : "Administration",
+        "SECTION_HEADER_CONNECTIONS"    : "Connections",
+        "SECTION_HEADER_USERS"          : "Users"
+
     },
-    
-    "home": {
-        "manage"                  : "Manage",
-        "logout"                  : "Logout",
-        "recentConnections"       : "Recent Connections",
-        "noRecentConnections"     : "No recent Connections.",
-        "allConnections"          : "All Connections",
-        "clipboard"               : "Clipboard",
-        "clipboardDescription"    : "Text copied/cut within Guacamole will appear here. Changes to the text will affect the remote clipboard, and will be pastable within the remote desktop. Use the textbox below as an interface between the client and server clipboards.",
-        "settings"                : "Settings",
-        "autoFitDisplay"          : "Auto-fit display to browser window",
-        "autoFitDescription"      : "If checked, remote displays are automatically scaled to exactly fit within the browser window. If unchecked, remote displays are always shown at their natural resolution, even if doing so causes the display to extend beyond the bounds of the window.",
-        "disableSound"            : "Disable Sound",
-        "disableSoundDescription" : "If on a device or network where bandwidth usage must be kept to a minimum, you may wish to check this box and disable sound. This can also be necessary if a device doesn't actually support sound, but claims to, resulting in wasted bandwidth.",
-        "disableSoundNote"        : "Changing this setting will only affect future connections."
+
+    "MANAGE_CONNECTION" : {
+
+        "ACTION_ACKNOWLEDGE"   : "@:APP.ACTION_ACKNOWLEDGE",
+        "ACTION_CANCEL"        : "@:APP.ACTION_CANCEL",
+        "ACTION_DELETE"        : "@:APP.ACTION_DELETE",
+        "ACTION_LOGOUT"        : "@:APP.ACTION_LOGOUT",
+        "ACTION_NAVIGATE_BACK" : "@:APP.ACTION_NAVIGATE_BACK",
+        "ACTION_SAVE"          : "@:APP.ACTION_SAVE",
+
+        "DIALOG_HEADER_CONFIRM_DELETE" : "Delete Connection",
+        "DIALOG_HEADER_ERROR"          : "Error",
+
+        "FIELD_HEADER_LOCATION" : "Location:",
+        "FIELD_HEADER_NAME"     : "Name:",
+        "FIELD_HEADER_PROTOCOL" : "Protocol:",
+
+        "INFO_CONNECTION_DURATION_UNKNOWN" : "--",
+        "INFO_CONNECTION_ACTIVE_NOW"       : "Active Now",
+        "INFO_CONNECTION_NOT_USED"         : "This connection has not yet been used.",
+
+        "SECTION_HEADER_EDIT_CONNECTION" : "Edit Connection",
+        "SECTION_HEADER_HISTORY"         : "Usage History",
+        "SECTION_HEADER_PARAMETERS"      : "Parameters",
+
+        "TABLE_HEADER_HISTORY_USERNAME" : "Username",
+        "TABLE_HEADER_HISTORY_START"    : "Start Time",
+        "TABLE_HEADER_HISTORY_DURATION" : "Duration",
+
+        "TEXT_CONFIRM_DELETE"   : "Connections cannot be restored after they have been deleted. Are you sure you want to delete this connection?",
+        "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{second} other{seconds}}} minute{{VALUE, plural, one{minute} other{minutes}}} hour{{VALUE, plural, one{hour} other{hours}}} day{{VALUE, plural, one{day} other{days}}} other{}}"
+
     },
-            
-    "manage": {
-        "back"                   : "Back",
-        "logout"                 : "Logout",
-        "administration"         : "Administration",
-        "users"                  : "Users",
-        "usersDescription"       : "Click or tap on a user below to manage that user. Depending on your access level, users can be added and deleted, and their passwords can be changed.",
-        "addUser"                : "Add User",
-        "connections"            : "Connections",
-        "connectionsDescription" : "Click or tap on a connection below to manage that connection. Depending on your access level, connections can be added and deleted, and their properties (protocol, hostname, port, etc.) can be changed.",
-        "newConnection"          : "New Connection",
-        "newGroup"               : "New Group",
-        "edit": {
-            "connection": {
-                "title"             : "Edit Connection",
-                "cancel"            : "Cancel",
-                "save"              : "Save",
-                "delete"            : "Delete",
-                "confirmDelete"     : {
-                    "title"             : "Delete Connection",
-                    "text"              : "Connections cannot be restored after they have been deleted. Are you sure you want to delete this connection?"
-                },
-                "protocol"          : "Protocol:",
-                "root"              : "ROOT",
-                "location"          : "Location:",
-                "name"              : "Name:",
-                "parameters"        : "Parameters",
-                "history"           : {
-                    "connectionNotUsed" : "This connection has not yet been used.",
-                    "usageHistory"      : "Usage History",
-                    "username"          : "Username",
-                    "startTime"         : "Start Time",
-                    "duration"          : "Duration",
-                    "activeNow"         : "Active Now",
-                    "unknownEnd"        : "--",
-                    "formattedDuration" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{second} other{seconds}}} minute{{VALUE, plural, one{minute} other{minutes}}} hour{{VALUE, plural, one{hour} other{hours}}} day{{VALUE, plural, one{day} other{days}}} other{}}"
-                }
-            },
-            "connectionGroup": {
-                "title"             : "Edit Connection Group",
-                "cancel"            : "Cancel",
-                "save"              : "Save",
-                "delete"            : "Delete",
-                "confirmDelete"     : {
-                    "title"             : "Delete Connection",
-                    "text"              : "Connection groups cannot be restored after they have been deleted. Are you sure you want to delete this connection group?"
-                },
-                "usageHistory"      : "Usage History:",
-                "type"              : {
-                    "label"             : "Type",
-                    "organizational"    : "Organizational",
-                    "balancing"         : "Balancing"
-                },
-                "root"              : "ROOT",
-                "location"          : "Location:",
-                "name"              : "Name:"
-            },
-            "user": {
-                "title"                     : "Edit User",
-                "cancel"                    : "Cancel",
-                "save"                      : "Save",
-                "delete"                    : "Delete",
-                "confirmDelete"     : {
-                    "title"             : "Delete User",
-                    "text"              : "Users cannot be restored after they have been deleted. Are you sure you want to delete this user?"
-                },
-                "password"                  : "Password:",
-                "passwordMatch"             : "Re-enter Password:",
-                "passwordMismatch"          : "The provided passwords do not match.",
-                "permissions"               : "Permissions",
-                "username"                  : "Username:",
-                "administerSystem"          : "Administer system:",
-                "createUser"                : "Create new users:",
-                "createConnection"          : "Create new connections:",
-                "createConnectionGroup"     : "Create new connection groups:",
-                "connections"               : "Connections"
-            }
-        },
-        "error": {
-            "title"             : "Error",
-            "action": {
-                "acknowledge"       : "OK"
-            }
-        }
+
+    "MANAGE_CONNECTION_GROUP" : {
+
+        "ACTION_ACKNOWLEDGE"   : "@:APP.ACTION_ACKNOWLEDGE",
+        "ACTION_CANCEL"        : "@:APP.ACTION_CANCEL",
+        "ACTION_DELETE"        : "@:APP.ACTION_DELETE",
+        "ACTION_LOGOUT"        : "@:APP.ACTION_LOGOUT",
+        "ACTION_NAVIGATE_BACK" : "@:APP.ACTION_NAVIGATE_BACK",
+        "ACTION_SAVE"          : "@:APP.ACTION_SAVE",
+
+        "DIALOG_HEADER_CONFIRM_DELETE" : "Delete Connection Group",
+        "DIALOG_HEADER_ERROR"          : "Error",
+
+        "FIELD_HEADER_LOCATION" : "Location:",
+        "FIELD_HEADER_NAME"     : "Name:",
+        "FIELD_HEADER_TYPE"     : "Type:",
+
+        "NAME_TYPE_BALANCING"       : "Balancing",
+        "NAME_TYPE_ORGANIZATIONAL"  : "Organizational",
+
+        "SECTION_HEADER_EDIT_CONNECTION_GROUP" : "Edit Connection Group",
+
+        "TEXT_CONFIRM_DELETE" : "Connection groups cannot be restored after they have been deleted. Are you sure you want to delete this connection group?"
+
     },
-    "protocol": {
-        "vnc": {
-            "label": "VNC",
-            "parameters": {
-                "hostname"          : {"label": "Hostname"},
-                "port"              : {"label": "Port"},
-                "password"          : {"label": "Password"},
-                "read-only"         : {"label": "Read-only"},
-                "swap-red-blue"     : {"label": "Swap red/blue components"},
-                "cursor"            : {
-                    "label": "Cursor",
-                    "options": {
-                        "local"     : "Local",
-                        "remote"    : "Remote"
-                    }
-                },
-                "color-depth"       : {
-                    "label": "Color Depth",
-                    "options": {
-                        "8"    : "256 color",
-                        "16"    : "Low color (16-bit)",
-                        "24"    : "True color (24-bit)",
-                        "32"    : "True color (32-bit)"
-                    }
-                },
-                "dest-host"         : {"label": "Repeater destination host"},
-                "dest-port"         : {"label": "Repeater destination port"},
-                "enable-audio"      : {"label": "Enable audio"},
-                "audio-servername"  : {"label": "Audio server name"}
-            }
-        },
-        "rdp": {
-            "label": "RDP",
-            "parameters": {
-                "hostname"          : {"label": "Hostname"},
-                "port"              : {"label": "Port"},
-                "username"          : {"label": "Username"},
-                "password"          : {"label": "Password"},
-                "domain"            : {"label": "Domain"},
-                "initial-program"   : {"label": "Initial Program"},
-                "width"             : {"label": "Width"},
-                "height"            : {"label": "Height"},
-                "color-depth"       : {
-                    "label": "Color Depth",
-                    "options": {
-                        "8"    : "256 color",
-                        "16"    : "Low color (16-bit)",
-                        "24"    : "True color (24-bit)",
-                        "32"    : "True color (32-bit)"
-                    }
-                },
-                "server-layout"     : {
-                    "label": "Keyboard layout",
-                    "options": {
-                        "empty"         : "(default)",
-                        "en-us-qwerty"  : "US English (Qwerty)",
-                        "fr-fr-azerty"  : "French (Azerty)",
-                        "de-de-qwertz"  : "German (Qwertz)",
-                        "failsafe"      : "Unicode"
-                    }
-                },
-                "console"           : {"label": "Administrator console"},
-                "console-audio"     : {"label": "Support audio in console"},
-                "disable-audio"     : {"label": "Disable audio"},
-                "enable-printing"   : {"label": "Enable printing"},
-                "enable-drive"      : {"label": "Enable drive"},
-                "drive-path"        : {"label": "Drive path"},
-                "security"          : {
-                    "label": "Security mode",
-                    "options": {
-                        "empty" : "(default)",
-                        "rdp"   : "RDP encryption",
-                        "tls"   : "TLS encryption",
-                        "nla"   : "NLA (Network Level Authentication)",
-                        "any"   : "Any"
-                    }
-                },
-                "disable-auth"      : {"label": "Disable authentication"},
-                "ignore-cert"       : {"label": "Ignore server certificate"},
-                "remote-app"        : {"label": "RemoteApp program"},
-                "remote-app-dir"    : {"label": "RemoteApp working directory"},
-                "remote-app-args"   : {"label": "RemoteApp parameters"}
-            }
-        },
-        "ssh": {
-            "label": "SSH",
-            "parameters": {
-                "hostname"          : {"label": "Hostname"},
-                "port"              : {"label": "Port"},
-                "username"          : {"label": "Username"},
-                "password"          : {"label": "Password"},
-                "font-name"         : {"label": "Font name"},
-                "font-size"         : {
-                    "label": "Font size",
-                    "options": {
-                        "empty" : "",
-                        "8"     : "8",
-                        "9"     : "9",
-                        "10"    : "10",
-                        "11"    : "11",
-                        "12"    : "12",
-                        "14"    : "14",
-                        "18"    : "18",
-                        "24"    : "24",
-                        "30"    : "30",
-                        "36"    : "36",
-                        "48"    : "48",
-                        "60"    : "60",
-                        "72"    : "72",
-                        "96"    : "96"
-                    }
-                 },
-                "enable-sftp"       : {"label": "Enable SFTP"},
-                "private-key"       : {"label": "Private key"},
-                "passphrase"        : {"label": "Passphrase"}
-            }
-        }
+
+    "MANAGE_USER" : {
+
+        "ACTION_ACKNOWLEDGE"   : "@:APP.ACTION_ACKNOWLEDGE",
+        "ACTION_CANCEL"        : "@:APP.ACTION_CANCEL",
+        "ACTION_DELETE"        : "@:APP.ACTION_DELETE",
+        "ACTION_LOGOUT"        : "@:APP.ACTION_LOGOUT",
+        "ACTION_NAVIGATE_BACK" : "@:APP.ACTION_NAVIGATE_BACK",
+        "ACTION_SAVE"          : "@:APP.ACTION_SAVE",
+
+        "DIALOG_HEADER_CONFIRM_DELETE"  : "Delete User",
+        "DIALOG_HEADER_ERROR"           : "Error",
+
+        "ERROR_PASSWORD_MISMATCH" : "The provided passwords do not match.",
+
+        "FIELD_HEADER_ADMINISTER_SYSTEM"             : "Administer system:",
+        "FIELD_HEADER_CREATE_NEW_USERS"              : "Create new users:",
+        "FIELD_HEADER_CREATE_NEW_CONNECTIONS"        : "Create new connections:",
+        "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS"  : "Create new connection groups:",
+        "FIELD_HEADER_PASSWORD"                      : "Password:",
+        "FIELD_HEADER_PASSWORD_AGAIN"                : "Re-enter Password:",
+        "FIELD_HEADER_USERNAME"                      : "Username:",
+
+        "SECTION_HEADER_CONNECTIONS" : "Connections",
+        "SECTION_HEADER_EDIT_USER"   : "Edit User",
+        "SECTION_HEADER_PERMISSIONS" : "Permissions",
+
+        "TEXT_CONFIRM_DELETE" : "Users cannot be restored after they have been deleted. Are you sure you want to delete this user?"
+
     },
-    "client": {
-        "oskLayout"         : "layouts/en-us-qwerty.xml",
-        "ctrl"              : "Ctrl",
-        "alt"               : "Alt",
-        "esc"               : "Esc",
-        "tab"               : "Tab",
-        "clipboard"         : "Clipboard",
-        "copiedText"        : "Text copied/cut within Guacamole will appear here. Changes to the text below will affect the remote clipboard.",
-        "inputMethod"       : "Input method",
-        "none"              : "None",
-        "noneDesc"          : "No input method is used. Keyboard input is accepted from a connected, physical keyboard.",
-        "textInput"         : "Text input",
-        "textInputDesc"     : "Allow typing of text, and emulate keyboard events based on the typed text. This is necessary for devices such as mobile phones that lack a physical keyboard.",
-        "osk"               : "On-screen keyboard",
-        "oskDesc"           : "Display and accept input from the built-in Guacamole on-screen keyboard. The on-screen keyboard allows typing of key combinations that may otherwise be impossible (such as Ctrl-Alt-Del).",
-        "mouseMode"         : "Mouse emulation mode",
-        "mouseModeDesc"     : "Determines how the remote mouse behaves with respect to touches.",
-        "touchscreen"       : "Touchscreen",
-        "touchscreenDesc"   : "Tap to click. The click occurs at the location of the touch.",
-        "touchpad"          : "Touchpad",
-        "touchpadDesc"      : "Drag to move the mouse pointer and tap to click. The click occurs at the location of the pointer.",
-        "display"           : "Display",
-        "oneHundredPercent" : "100%",
-        "autoFit"           : "Automatically fit to browser window",
-        "error"             : {
-            "reconnect"             : "Reconnect",
-            "connectionErrorTitle"  : "Connection Error",
-            "clientErrors"          : {
-                "201"       : "This connection has been closed because the server is busy. Please wait a few minutes and try again.",
-                "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.",
-                "203"       : "The remote desktop server encountered an error and has closed the connection. Please try again or contact your system administrator.",
-                "205"       : "This connection has been closed because it conflicts with another connection. Please try again later.",
-                "301"       : "Log in failed. Please reconnect and try again.",
-                "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.",
-                "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.",
-                "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.",
-                "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."
-            },
-            "tunnelErrors"         : {
-                "201"       : "The Guacamole server has rejected this connection attempt because there are too many active connections. Please wait a few minutes and try again.",
-                "202"       : "The connection has been closed because the server is taking too long to respond. This is usually caused by network problems, such as a spotty wireless signal, or slow network speeds. Please check your network connection and try again or contact your system administrator.",
-                "203"       : "The server encountered an error and has closed the connection. Please try again or contact your system administrator.",
-                "204"       : "The requested connection does not exist. Please check the connection name and try again.",
-                "205"       : "This connection is currently in use, and concurrent access to this connection is not allowed. Please try again later.",
-                "301"       : "You do not have permission to access this connection because you are not logged in. Please log in and try again.",
-                "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.",
-                "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.",
-                "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.",
-                "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."
-            },
-            "uploadErrors": {
-                "100": "File transfer is either not supported or not enabled. Please contact your system administrator, or check your system logs.",
-                "201": "Too many files are currently being transferred. Please wait for existing transfers to complete, and then try again.",
-                "202": "The file cannot be transferred because the remote desktop server is taking too long to respond. Please try again or or contact your system administrator.",
-                "203": "The remote desktop server encountered an error during transfer. Please try again or contact your system administrator.",
-                "204": "The destination for the file transfer does not exist. Please check that the destionation exists and try again.",
-                "205": "The destination for the file transfer is currently locked. Please wait for any in-progress tasks to complete and try again.",
-                "301": "You do not have permission to upload this file because you are not logged in. Please log in and try again.",
-                "303": "You do not have permission to upload this file. If you require access, please check your system settings, or check with your system administrator.",
-                "308": "The file transfer has stalled. 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.",
-                "31D": "Too many files are currently being transferred. Please wait for existing transfers to complete, and then try again.",
-                "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."
-            }
-        },
-        "status"            : {
-            "connectingStatusTitle" : "Connecting",
-            "closedStatusTitle"     : "Disconnected",
-            "clientStates"          : {
-                "idle"       : "Idle.",
-                "connecting" : "Connecting to Guacamole...",
-                "waiting"    : "Connected to Guacamole. Waiting for response..."
-            },
-            "tunnelStates"          : {
-                "closed"     : "You have been disconnected. Reload the page to reconnect."
-            }
-        },
-        "action" : {
-            "reconnect"             : "Reconnect",
-            "reconnectCountdown"    : "Reconnecting in {REMAINING} {REMAINING, plural, one{second} other{seconds}}..."
-        },
-        "fileTransfer" : {
-            "downloadTitle" : "File Transfer",
-            "uploadTitle"   : "File Transfer",
-            "progressText"  : "{PROGRESS} {UNIT, select, b{B} kb{KB} mb{MB} gb{GB} other{}}",
-            "ok"            : "OK",
-            "save"          : "Save"
-        }
+
+    "PROTOCOL_RDP" : {
+
+        "FIELD_HEADER_COLOR_DEPTH"     : "Color depth:",
+        "FIELD_HEADER_CONSOLE"         : "Administrator console:",
+        "FIELD_HEADER_CONSOLE_AUDIO"   : "Support audio in console:",
+        "FIELD_HEADER_DISABLE_AUDIO"   : "Disable audio:",
+        "FIELD_HEADER_DISABLE_AUTH"    : "Disable authentication:",
+        "FIELD_HEADER_DOMAIN"          : "Domain:",
+        "FIELD_HEADER_DRIVE_PATH"      : "Drive path:",
+        "FIELD_HEADER_ENABLE_DRIVE"    : "Enable drive:",
+        "FIELD_HEADER_ENABLE_PRINTING" : "Enable printing:",
+        "FIELD_HEADER_HEIGHT"          : "Height:",
+        "FIELD_HEADER_HOSTNAME"        : "Hostname:",
+        "FIELD_HEADER_IGNORE_CERT"     : "Ignore server certificate:",
+        "FIELD_HEADER_INITIAL_PROGRAM" : "Initial program:",
+        "FIELD_HEADER_PASSWORD"        : "Password:",
+        "FIELD_HEADER_PORT"            : "Port:",
+        "FIELD_HEADER_REMOTE_APP_ARGS" : "RemoteApp parameters:",
+        "FIELD_HEADER_REMOTE_APP_DIR"  : "RemoteApp working directory:",
+        "FIELD_HEADER_REMOTE_APP"      : "RemoteApp program:",
+        "FIELD_HEADER_SECURITY"        : "Security mode:",
+        "FIELD_HEADER_SERVER_LAYOUT"   : "Keyboard layout:",
+        "FIELD_HEADER_USERNAME"        : "Username:",
+        "FIELD_HEADER_WIDTH"           : "Width:",
+
+        "FIELD_OPTION_COLOR_DEPTH_16"    : "Low color (16-bit)",
+        "FIELD_OPTION_COLOR_DEPTH_24"    : "True color (24-bit)",
+        "FIELD_OPTION_COLOR_DEPTH_32"    : "True color (32-bit)",
+        "FIELD_OPTION_COLOR_DEPTH_8"     : "256 color",
+
+        "FIELD_OPTION_SECURITY_ANY"   : "Any",
+        "FIELD_OPTION_SECURITY_EMPTY" : "(default)",
+        "FIELD_OPTION_SECURITY_NLA"   : "NLA (Network Level Authentication)",
+        "FIELD_OPTION_SECURITY_RTP"   : "RDP encryption",
+        "FIELD_OPTION_SECURITY_TLS"   : "TLS encryption",
+
+        "FIELD_OPTION_SERVER_LAYOUT_DE_DE_QWERTZ" : "German (Qwertz)",
+        "FIELD_OPTION_SERVER_LAYOUT_EMPTY"        : "(default)",
+        "FIELD_OPTION_SERVER_LAYOUT_EN_US_QWERTY" : "US English (Qwerty)",
+        "FIELD_OPTION_SERVER_LAYOUT_FAILSAFE"     : "Unicode",
+        "FIELD_OPTION_SERVER_LAYOUT_FR_FR_AZERTY" : "French (Azerty)",
+
+        "NAME" : "RDP"
+
+    },
+
+    "PROTOCOL_SSH" : {
+
+        "FIELD_HEADER_FONT_NAME"   : "Font name:",
+        "FIELD_HEADER_FONT_SIZE"   : "Font size:",
+        "FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:",
+        "FIELD_HEADER_HOSTNAME"    : "Hostname:",
+        "FIELD_HEADER_USERNAME"    : "Username:",
+        "FIELD_HEADER_PASSWORD"    : "Password:",
+        "FIELD_HEADER_PASSPHRASE"  : "Passphrase:",
+        "FIELD_HEADER_PORT"        : "Port:",
+        "FIELD_HEADER_PRIVATE_KEY" : "Private key:",
+
+        "FIELD_OPTION_FONT_SIZE_8"     : "8",
+        "FIELD_OPTION_FONT_SIZE_9"     : "9",
+        "FIELD_OPTION_FONT_SIZE_10"    : "10",
+        "FIELD_OPTION_FONT_SIZE_11"    : "11",
+        "FIELD_OPTION_FONT_SIZE_12"    : "12",
+        "FIELD_OPTION_FONT_SIZE_14"    : "14",
+        "FIELD_OPTION_FONT_SIZE_18"    : "18",
+        "FIELD_OPTION_FONT_SIZE_24"    : "24",
+        "FIELD_OPTION_FONT_SIZE_30"    : "30",
+        "FIELD_OPTION_FONT_SIZE_36"    : "36",
+        "FIELD_OPTION_FONT_SIZE_48"    : "48",
+        "FIELD_OPTION_FONT_SIZE_60"    : "60",
+        "FIELD_OPTION_FONT_SIZE_72"    : "72",
+        "FIELD_OPTION_FONT_SIZE_96"    : "96",
+        "FIELD_OPTION_FONT_SIZE_EMPTY" : "",
+
+        "NAME" : "SSH"
+
+    },
+
+    "PROTOCOL_VNC" : {
+
+        "FIELD_HEADER_AUDIO_SERVERNAME" : "Audio server name:",
+        "FIELD_HEADER_COLOR_DEPTH"      : "Color depth:",
+        "FIELD_HEADER_CURSOR"           : "Cursor:",
+        "FIELD_HEADER_DEST_HOST"        : "Repeater destination host:",
+        "FIELD_HEADER_DEST_PORT"        : "Repeater destination port:",
+        "FIELD_HEADER_ENABLE_AUDIO"     : "Enable audio:",
+        "FIELD_HEADER_HOSTNAME"         : "Hostname:",
+        "FIELD_HEADER_PASSWORD"         : "Password:",
+        "FIELD_HEADER_PORT"             : "Port:",
+        "FIELD_HEADER_READ_ONLY"        : "Read-only:",
+        "FIELD_HEADER_SWAP_RED_BLUE"    : "Swap red/blue components:",
+
+        "FIELD_OPTION_COLOR_DEPTH_8"  : "256 color",
+        "FIELD_OPTION_COLOR_DEPTH_16" : "Low color (16-bit)",
+        "FIELD_OPTION_COLOR_DEPTH_24" : "True color (24-bit)",
+        "FIELD_OPTION_COLOR_DEPTH_32" : "True color (32-bit)",
+
+        "FIELD_OPTION_CURSOR_LOCAL"  : "Local",
+        "FIELD_OPTION_CURSOR_REMOTE" : "Remote",
+
+        "NAME" : "VNC"
+
     }
+
 }