Merge 1.3.0 changes back to master.

2025-09-06 13:17:41 +00:00 · 2020-12-16 07:08:33 -05:00
parent d762720571 f1783f5dc1
commit 3624ffe2fd
19 changed files with 466 additions and 38 deletions
--- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
+++ b/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"
    ]
-
 }
--- a/extensions/guacamole-auth-cas/src/main/resources/translations/zh.json
+++ b/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验证..."
+    }
+
+}
--- a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
+++ b/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" : [
--- a/extensions/guacamole-auth-duo/src/main/resources/translations/zh.json
+++ b/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进行身份验证。"
+    }
+
+}
--- 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
@@ -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" : "组限制"
+
+    }
+
+}
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
+++ b/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"
    ]

 }
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
+++ b/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"
    ]

 }
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
+++ b/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"
    ]

 }
--- a/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
+++ b/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"
    ]

 }
--- a/extensions/guacamole-auth-ldap/src/main/resources/translations/zh.json
+++ b/extensions/guacamole-auth-ldap/src/main/resources/translations/zh.json
@@ -0,0 +1,7 @@
+{
+
+    "DATA_SOURCE_LDAP" : {
+        "NAME" : "轻型目录访问协议"
+    }
+
+}
--- a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
+++ b/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" : [
--- a/extensions/guacamole-auth-openid/src/main/resources/translations/zh.json
+++ b/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" : "请稍候，正在重定向到身份提供者..."
+    }
+
+}
--- a/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
+++ b/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" : {
--- a/extensions/guacamole-auth-quickconnect/src/main/resources/translations/zh.json
+++ b/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"
+    }
+
+}
--- a/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
+++ b/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" : [
--- a/extensions/guacamole-auth-radius/src/main/resources/translations/zh.json
+++ b/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"                : ""
+    }
+
+}
--- a/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
+++ b/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" : [
--- a/extensions/guacamole-auth-totp/src/main/resources/translations/zh.json
+++ b/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" : "详情:"
+
+    }
+
+}