diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ca.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ca.json index 64b27238a..c908548f1 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ca.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ca.json @@ -89,7 +89,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Inici de sessió desactivat:", "FIELD_HEADER_EXPIRED" : "Contrasenya caducada:", "FIELD_HEADER_ACCESS_WINDOW_END" : "No permetre l'accés després:", "FIELD_HEADER_ACCESS_WINDOW_START" : "Permet l'accés després:", @@ -104,8 +103,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Desactivat:", - "SECTION_HEADER_RESTRICTIONS" : "Restriccions de grup" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/de.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/de.json index 452d9ac04..20ffe0988 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/de.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/de.json @@ -88,7 +88,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Login deaktiviert:", "FIELD_HEADER_EXPIRED" : "Passwort abgelaufen:", "FIELD_HEADER_ACCESS_WINDOW_END" : "Zugriff nach dieser Uhrzeit nicht mehr erlauben:", "FIELD_HEADER_ACCESS_WINDOW_START" : "Zugriff erst nach dieser Uhrzeit erlauben:", @@ -102,9 +101,7 @@ }, "USER_GROUP_ATTRIBUTES" : { - - "FIELD_HEADER_DISABLED" : "Deaktiviert:", - + "SECTION_HEADER_RESTRICTIONS" : "Gruppeneinschränkung" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json index b286f0c49..a16880ba7 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json @@ -89,7 +89,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Login disabled:", "FIELD_HEADER_EXPIRED" : "Password expired:", "FIELD_HEADER_ACCESS_WINDOW_END" : "Do not allow access after:", "FIELD_HEADER_ACCESS_WINDOW_START" : "Allow access after:", @@ -104,8 +103,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Disabled:", - "SECTION_HEADER_RESTRICTIONS" : "Group Restrictions" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/es.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/es.json index e6c06a817..e3b1ef906 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/es.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/es.json @@ -89,7 +89,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Inicio de sesión deshabilitado:", "FIELD_HEADER_EXPIRED" : "Contraseña expirada:", "FIELD_HEADER_ACCESS_WINDOW_END" : "No permitir acceso despues de:", "FIELD_HEADER_ACCESS_WINDOW_START" : "Permitir acceso despues de:", @@ -104,8 +103,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Deshabilitado:", - "SECTION_HEADER_RESTRICTIONS" : "Restricciones de grupo" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/fr.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/fr.json index a85fad441..63b27cdb9 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/fr.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/fr.json @@ -89,7 +89,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Connexion désactivée:", "FIELD_HEADER_EXPIRED" : "Mot de passe expiré:", "FIELD_HEADER_ACCESS_WINDOW_END" : "Ne pas autoriser l'accès après:", "FIELD_HEADER_ACCESS_WINDOW_START" : "Autoriser l'accès après:", @@ -104,8 +103,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Désactivé:", - "SECTION_HEADER_RESTRICTIONS" : "Restrictions de groupe" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ja.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ja.json index 2c94c4397..18aaf5971 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ja.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ja.json @@ -75,7 +75,7 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "ログインの無効化:", + "FIELD_HEADER_EXPIRED" : "パスワード変更の強制:", "FIELD_HEADER_ACCESS_WINDOW_END" : "指定した時刻からアクセスを禁止する:", "FIELD_HEADER_ACCESS_WINDOW_START" : "指定した時刻からアクセスを許可する:", @@ -90,8 +90,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "グループの無効化:", - "SECTION_HEADER_RESTRICTIONS" : "グループ制限" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ko.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ko.json index 6c1a24da5..bfc124ab9 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ko.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ko.json @@ -88,7 +88,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "로그인 비활성화:", "FIELD_HEADER_EXPIRED" : "비밀번호 만료됨:", "FIELD_HEADER_ACCESS_WINDOW_END" : "다음 이후에 액세스 허용 안함 :", "FIELD_HEADER_ACCESS_WINDOW_START" : "다음 이후에 엑세스 허용:", @@ -103,8 +102,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "비활성화:", - "SECTION_HEADER_RESTRICTIONS" : "그룹 제한" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/pl.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/pl.json index 8c31932aa..a5b5fc11f 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/pl.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/pl.json @@ -89,7 +89,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Logowanie zablokowane:", "FIELD_HEADER_EXPIRED" : "Hasło wygasło:", "FIELD_HEADER_ACCESS_WINDOW_END" : "Nie zezwalaj na dostęp po:", "FIELD_HEADER_ACCESS_WINDOW_START" : "Zezwalaj na dostęp od:", @@ -104,8 +103,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Wyłączona:", - "SECTION_HEADER_RESTRICTIONS" : "Ograniczenia Grupy" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/pt.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/pt.json index 928077038..aafd4675c 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/pt.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/pt.json @@ -90,7 +90,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Login desativado:", "FIELD_HEADER_EXPIRED" : "Senha expirada:", "FIELD_HEADER_ACCESS_WINDOW_END" : "Não permitir acesso após:", "FIELD_HEADER_ACCESS_WINDOW_START" : "Permitir acesso após:", @@ -105,8 +104,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Desativado:", - "SECTION_HEADER_RESTRICTIONS" : "Restrições de Grupo" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json index 12e9c6f93..110a4bc5c 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json @@ -88,7 +88,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Аккаунт отключен:", "FIELD_HEADER_EXPIRED" : "Пароль просрочен:", "FIELD_HEADER_ACCESS_WINDOW_END" : "Запретить доступ после:", "FIELD_HEADER_ACCESS_WINDOW_START" : "Разрешить доступ после:", @@ -103,8 +102,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "Группа отключена:", - "SECTION_HEADER_RESTRICTIONS" : "Ограничения" } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/zh.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/zh.json index 44b6bf233..ff91c7e81 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/zh.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/zh.json @@ -89,7 +89,6 @@ "USER_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "已禁用登录:", "FIELD_HEADER_EXPIRED" : "密码已过期:", "FIELD_HEADER_ACCESS_WINDOW_END" : "之后不允许访问:", "FIELD_HEADER_ACCESS_WINDOW_START" : "之后允许访问:", @@ -104,8 +103,6 @@ "USER_GROUP_ATTRIBUTES" : { - "FIELD_HEADER_DISABLED" : "禁用:", - "SECTION_HEADER_RESTRICTIONS" : "组限制" } diff --git a/guacamole/src/main/frontend/src/app/manage/templates/manageUser.html b/guacamole/src/main/frontend/src/app/manage/templates/manageUser.html index 014c7659c..d5896ecdd 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/manageUser.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/manageUser.html @@ -37,6 +37,10 @@ {{'MANAGE_USER.FIELD_HEADER_PASSWORD_AGAIN' | translate}} + + {{'MANAGE_USER.FIELD_HEADER_USER_DISABLED' | translate}} + + diff --git a/guacamole/src/main/frontend/src/app/manage/templates/manageUserGroup.html b/guacamole/src/main/frontend/src/app/manage/templates/manageUserGroup.html index 09fd3e68b..c450baab9 100644 --- a/guacamole/src/main/frontend/src/app/manage/templates/manageUserGroup.html +++ b/guacamole/src/main/frontend/src/app/manage/templates/manageUserGroup.html @@ -28,6 +28,10 @@ {{userGroup.identifier}} + + {{'MANAGE_USER_GROUP.FIELD_HEADER_USER_GROUP_DISABLED' | translate}} + + diff --git a/guacamole/src/main/frontend/src/app/manage/types/ManageableUser.js b/guacamole/src/main/frontend/src/app/manage/types/ManageableUser.js index b67ddbdb7..d6c987472 100644 --- a/guacamole/src/main/frontend/src/app/manage/types/ManageableUser.js +++ b/guacamole/src/main/frontend/src/app/manage/types/ManageableUser.js @@ -45,6 +45,17 @@ angular.module('manage').factory('ManageableUser', [function defineManageableUse * @type User */ this.user = template.user; + + /** + * Return true if the underlying user account is disabled, otherwise + * return false. + * + * @returns + * True if the underlying user account is disabled, otherwise false. + */ + this.isDisabled = function isDisabled() { + return template.user.disabled; + }; }; diff --git a/guacamole/src/main/frontend/src/app/rest/types/User.js b/guacamole/src/main/frontend/src/app/rest/types/User.js index 3ca138d3b..c74d1cd8a 100644 --- a/guacamole/src/main/frontend/src/app/rest/types/User.js +++ b/guacamole/src/main/frontend/src/app/rest/types/User.js @@ -61,6 +61,13 @@ angular.module('rest').factory('User', [function defineUser() { * @type Number */ this.lastActive = template.lastActive; + + /** + * True if this user account is disabled, otherwise false. + * + * @type boolean + */ + this.disabled = template.disabled; /** * Arbitrary name/value pairs which further describe this user. The diff --git a/guacamole/src/main/frontend/src/app/rest/types/UserGroup.js b/guacamole/src/main/frontend/src/app/rest/types/UserGroup.js index f4bf26cfe..e3bc7eae2 100644 --- a/guacamole/src/main/frontend/src/app/rest/types/UserGroup.js +++ b/guacamole/src/main/frontend/src/app/rest/types/UserGroup.js @@ -42,6 +42,13 @@ angular.module('rest').factory('UserGroup', [function defineUserGroup() { * @type String */ this.identifier = template.identifier; + + /** + * True if this user group is disabled, otherwise false. + * + * @type boolean + */ + this.disabled = template.disabled; /** * Arbitrary name/value pairs which further describe this user group. diff --git a/guacamole/src/main/frontend/src/app/settings/styles/user-group-list.css b/guacamole/src/main/frontend/src/app/settings/styles/user-group-list.css index 2040eb440..6f29de70f 100644 --- a/guacamole/src/main/frontend/src/app/settings/styles/user-group-list.css +++ b/guacamole/src/main/frontend/src/app/settings/styles/user-group-list.css @@ -26,11 +26,17 @@ width: 100%; } -.settings.user-groups table.user-group-list tr.user td.user-group-name a[href] { +.settings.user-groups table.user-group-list tr.user-group td.user-group-name a[href] { display: block; padding: .5em 1em; } -.settings.user-groups table.user-group-list tr.user td.user-group-name { - padding: 0; +.settings.user-groups table.user-group-list tr.user-group.disabled, +.settings.user-groups table.user-group-list tr.user-group.disabled td.user-group-name a[href] { + color: gray; + font-style: italic; } + +.settings.user-groups table.user-group-list tr.user-group td.user-group-name { + padding: 0; +} \ No newline at end of file diff --git a/guacamole/src/main/frontend/src/app/settings/styles/user-list.css b/guacamole/src/main/frontend/src/app/settings/styles/user-list.css index e130d0da1..e9631a950 100644 --- a/guacamole/src/main/frontend/src/app/settings/styles/user-list.css +++ b/guacamole/src/main/frontend/src/app/settings/styles/user-list.css @@ -36,6 +36,12 @@ padding: .5em 1em; } +.settings.users table.user-list tr.user.disabled, +.settings.users table.user-list tr.user.disabled td.username a[href] { + color: gray; + font-style: italic; +} + .settings.users table.user-list tr.user td.username { padding: 0; -} +} \ No newline at end of file diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsUserGroups.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsUserGroups.html index ccb534e65..4e7cd4c5a 100644 --- a/guacamole/src/main/frontend/src/app/settings/templates/settingsUserGroups.html +++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsUserGroups.html @@ -30,7 +30,7 @@ - +
diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsUsers.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsUsers.html index 18a043782..4a178fe49 100644 --- a/guacamole/src/main/frontend/src/app/settings/templates/settingsUsers.html +++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsUsers.html @@ -39,7 +39,7 @@ - +
diff --git a/guacamole/src/main/frontend/src/translations/ca.json b/guacamole/src/main/frontend/src/translations/ca.json index 3ec74359d..658c9232f 100644 --- a/guacamole/src/main/frontend/src/translations/ca.json +++ b/guacamole/src/main/frontend/src/translations/ca.json @@ -343,6 +343,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "Crear noves connexions:", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "Crear grups de connexió nous:", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Crear nous perfils per compartir:", + "FIELD_HEADER_USER_DISABLED" : "Inici de sessió desactivat:", "FIELD_HEADER_USERNAME" : "Nom d'usuari:", "HELP_NO_USER_GROUPS" : "Actualment, aquest usuari no pertany a cap grup. Amplieu aquesta secció per afegir-lo a grups.", @@ -373,6 +374,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", + "FIELD_HEADER_USER_GROUP_DISABLED" : "Desactivat:", "FIELD_HEADER_USER_GROUP_NAME" : "Nom del grup:", "HELP_NO_USER_GROUPS" : "Actualment aquest grup no pertany a cap grup. Amplieu aquesta secció per afegir grups.", diff --git a/guacamole/src/main/frontend/src/translations/de.json b/guacamole/src/main/frontend/src/translations/de.json index 04059693d..e9bcab55d 100644 --- a/guacamole/src/main/frontend/src/translations/de.json +++ b/guacamole/src/main/frontend/src/translations/de.json @@ -411,6 +411,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Neues Verteil-Profil erstellen:", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "Login deaktiviert:", "FIELD_HEADER_USERNAME" : "Benutzername:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -449,6 +450,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", + "FIELD_HEADER_USER_GROUP_DISABLED" : "Deaktiviert:", "FIELD_HEADER_USER_GROUP_NAME" : "Name der Benutzergruppe:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json index ade20a940..7c2edec57 100644 --- a/guacamole/src/main/frontend/src/translations/en.json +++ b/guacamole/src/main/frontend/src/translations/en.json @@ -416,6 +416,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Create new sharing profiles:", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "Login disabled:", "FIELD_HEADER_USERNAME" : "Username:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -454,6 +455,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", + "FIELD_HEADER_USER_GROUP_DISABLED" : "Disabled:", "FIELD_HEADER_USER_GROUP_NAME" : "Group name:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", diff --git a/guacamole/src/main/frontend/src/translations/es.json b/guacamole/src/main/frontend/src/translations/es.json index dcacb7067..b607d0b60 100644 --- a/guacamole/src/main/frontend/src/translations/es.json +++ b/guacamole/src/main/frontend/src/translations/es.json @@ -317,6 +317,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Crear nuevos perfiles de compartir:", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "Inicio de sesión deshabilitado:", "FIELD_HEADER_USERNAME" : "Nombre de usuario:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -355,6 +356,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", + "FIELD_HEADER_USER_GROUP_DISABLED" : "Deshabilitado:", "FIELD_HEADER_USER_GROUP_NAME" : "Nombre del grupo:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", diff --git a/guacamole/src/main/frontend/src/translations/fr.json b/guacamole/src/main/frontend/src/translations/fr.json index bf2904303..085d79e7f 100644 --- a/guacamole/src/main/frontend/src/translations/fr.json +++ b/guacamole/src/main/frontend/src/translations/fr.json @@ -316,6 +316,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Créer de nouveaux profils de partage:", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "Connexion désactivée:", "FIELD_HEADER_USERNAME" : "Identifiant:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -354,6 +355,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", + "FIELD_HEADER_USER_GROUP_DISABLED" : "Désactivé:", "FIELD_HEADER_USER_GROUP_NAME" : "Nom Groupe:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", diff --git a/guacamole/src/main/frontend/src/translations/ja.json b/guacamole/src/main/frontend/src/translations/ja.json index e4c2ad0c4..2750d38fd 100644 --- a/guacamole/src/main/frontend/src/translations/ja.json +++ b/guacamole/src/main/frontend/src/translations/ja.json @@ -282,6 +282,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "共有プロファイルの作成:", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "ログインの無効化:", "FIELD_HEADER_USERNAME" : "ユーザ名:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -320,6 +321,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", + "FIELD_HEADER_USER_GROUP_DISABLED" : "グループの無効化:", "FIELD_HEADER_USER_GROUP_NAME" : "グループ名:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", diff --git a/guacamole/src/main/frontend/src/translations/ko.json b/guacamole/src/main/frontend/src/translations/ko.json index 8b01d8559..ac135e440 100644 --- a/guacamole/src/main/frontend/src/translations/ko.json +++ b/guacamole/src/main/frontend/src/translations/ko.json @@ -314,6 +314,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "새로운 공유 프로파일 생성", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "로그인 비활성화:", "FIELD_HEADER_USERNAME" : "사용자 이름:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -351,6 +352,7 @@ "FIELD_HEADER_CREATE_NEW_USER_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_USER_GROUPS", "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", + "FIELD_HEADER_USER_GROUP_DISABLED" : "비활성화:", "FIELD_HEADER_USER_GROUP_NAME" : "그룹 이름:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", diff --git a/guacamole/src/main/frontend/src/translations/pl.json b/guacamole/src/main/frontend/src/translations/pl.json index 6f999697b..bda29e05e 100644 --- a/guacamole/src/main/frontend/src/translations/pl.json +++ b/guacamole/src/main/frontend/src/translations/pl.json @@ -326,6 +326,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Tworzenie nowych profili udostępniania:", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "Logowanie zablokowane:", "FIELD_HEADER_USERNAME" : "Nazwa użytkownika:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -364,6 +365,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", + "FIELD_HEADER_USER_DISABLED" : "Wyłączona:", "FIELD_HEADER_USER_GROUP_NAME" : "Nazwa grupy:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", diff --git a/guacamole/src/main/frontend/src/translations/pt.json b/guacamole/src/main/frontend/src/translations/pt.json index 9cebddf26..2cf9b4f20 100644 --- a/guacamole/src/main/frontend/src/translations/pt.json +++ b/guacamole/src/main/frontend/src/translations/pt.json @@ -318,6 +318,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Criar novos perfis de compartilhamento:", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "Login desativado:", "FIELD_HEADER_USERNAME" : "Usuário:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -356,6 +357,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", + "FIELD_HEADER_USER_GROUP_DISABLED" : "Desativado:", "FIELD_HEADER_USER_GROUP_NAME" : "Nome do grupo:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", diff --git a/guacamole/src/main/frontend/src/translations/ru.json b/guacamole/src/main/frontend/src/translations/ru.json index 7243e9497..a086f7339 100644 --- a/guacamole/src/main/frontend/src/translations/ru.json +++ b/guacamole/src/main/frontend/src/translations/ru.json @@ -309,6 +309,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Создание нового профиля расшаривания:", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "Аккаунт отключен:", "FIELD_HEADER_USERNAME" : "Имя пользователя:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -347,6 +348,7 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", + "FIELD_HEADER_USER_GROUP_DISABLED" : "Группа отключена:", "FIELD_HEADER_USER_GROUP_NAME" : "Название:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", diff --git a/guacamole/src/main/frontend/src/translations/zh.json b/guacamole/src/main/frontend/src/translations/zh.json index 72b7cb384..76e9a2a81 100644 --- a/guacamole/src/main/frontend/src/translations/zh.json +++ b/guacamole/src/main/frontend/src/translations/zh.json @@ -406,6 +406,7 @@ "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "新建共享设定：", "FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD", "FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN", + "FIELD_HEADER_USER_DISABLED" : "已禁用登录:", "FIELD_HEADER_USERNAME" : "用户名：", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -444,7 +445,8 @@ "FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS", "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS", "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES", - "FIELD_HEADER_USER_GROUP_NAME" : "用户组名称：", + "FIELD_HEADER_USER_GROUP_DISABLED" : "禁用:", + "FIELD_HEADER_USER_GROUP_NAME" : "用户组名称:", "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", @@ -1130,4 +1132,4 @@ } -} \ No newline at end of file +}