Merge 1.3.0 changes back to master.

extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json

@@ -16,7 +16,7 @@
         "translations/fr.json",
         "translations/ja.json",
         "translations/pt.json",
-        "translations/ru.json"
+        "translations/ru.json",
+        "translations/zh.json"
     ]
-
 }

extensions/guacamole-auth-cas/src/main/resources/translations/zh.json

@@ -0,0 +1,12 @@
+{
+
+    "DATA_SOURCE_CAS" : {
+        "NAME" : "CAS SSO后端"
+    },
+
+    "LOGIN" : {
+        "FIELD_HEADER_TICKET"        : "",
+        "INFO_CAS_REDIRECT_PENDING"  : "请稍候，正在重定向到CAS验证..."
+    }
+
+}

extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json

@@ -16,7 +16,8 @@
         "translations/fr.json",
         "translations/ja.json",
         "translations/pt.json",
-        "translations/ru.json"
+        "translations/ru.json",
+        "translations/zh.json"
     ],
 
     "js" : [

extensions/guacamole-auth-duo/src/main/resources/translations/zh.json

@@ -0,0 +1,13 @@
+{
+
+    "DATA_SOURCE_DUO" : {
+        "NAME" : "Duo TFA后端"
+    },
+
+    "LOGIN" : {
+        "FIELD_HEADER_GUAC_DUO_SIGNED_RESPONSE" : "",
+        "INFO_DUO_VALIDATION_CODE_INCORRECT"    : "Duo验证码不正确。",
+        "INFO_DUO_AUTH_REQUIRED"                : "请先使用Duo进行身份验证。"
+    }
+
+}

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/zh.json

@@ -0,0 +1,113 @@
+{
+
+    "LOGIN" : {
+
+        "ERROR_PASSWORD_BLANK"    : "@:APP.ERROR_PASSWORD_BLANK",
+        "ERROR_PASSWORD_SAME"     : "新密码必须与过期密码不同。",
+        "ERROR_PASSWORD_MISMATCH" : "@:APP.ERROR_PASSWORD_MISMATCH",
+        "ERROR_NOT_VALID"         : "此用户帐户当前无效。",
+        "ERROR_NOT_ACCESSIBLE"    : "当前不允许访问该帐户。请稍后再试。",
+
+        "INFO_PASSWORD_EXPIRED" : "您的密码已过期，必须重新设置。请输入新密码以继续。",
+
+        "FIELD_HEADER_NEW_PASSWORD"         : "新密码",
+        "FIELD_HEADER_CONFIRM_NEW_PASSWORD" : "确认新密码"
+
+    },
+
+    "CONNECTION_ATTRIBUTES" : {
+
+        "FIELD_HEADER_MAX_CONNECTIONS"          : "最大连接数：",
+        "FIELD_HEADER_MAX_CONNECTIONS_PER_USER" : "每个用户的最大连接数：",
+
+        "FIELD_HEADER_FAILOVER_ONLY"            : "仅用于故障转移：",
+        "FIELD_HEADER_WEIGHT"                   : "连接权重：",
+
+        "FIELD_HEADER_GUACD_HOSTNAME"   : "主机名：",
+        "FIELD_HEADER_GUACD_ENCRYPTION" : "加密：",
+        "FIELD_HEADER_GUACD_PORT"       : "端口：",
+
+        "FIELD_OPTION_GUACD_ENCRYPTION_EMPTY" : "",
+        "FIELD_OPTION_GUACD_ENCRYPTION_NONE"  : "没有 (未加密)",
+        "FIELD_OPTION_GUACD_ENCRYPTION_SSL"   : "SSL / TLS",
+
+        "SECTION_HEADER_CONCURRENCY"    : "并发限制",
+        "SECTION_HEADER_LOAD_BALANCING" : "负载均衡",
+        "SECTION_HEADER_GUACD"          : "Guacamole代理参数(guacd)"
+
+    },
+
+    "CONNECTION_GROUP_ATTRIBUTES" : {
+
+        "FIELD_HEADER_ENABLE_SESSION_AFFINITY"  : "启用会话亲和：",
+        "FIELD_HEADER_MAX_CONNECTIONS"          : "最大连接数：",
+        "FIELD_HEADER_MAX_CONNECTIONS_PER_USER" : "每个用户的最大连接数：",
+
+        "SECTION_HEADER_CONCURRENCY" : "并发限制(组负载均衡)"
+
+    },
+
+    "DATA_SOURCE_MYSQL" : {
+        "NAME" : "MySQL"
+    },
+
+    "DATA_SOURCE_MYSQL_SHARED" : {
+        "NAME" : "共享连接(MySQL)"
+    },
+
+    "DATA_SOURCE_POSTGRESQL" : {
+        "NAME" : "PostgreSQL"
+    },
+
+    "DATA_SOURCE_POSTGRESQL_SHARED" : {
+        "NAME" : "共享连接(PostgreSQL)"
+    },
+
+    "DATA_SOURCE_SQLSERVER" : {
+        "NAME" : "SQL Server"
+    },
+
+    "DATA_SOURCE_SQLSERVER_SHARED" : {
+        "NAME" : "共享连接(SQL Server)"
+    },
+
+    "HOME" : {
+        "INFO_SHARED_BY" : "由{USERNAME}共享"
+    },
+
+    "PASSWORD_POLICY" : {
+
+        "ERROR_CONTAINS_USERNAME"      : "密码可能不包含用户名。",
+        "ERROR_REQUIRES_DIGIT"         : "密码必须至少包含一位数字。",
+        "ERROR_REQUIRES_MULTIPLE_CASE" : "密码必须同时包含大写和小写字符。",
+        "ERROR_REQUIRES_NON_ALNUM"     : "密码必须包含至少一个符号。",
+        "ERROR_REUSED"                 : "此密码已被使用。请勿重复使用以前的密码。",
+        "ERROR_TOO_SHORT"              : "密码必须至少{LENGTH}位长度。",
+        "ERROR_TOO_YOUNG"              : "此帐户的密码已被重设。请至少再等待 {WAIT}天，然后再次更改密码。"
+
+    },
+
+    "USER_ATTRIBUTES" : {
+
+        "FIELD_HEADER_DISABLED"            : "已禁用登录:",
+        "FIELD_HEADER_EXPIRED"             : "密码已过期:",
+        "FIELD_HEADER_ACCESS_WINDOW_END"   : "之后不允许访问:",
+        "FIELD_HEADER_ACCESS_WINDOW_START" : "之后允许访问:",
+        "FIELD_HEADER_TIMEZONE"            : "用户时区:",
+        "FIELD_HEADER_VALID_FROM"          : "之后启用帐户:",
+        "FIELD_HEADER_VALID_UNTIL"         : "之后禁用帐户:",
+
+        "SECTION_HEADER_RESTRICTIONS" : "帐户限制",
+        "SECTION_HEADER_PROFILE"      : "个人资料"
+
+    },
+
+    "USER_GROUP_ATTRIBUTES" : {
+
+        "FIELD_HEADER_DISABLED" : "禁用:",
+
+        "SECTION_HEADER_RESTRICTIONS" : "组限制"
+
+    }
+
+}

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json

@@ -26,7 +26,8 @@
         "translations/fr.json",
         "translations/ja.json",
         "translations/pt.json",
-        "translations/ru.json"
+        "translations/ru.json",
+        "translations/zh.json"
     ]
 
 }

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json

@@ -26,7 +26,8 @@
         "translations/fr.json",
         "translations/ja.json",
         "translations/pt.json",
-        "translations/ru.json"
+        "translations/ru.json",
+        "translations/zh.json"
     ]
 
 }

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json

@@ -26,7 +26,8 @@
         "translations/fr.json",
         "translations/ja.json",
         "translations/pt.json",
-        "translations/ru.json"
+        "translations/ru.json",
+        "translations/zh.json"
     ]
 
 }

extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json

@@ -11,7 +11,8 @@
 
     "translations" : [
         "translations/de.json",
-        "translations/en.json"
+        "translations/en.json",
+        "translations/zh.json"
     ]
 
 }

extensions/guacamole-auth-ldap/src/main/resources/translations/zh.json

@@ -0,0 +1,7 @@
+{
+
+    "DATA_SOURCE_LDAP" : {
+        "NAME" : "轻型目录访问协议"
+    }
+
+}

extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json

@@ -16,7 +16,8 @@
         "translations/fr.json",
         "translations/ja.json",
         "translations/pt.json",
-        "translations/ru.json"
+        "translations/ru.json",
+        "translations/zh.json"
     ],
 
     "js" : [

extensions/guacamole-auth-openid/src/main/resources/translations/zh.json

@@ -0,0 +1,12 @@
+{
+
+    "DATA_SOURCE_OPENID" : {
+        "NAME" : "OpenID SSO后端"
+    },
+
+    "LOGIN" : {
+        "FIELD_HEADER_ID_TOKEN" : "",
+        "INFO_REDIRECT_PENDING" : "请稍候，正在重定向到身份提供者..."
+    }
+
+}

extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json

@@ -27,7 +27,8 @@
         "translations/fr.json",
         "translations/ja.json",
         "translations/pt.json",
-        "translations/ru.json"
+        "translations/ru.json",
+        "translations/zh.json"
     ],
 
     "resources" : {

extensions/guacamole-auth-quickconnect/src/main/resources/translations/zh.json

@@ -0,0 +1,18 @@
+{
+
+    "DATA_SOURCE_QUICKCONNECT" : {
+        "NAME" : "快速连接"
+    },
+
+    "QUICKCONNECT" : {
+        "ACTION_CONNECT"        : "连接",
+        
+        "ERROR_INVALID_URI"      : "指定的URI无效",
+        "ERROR_NO_HOST"          : "未指定主机",
+        "ERROR_NO_PROTOCOL"      : "未指定协议",
+        "ERROR_NOT_ABSOLUTE_URI" : "不是绝对URI地址",
+        
+        "FIELD_PLACEHOLDER_URI" : "输入连接URI"
+    }
+
+}

extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json

@@ -14,7 +14,8 @@
         "translations/de.json",
         "translations/en.json",
         "translations/ja.json",
-        "translations/ru.json"
+        "translations/ru.json",
+        "translations/zh.json"
     ],
 
     "js" : [

extensions/guacamole-auth-radius/src/main/resources/translations/zh.json

@@ -0,0 +1,12 @@
+{
+
+    "DATA_SOURCE_RADIUS" : {
+        "NAME" : "RADIUS后端"
+    },
+
+    "LOGIN" : {
+        "FIELD_HEADER_GUAC_RADIUS_STATE"              : "",
+        "FIELD_HEADER_RADIUSCHALLENGE"                : ""
+    }
+
+}

extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json

@@ -16,7 +16,8 @@
         "translations/fr.json",
         "translations/ja.json",
         "translations/pt.json",
-        "translations/ru.json"
+        "translations/ru.json",
+        "translations/zh.json"
     ],
 
     "js" : [

extensions/guacamole-auth-totp/src/main/resources/translations/zh.json

@@ -0,0 +1,34 @@
+{
+
+    "DATA_SOURCE_TOTP" : {
+        "NAME" : "TOTP TFA后端"
+    },
+
+    "LOGIN" : {
+        "FIELD_HEADER_GUAC_TOTP" : ""
+    },
+
+    "TOTP" : {
+
+        "ACTION_HIDE_DETAILS" : "隐藏",
+        "ACTION_SHOW_DETAILS" : "显示",
+
+        "FIELD_HEADER_ALGORITHM"  : "算法:",
+        "FIELD_HEADER_DIGITS"     : "位数:",
+        "FIELD_HEADER_INTERVAL"   : "间隔:",
+        "FIELD_HEADER_SECRET_KEY" : "密钥:",
+
+        "FIELD_PLACEHOLDER_CODE" : "授权码",
+
+        "INFO_CODE_REQUIRED"       : "请输入您的授权码以验证您的身份。",
+        "INFO_ENROLL_REQUIRED"     : "您的帐户已启用多因素身份验证。",
+        "INFO_VERIFICATION_FAILED" : "验证失败， 请重试。",
+
+        "HELP_ENROLL_BARCODE" : "要完成注册过程，请使用手机或设备上的two-factor验证程序扫描下面的条形码。",
+        "HELP_ENROLL_VERIFY"  : "扫描条形码后，输入显示的{DIGITS}-数字授权码以验证注册是否成功。",
+
+        "SECTION_HEADER_DETAILS" : "详情:"
+
+    }
+
+}

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

@@ -18,6 +18,7 @@
         "ACTION_MANAGE_SETTINGS"    : "设置",
         "ACTION_MANAGE_SESSIONS"    : "活动会话",
         "ACTION_MANAGE_USERS"       : "用户",
+        "ACTION_MANAGE_USER_GROUPS" : "用户组",
         "ACTION_NAVIGATE_BACK"      : "返回",
         "ACTION_NAVIGATE_HOME"      : "首页",
         "ACTION_SAVE"               : "保存",
@@ -28,6 +29,7 @@
 
         "DIALOG_HEADER_ERROR" : "出错",
 
+        "ERROR_PAGE_UNAVAILABLE"  : "发生错误，此操作无法完成。 如果问题仍然存在，请通知系统管理员或检查系统日志。",
         "ERROR_PASSWORD_BLANK"    : "密码不能留空。",
         "ERROR_PASSWORD_MISMATCH" : "输入的密码不吻合。",
         
@@ -77,7 +79,7 @@
         "ERROR_CLIENT_DEFAULT" : "本连接因为Guacamole服务器出现了内部错误而被终止。如果问题持续，请通知您的系统管理员，或检查您的系统日志。",
 
         "ERROR_TUNNEL_201"     : "因为正在使用的活动连接太多，Guacamole服务器拒绝了本连接。请稍后再重试。",
-        "ERROR_TUNNEL_202"     : "因服务器太久没有应答，本连续已被关闭。这通常是因为网络问题（如不稳定的无线连接或网速太慢等）而导致的。请先检查您的网络连接再重试，或者联系您的系统管理员。",
+        "ERROR_TUNNEL_202"     : "因服务器太久没有应答，本连接已被关闭。这通常是因为网络问题（如不稳定的无线连接或网速太慢等）而导致的。请先检查您的网络连接再重试，或者联系您的系统管理员。",
         "ERROR_TUNNEL_203"     : "服务器出错并关闭了本连接。请重试，或联系您的系统管理员。",
         "ERROR_TUNNEL_204"     : "请求的连接不存在。请先检查连接的名字再重试。",
         "ERROR_TUNNEL_205"     : "本连接正在使用中，并且不允许共享连接。请稍后重试。",
@@ -145,6 +147,22 @@
 
     },
 
+    "COLOR_SCHEME" : {
+
+        "ACTION_CANCEL"       : "@:APP.ACTION_CANCEL",
+        "ACTION_HIDE_DETAILS" : "隐藏",
+        "ACTION_SAVE"         : "@:APP.ACTION_SAVE",
+        "ACTION_SHOW_DETAILS" : "显示",
+
+        "FIELD_HEADER_BACKGROUND" : "背景",
+        "FIELD_HEADER_FOREGROUND" : "前景",
+
+        "FIELD_OPTION_CUSTOM" : "自定义...",
+
+        "SECTION_HEADER_DETAILS" : "详情:"
+
+    },
+
     "DATA_SOURCE_DEFAULT" : {
         "NAME" : "缺省（XML）"
     },
@@ -291,6 +309,7 @@
         "FIELD_HEADER_ADMINISTER_SYSTEM"             : "授权管理系统：",
         "FIELD_HEADER_CHANGE_OWN_PASSWORD"           : "修改自己的密码：",
         "FIELD_HEADER_CREATE_NEW_USERS"              : "新建用户：",
+        "FIELD_HEADER_CREATE_NEW_USER_GROUPS"        : "新建用户组：",
         "FIELD_HEADER_CREATE_NEW_CONNECTIONS"        : "新建连接：",
         "FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS"  : "新建连接组：",
         "FIELD_HEADER_CREATE_NEW_SHARING_PROFILES"   : "新建共享设定：",
@@ -300,16 +319,131 @@
 
         "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
 
-        "INFO_READ_ONLY" : "对不起，不能编辑此用户的账户。",
+        "HELP_NO_USER_GROUPS" : "该用户当前不属于任何组。 展开此部分以添加组。",
 	
+        "INFO_READ_ONLY" : "对不起，不能编辑此用户的账户。",
+        "INFO_NO_USER_GROUPS_AVAILABLE" : "没用可用的用户组.",
+
+        "SECTION_HEADER_ALL_CONNECTIONS"     : "全部连接",
         "SECTION_HEADER_CONNECTIONS" : "连接",
+        "SECTION_HEADER_CURRENT_CONNECTIONS" : "当前连接",
         "SECTION_HEADER_EDIT_USER"   : "编辑用户",
         "SECTION_HEADER_PERMISSIONS" : "使用权限",
+        "SECTION_HEADER_USER_GROUPS"         : "用户组",
 	
         "TEXT_CONFIRM_DELETE" : "将不能恢复已被删除的用户。确定要删除这个用户吗？"
 
     },
     
+    "MANAGE_USER_GROUP" : {
+
+        "ACTION_ACKNOWLEDGE"   : "@:APP.ACTION_ACKNOWLEDGE",
+        "ACTION_CANCEL"        : "@:APP.ACTION_CANCEL",
+        "ACTION_CLONE"         : "@:APP.ACTION_CLONE",
+        "ACTION_DELETE"        : "@:APP.ACTION_DELETE",
+        "ACTION_SAVE"          : "@:APP.ACTION_SAVE",
+
+        "DIALOG_HEADER_CONFIRM_DELETE" : "删除用户组",
+        "DIALOG_HEADER_ERROR"          : "@:APP.DIALOG_HEADER_ERROR",
+
+        "FIELD_HEADER_ADMINISTER_SYSTEM"             : "@:MANAGE_USER.FIELD_HEADER_ADMINISTER_SYSTEM",
+        "FIELD_HEADER_CHANGE_OWN_PASSWORD"           : "@:MANAGE_USER.FIELD_HEADER_CHANGE_OWN_PASSWORD",
+        "FIELD_HEADER_CREATE_NEW_USERS"              : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_USERS",
+        "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_CREATE_NEW_SHARING_PROFILES"   : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES",
+        "FIELD_HEADER_USER_GROUP_NAME"               : "用户组名称:",
+
+        "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+
+        "HELP_NO_USER_GROUPS"        : "该组当前不属于任何组。 展开此部分以添加组。",
+        "HELP_NO_MEMBER_USER_GROUPS" : "该组当前不包含任何组。 展开此部分以添加组。",
+        "HELP_NO_MEMBER_USERS"       : "该组当前不包含任何用户。 展开此部分以添加用户。",
+
+        "INFO_READ_ONLY"                : "抱歉，无法编辑此组。",
+        "INFO_NO_USER_GROUPS_AVAILABLE" : "@:MANAGE_USER.INFO_NO_USER_GROUPS_AVAILABLE",
+        "INFO_NO_USERS_AVAILABLE"       : "没有可用的用户。",
+
+        "SECTION_HEADER_ALL_CONNECTIONS"     : "@:MANAGE_USER.SECTION_HEADER_ALL_CONNECTIONS",
+        "SECTION_HEADER_CONNECTIONS"         : "@:MANAGE_USER.SECTION_HEADER_CONNECTIONS",
+        "SECTION_HEADER_CURRENT_CONNECTIONS" : "@:MANAGE_USER.SECTION_HEADER_CURRENT_CONNECTIONS",
+        "SECTION_HEADER_EDIT_USER_GROUP"     : "编辑用户组",
+        "SECTION_HEADER_MEMBER_USERS"        : "会员用户",
+        "SECTION_HEADER_MEMBER_USER_GROUPS"  : "会员用户组",
+        "SECTION_HEADER_PERMISSIONS"         : "@:MANAGE_USER.SECTION_HEADER_PERMISSIONS",
+        "SECTION_HEADER_USER_GROUPS"         : "父用户组",
+
+        "TEXT_CONFIRM_DELETE" : "删除组后将无法还原。 您确定要删除该组吗？"
+
+    },
+    
+    "PROTOCOL_KUBERNETES" : {
+
+        "FIELD_HEADER_BACKSPACE"      : "发送退格键：",
+        "FIELD_HEADER_CA_CERT"         : "证书颁发机构证书：",
+        "FIELD_HEADER_CLIENT_CERT"     : "客户证书:",
+        "FIELD_HEADER_CLIENT_KEY"      : "客户端密钥:",
+        "FIELD_HEADER_COLOR_SCHEME"   : "配色方案：",
+        "FIELD_HEADER_CONTAINER"       : "容器名称:",
+        "FIELD_HEADER_CREATE_RECORDING_PATH" : "自动建立录像目录：",
+        "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "自动建立打字稿目录：",
+        "FIELD_HEADER_FONT_NAME"      : "字体名：",
+        "FIELD_HEADER_FONT_SIZE"      : "字体大小：",
+        "FIELD_HEADER_HOSTNAME"       : "主机名：",
+        "FIELD_HEADER_IGNORE_CERT"     : "忽略服务器证书:",
+        "FIELD_HEADER_NAMESPACE"       : "命名空间:",
+        "FIELD_HEADER_POD"             : "Pod名称:",
+        "FIELD_HEADER_PORT"           : "端口：",
+        "FIELD_HEADER_READ_ONLY"      : "只读：",
+        "FIELD_HEADER_RECORDING_EXCLUDE_MOUSE"  : "排除鼠标：",
+        "FIELD_HEADER_RECORDING_EXCLUDE_OUTPUT" : "排除图像/数据流：",
+        "FIELD_HEADER_RECORDING_INCLUDE_KEYS"   : "包含按键事件：",
+        "FIELD_HEADER_RECORDING_NAME" : "录像名：",
+        "FIELD_HEADER_RECORDING_PATH" : "录像路径：",
+        "FIELD_HEADER_SCROLLBACK"      : "最大回滚尺寸:",
+        "FIELD_HEADER_TYPESCRIPT_NAME" : "打字稿名称：",
+        "FIELD_HEADER_TYPESCRIPT_PATH" : "打字稿路径：",
+        "FIELD_HEADER_USE_SSL"         : "使用SSL/TLS",
+
+        "FIELD_OPTION_BACKSPACE_EMPTY" : "",
+        "FIELD_OPTION_BACKSPACE_8"     : "退格键（Ctrl-H）",
+        "FIELD_OPTION_BACKSPACE_127"   : "删除键（Ctrl-?）",
+
+        "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "白底黑字",
+        "FIELD_OPTION_COLOR_SCHEME_EMPTY"       : "",
+        "FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK"  : "黑底灰字",
+        "FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "黑底绿字",
+        "FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "黑底白字",
+
+        "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" : "Kubernetes",
+
+        "SECTION_HEADER_AUTHENTICATION" : "认证方式",
+        "SECTION_HEADER_BEHAVIOR"       : "终端行为",
+        "SECTION_HEADER_CONTAINER"      : "容器",
+        "SECTION_HEADER_DISPLAY"        : "显示",
+        "SECTION_HEADER_RECORDING"      : "屏幕录制",
+        "SECTION_HEADER_TYPESCRIPT"     : "打字稿(文本会话录制)",
+        "SECTION_HEADER_NETWORK"        : "网络"
+
+    },
+    
     "PROTOCOL_RDP" : {
 
         "FIELD_HEADER_CLIENT_NAME"     : "客户端：",
@@ -320,8 +454,11 @@
         "FIELD_HEADER_CREATE_RECORDING_PATH" : "自动建立录像目录：",
         "FIELD_HEADER_DISABLE_AUDIO"   : "禁用音频：",
         "FIELD_HEADER_DISABLE_AUTH"    : "禁用认证：",
+        "FIELD_HEADER_DISABLE_COPY"    : "禁用从远程桌面复制:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "禁用从客户端粘贴:",
         "FIELD_HEADER_DOMAIN"          : "域：",
         "FIELD_HEADER_DPI"             : "分辨率（DPI）：",
+        "FIELD_HEADER_DRIVE_NAME"      : "驱动器名称:",
         "FIELD_HEADER_DRIVE_PATH"      : "虚拟盘路径：",
         "FIELD_HEADER_ENABLE_AUDIO_INPUT"         : "启用音频输入（话筒）：",
         "FIELD_HEADER_ENABLE_DESKTOP_COMPOSITION" : "启用桌面合成效果（Aero）：",
@@ -348,6 +485,7 @@
         "FIELD_HEADER_LOAD_BALANCE_INFO" : "负载平衡信息/cookie：",
         "FIELD_HEADER_PASSWORD"        : "密码：",
         "FIELD_HEADER_PORT"            : "端口：",
+        "FIELD_HEADER_PRINTER_NAME"    : "重定向的打印机名称:",
         "FIELD_HEADER_PRECONNECTION_BLOB" : "预连接BLOB（VM标识）：",
         "FIELD_HEADER_PRECONNECTION_ID"   : "RDP源标识：",
         "FIELD_HEADER_READ_ONLY"      : "只读：",
@@ -363,6 +501,7 @@
         "FIELD_HEADER_SECURITY"        : "安全模式：",
         "FIELD_HEADER_SERVER_LAYOUT"   : "键盘布局：",
         "FIELD_HEADER_SFTP_DIRECTORY"             : "缺省文件上传目录：",
+        "FIELD_HEADER_SFTP_HOST_KEY"              : "公钥(Base64):",
         "FIELD_HEADER_SFTP_HOSTNAME"              : "主机名：",
         "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive时间间隔：",
         "FIELD_HEADER_SFTP_PASSPHRASE"            : "口令：",
@@ -372,6 +511,7 @@
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"        : "文件浏览器根目录：",
         "FIELD_HEADER_SFTP_USERNAME"              : "用户名：",
         "FIELD_HEADER_STATIC_CHANNELS" : "静态通道名：",
+        "FIELD_HEADER_TIMEZONE"        : "时区:",
         "FIELD_HEADER_USERNAME"        : "用户名：",
         "FIELD_HEADER_WIDTH"           : "宽度：",
 
@@ -391,6 +531,7 @@
         "FIELD_OPTION_SECURITY_RDP"   : "RDP加密",
         "FIELD_OPTION_SECURITY_TLS"   : "TLS加密",
 
+        "FIELD_OPTION_SERVER_LAYOUT_DE_CH_QWERTZ" : "Swiss German (Qwertz)",
         "FIELD_OPTION_SERVER_LAYOUT_DE_DE_QWERTZ" : "German (Qwertz)",
         "FIELD_OPTION_SERVER_LAYOUT_EMPTY"        : "",
         "FIELD_OPTION_SERVER_LAYOUT_EN_GB_QWERTY" : "UK English (Qwerty)",
@@ -399,10 +540,12 @@
         "FIELD_OPTION_SERVER_LAYOUT_FAILSAFE"     : "Unicode",
         "FIELD_OPTION_SERVER_LAYOUT_FR_CH_QWERTZ" : "Swiss French (Qwertz)",
         "FIELD_OPTION_SERVER_LAYOUT_FR_FR_AZERTY" : "French (Azerty)",
+        "FIELD_OPTION_SERVER_LAYOUT_HU_HU_QWERTZ" : "Hungarian (Qwertz)",       
         "FIELD_OPTION_SERVER_LAYOUT_IT_IT_QWERTY" : "Italian (Qwerty)",
         "FIELD_OPTION_SERVER_LAYOUT_JA_JP_QWERTY" : "Japanese (Qwerty)",
         "FIELD_OPTION_SERVER_LAYOUT_PT_BR_QWERTY" : "Portuguese Brazilian (Qwerty)",
         "FIELD_OPTION_SERVER_LAYOUT_SV_SE_QWERTY" : "Swedish (Qwerty)",
+        "FIELD_OPTION_SERVER_LAYOUT_DA_DK_QWERTY" : "Danish (Qwerty)",
         "FIELD_OPTION_SERVER_LAYOUT_TR_TR_QWERTY" : "Turkish-Q (Qwerty)",
 
         "NAME" : "RDP",
@@ -430,15 +573,20 @@
         "FIELD_HEADER_COMMAND"      : "运行命令：",
         "FIELD_HEADER_CREATE_RECORDING_PATH" : "自动建立录像目录：",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "自动建立打字稿目录：",
+        "FIELD_HEADER_DISABLE_COPY"  : "禁用从终端复制:",
+        "FIELD_HEADER_DISABLE_PASTE" : "禁用从客户端粘贴:",
         "FIELD_HEADER_FONT_NAME"   : "字体名：",
         "FIELD_HEADER_FONT_SIZE"   : "字体大小：",
         "FIELD_HEADER_ENABLE_SFTP" : "启用SFTP：",
+        "FIELD_HEADER_HOST_KEY"      : "公钥(Base64):",
         "FIELD_HEADER_HOSTNAME"    : "主机名：",
+        "FIELD_HEADER_LOCALE"        : "语言/地区($LANG):",
         "FIELD_HEADER_USERNAME"    : "用户名：",
         "FIELD_HEADER_PASSWORD"    : "密码：",
         "FIELD_HEADER_PASSPHRASE"  : "口令：",
         "FIELD_HEADER_PORT"        : "端口：",
         "FIELD_HEADER_PRIVATE_KEY" : "私钥：",
+        "FIELD_HEADER_SCROLLBACK"    : "最大回滚尺寸:",
         "FIELD_HEADER_READ_ONLY"   : "只读：",
         "FIELD_HEADER_RECORDING_EXCLUDE_MOUSE"  : "排除鼠标：",
         "FIELD_HEADER_RECORDING_EXCLUDE_OUTPUT" : "排除图像/数据流：",
@@ -446,8 +594,11 @@
         "FIELD_HEADER_RECORDING_NAME" : "录像名：",
         "FIELD_HEADER_RECORDING_PATH" : "录像路径：",
         "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "服务器keepalive时间间隔：",
+
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"   : "文件浏览器根目录：",
-        "FIELD_HEADER_TYPESCRIPT_NAME" : "打字稿名：",
+        "FIELD_HEADER_TERMINAL_TYPE"   : "终端类型:",
+        "FIELD_HEADER_TIMEZONE"        : "时区($TZ):",
+        "FIELD_HEADER_TYPESCRIPT_NAME" : "打字稿名称：",
         "FIELD_HEADER_TYPESCRIPT_PATH" : "打字稿路径：",
 
         "FIELD_OPTION_BACKSPACE_EMPTY" : "",
@@ -476,6 +627,14 @@
         "FIELD_OPTION_FONT_SIZE_96"    : "96",
         "FIELD_OPTION_FONT_SIZE_EMPTY" : "",
 	
+        "FIELD_OPTION_TERMINAL_TYPE_ANSI"           : "ansi",
+        "FIELD_OPTION_TERMINAL_TYPE_EMPTY"          : "",
+        "FIELD_OPTION_TERMINAL_TYPE_LINUX"          : "linux",
+        "FIELD_OPTION_TERMINAL_TYPE_VT100"          : "vt100",
+        "FIELD_OPTION_TERMINAL_TYPE_VT220"          : "vt220",
+        "FIELD_OPTION_TERMINAL_TYPE_XTERM"          : "xterm",
+        "FIELD_OPTION_TERMINAL_TYPE_XTERM_256COLOR" : "xterm-256color",
+	
         "NAME" : "SSH",
 
         "SECTION_HEADER_AUTHENTICATION" : "认证",
@@ -492,29 +651,36 @@
 
     "PROTOCOL_TELNET" : {
 
-        "FIELD_HEADER_BACKSPACE"      : "退格键发送：",
+        "FIELD_HEADER_BACKSPACE"      : "发送退格键:",
-        "FIELD_HEADER_COLOR_SCHEME"   : "配色方案：",
+        "FIELD_HEADER_COLOR_SCHEME"   : "配色方案:",
-        "FIELD_HEADER_CREATE_RECORDING_PATH" : "自动建立录像目录：",
+        "FIELD_HEADER_CREATE_RECORDING_PATH" : "自动创建记录路径:",
-        "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "自动建立打字稿目录：",
+        "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "自动创建typescript路径:",
-        "FIELD_HEADER_FONT_NAME"      : "字体名：",
+        "FIELD_HEADER_DISABLE_COPY"   : "禁止从终端复制：",
-        "FIELD_HEADER_FONT_SIZE"      : "字体大小：",
+        "FIELD_HEADER_DISABLE_PASTE"  : "禁用从客户端粘贴：",
-        "FIELD_HEADER_HOSTNAME"       : "主机名：",
+        "FIELD_HEADER_FONT_NAME"      : "字体名称:",
-        "FIELD_HEADER_USERNAME"       : "用户名：",
+        "FIELD_HEADER_FONT_SIZE"      : "字体大小:",
-        "FIELD_HEADER_PASSWORD"       : "密码：",
+        "FIELD_HEADER_HOSTNAME"       : "主机名:",
-        "FIELD_HEADER_PASSWORD_REGEX" : "密码规则正则表达式：",
+        "FIELD_HEADER_LOGIN_FAILURE_REGEX" : "登录失败正则表达式:",
-        "FIELD_HEADER_PORT"           : "端口：",
+        "FIELD_HEADER_LOGIN_SUCCESS_REGEX" : "登录成功正则表达式:",
-        "FIELD_HEADER_READ_ONLY"      : "只读：",
+        "FIELD_HEADER_USERNAME"       : "用户名:",
-        "FIELD_HEADER_RECORDING_EXCLUDE_MOUSE"  : "排除鼠标：",
+        "FIELD_HEADER_USERNAME_REGEX" : "用户名正则表达式:",
-        "FIELD_HEADER_RECORDING_EXCLUDE_OUTPUT" : "排除图像/数据流：",
+        "FIELD_HEADER_PASSWORD"       : "密码:",
-        "FIELD_HEADER_RECORDING_INCLUDE_KEYS"   : "包含按键事件：",
+        "FIELD_HEADER_PASSWORD_REGEX" : "密码正则表达式:",
-        "FIELD_HEADER_RECORDING_NAME" : "录像名：",
+        "FIELD_HEADER_PORT"           : "端口:",
-        "FIELD_HEADER_RECORDING_PATH" : "录像路径：",
+        "FIELD_HEADER_READ_ONLY"      : "只读:",
-        "FIELD_HEADER_TYPESCRIPT_NAME" : "打字稿名：",
+        "FIELD_HEADER_RECORDING_EXCLUDE_MOUSE"  : "排除鼠标:",
-        "FIELD_HEADER_TYPESCRIPT_PATH" : "打字稿路径：",
+        "FIELD_HEADER_RECORDING_EXCLUDE_OUTPUT" : "排除图形/流:",
+        "FIELD_HEADER_RECORDING_INCLUDE_KEYS"   : "包含关键事件:",
+        "FIELD_HEADER_RECORDING_NAME" : "记录名称:",
+        "FIELD_HEADER_RECORDING_PATH" : "记录路径:",
+        "FIELD_HEADER_SCROLLBACK"     : "最大回滚尺寸:",
+        "FIELD_HEADER_TERMINAL_TYPE"   : "终端类型:",
+        "FIELD_HEADER_TYPESCRIPT_NAME" : "打字稿名称:",
+        "FIELD_HEADER_TYPESCRIPT_PATH" : "打字稿路径:",
 
         "FIELD_OPTION_BACKSPACE_EMPTY" : "",
-        "FIELD_OPTION_BACKSPACE_8"     : "退格键（Ctrl-H）",
+        "FIELD_OPTION_BACKSPACE_8"     : "退格键(Ctrl-H)",
-        "FIELD_OPTION_BACKSPACE_127"   : "删除键（Ctrl-?）",
+        "FIELD_OPTION_BACKSPACE_127"   : "删除键(Ctrl-?)",
 
         "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "白底黑字",
         "FIELD_OPTION_COLOR_SCHEME_EMPTY"       : "",
@@ -538,6 +704,14 @@
         "FIELD_OPTION_FONT_SIZE_96"    : "96",
         "FIELD_OPTION_FONT_SIZE_EMPTY" : "",
 
+        "FIELD_OPTION_TERMINAL_TYPE_ANSI"           : "ansi",
+        "FIELD_OPTION_TERMINAL_TYPE_EMPTY"          : "",
+        "FIELD_OPTION_TERMINAL_TYPE_LINUX"          : "linux",
+        "FIELD_OPTION_TERMINAL_TYPE_VT100"          : "vt100",
+        "FIELD_OPTION_TERMINAL_TYPE_VT220"          : "vt220",
+        "FIELD_OPTION_TERMINAL_TYPE_XTERM"          : "xterm",
+        "FIELD_OPTION_TERMINAL_TYPE_XTERM_256COLOR" : "xterm-256color",
+	
         "NAME" : "Telnet",
 
         "SECTION_HEADER_AUTHENTICATION" : "认证",
@@ -559,6 +733,8 @@
         "FIELD_HEADER_CURSOR"           : "光标：",
         "FIELD_HEADER_DEST_HOST"        : "目标主机：",
         "FIELD_HEADER_DEST_PORT"        : "目标端口：",
+        "FIELD_HEADER_DISABLE_COPY"     : "禁用从远程桌面复制:",
+        "FIELD_HEADER_DISABLE_PASTE"    : "禁用从客户端粘贴:",
         "FIELD_HEADER_ENABLE_AUDIO"     : "启用音频：",
         "FIELD_HEADER_ENABLE_SFTP"      : "启用SFTP：",
         "FIELD_HEADER_HOSTNAME"         : "主机名：",
@@ -572,6 +748,7 @@
         "FIELD_HEADER_RECORDING_NAME" : "录像名：",
         "FIELD_HEADER_RECORDING_PATH" : "录像路径：",
         "FIELD_HEADER_SFTP_DIRECTORY"             : "缺省文件上传目录：",
+        "FIELD_HEADER_SFTP_HOST_KEY"              : "公钥(Base64):",
         "FIELD_HEADER_SFTP_HOSTNAME"              : "主机名：",
         "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive时间间隔：",
         "FIELD_HEADER_SFTP_PASSPHRASE"            : "口令：",
@@ -678,6 +855,7 @@
         "FIELD_HEADER_PASSWORD_OLD"       : "当前密码：",
         "FIELD_HEADER_PASSWORD_NEW"       : "新密码：",
         "FIELD_HEADER_PASSWORD_NEW_AGAIN" : "确认新密码：",
+        "FIELD_HEADER_TIMEZONE"           : "时区:",
         "FIELD_HEADER_USERNAME"           : "用户名：",
         
         "HELP_DEFAULT_INPUT_METHOD" : "缺省输入法决定了Guacamole如何接收键盘事件。当使用移动设备或使用IME输入时，有可能需要更改设置。本设置可在Guacamole菜单内被单个连接的设定覆盖。",
@@ -685,7 +863,7 @@
         "HELP_INPUT_METHOD_NONE"    : "@:CLIENT.HELP_INPUT_METHOD_NONE",
         "HELP_INPUT_METHOD_OSK"     : "@:CLIENT.HELP_INPUT_METHOD_OSK",
         "HELP_INPUT_METHOD_TEXT"    : "@:CLIENT.HELP_INPUT_METHOD_TEXT",
-        "HELP_LANGUAGE"             : "在下方列表中选择Guacamole界面所使用的语言。可选用的语言决定于系统安装了什么语言。",
+        "HELP_LOCALE"             : "以下选项与用户的语言环境有关，并将影响界面各部分的显示方式。",
         "HELP_MOUSE_MODE_ABSOLUTE"  : "@:CLIENT.HELP_MOUSE_MODE_ABSOLUTE",
         "HELP_MOUSE_MODE_RELATIVE"  : "@:CLIENT.HELP_MOUSE_MODE_RELATIVE",
         "HELP_UPDATE_PASSWORD"      : "如需改变密码，请在下面输入您的当前密码与希望使用的新密码，并点击“更新密码” 。密码的改动会立即生效。",
@@ -724,6 +902,25 @@
 
     },
     
+    "SETTINGS_USER_GROUPS" : {
+
+        "ACTION_ACKNOWLEDGE"    : "@:APP.ACTION_ACKNOWLEDGE",
+        "ACTION_NEW_USER_GROUP" : "新建用户组",
+
+        "DIALOG_HEADER_ERROR" : "@:APP.DIALOG_HEADER_ERROR",
+
+        "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
+
+        "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE",
+
+        "HELP_USER_GROUPS" : "单击或触摸下面的组以管理该组。 根据您的访问级别，可以添加和删除组，还可以更改其成员用户和用户组。",
+
+        "SECTION_HEADER_USER_GROUPS" : "用户组",
+
+        "TABLE_HEADER_USER_GROUP_NAME" : "用户组名称"
+
+    },
+    
     "SETTINGS_SESSIONS" : {
         
         "ACTION_ACKNOWLEDGE" : "@:APP.ACTION_ACKNOWLEDGE",
@@ -769,6 +966,7 @@
         "ACTION_MANAGE_SESSIONS"    : "@:APP.ACTION_MANAGE_SESSIONS",
         "ACTION_MANAGE_SETTINGS"    : "@:APP.ACTION_MANAGE_SETTINGS",
         "ACTION_MANAGE_USERS"       : "@:APP.ACTION_MANAGE_USERS",
+        "ACTION_MANAGE_USER_GROUPS" : "@:APP.ACTION_MANAGE_USER_GROUPS",
         "ACTION_NAVIGATE_HOME"      : "@:APP.ACTION_NAVIGATE_HOME",
         "ACTION_VIEW_HISTORY"       : "@:APP.ACTION_VIEW_HISTORY"