You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2020/12/16 12:10:34 UTC
[guacamole-client] branch master updated (d762720 -> 3624ffe)
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from d762720 Merge 1.3.0 changes back to master.
add f7b53d3 GUACAMOLE-903: Improved Chinese internationalization support
add f1783f5 GUACAMOLE-903: Merge improved Chinese internationalization support
new 3624ffe Merge 1.3.0 changes back to master.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/resources/guac-manifest.json | 4 +-
.../src/main/resources/translations/zh.json | 12 +
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 13 ++
.../src/main/resources/translations/zh.json | 113 +++++++++
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 7 +
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 12 +
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 18 ++
.../src/main/resources/guac-manifest.json | 3 +-
.../resources/translations/{en.json => zh.json} | 2 +-
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 34 +++
guacamole/src/main/webapp/translations/zh.json | 252 ++++++++++++++++++---
19 files changed, 455 insertions(+), 39 deletions(-)
create mode 100644 extensions/guacamole-auth-cas/src/main/resources/translations/zh.json
create mode 100644 extensions/guacamole-auth-duo/src/main/resources/translations/zh.json
create mode 100644 extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/zh.json
create mode 100644 extensions/guacamole-auth-ldap/src/main/resources/translations/zh.json
create mode 100644 extensions/guacamole-auth-openid/src/main/resources/translations/zh.json
create mode 100644 extensions/guacamole-auth-quickconnect/src/main/resources/translations/zh.json
copy extensions/guacamole-auth-radius/src/main/resources/translations/{en.json => zh.json} (84%)
create mode 100644 extensions/guacamole-auth-totp/src/main/resources/translations/zh.json
[guacamole-client] 01/01: Merge 1.3.0 changes back to master.
Posted by vn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 3624ffe2fdde687578fb9e4cd19ad4aee1012256
Merge: d762720 f1783f5
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Wed Dec 16 07:08:33 2020 -0500
Merge 1.3.0 changes back to master.
.../src/main/resources/guac-manifest.json | 4 +-
.../src/main/resources/translations/zh.json | 12 +
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 13 ++
.../src/main/resources/translations/zh.json | 113 +++++++++
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 7 +
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 12 +
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 18 ++
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 12 +
.../src/main/resources/guac-manifest.json | 3 +-
.../src/main/resources/translations/zh.json | 34 +++
guacamole/src/main/webapp/translations/zh.json | 252 ++++++++++++++++++---
19 files changed, 466 insertions(+), 38 deletions(-)
diff --cc extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
index 2d2017a,fe44a2e..2ebf5d4
--- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
@@@ -13,10 -13,8 +13,10 @@@
"translations/ca.json",
"translations/de.json",
"translations/en.json",
+ "translations/fr.json",
"translations/ja.json",
+ "translations/pt.json",
- "translations/ru.json"
+ "translations/ru.json",
+ "translations/zh.json"
]
-
}
diff --cc extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
index 6769bad,44c7530..b2c9208
--- a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
@@@ -13,10 -13,9 +13,11 @@@
"translations/ca.json",
"translations/de.json",
"translations/en.json",
+ "translations/fr.json",
"translations/ja.json",
+ "translations/pt.json",
- "translations/ru.json"
+ "translations/ru.json",
+ "translations/zh.json"
],
"js" : [
diff --cc extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
index 201b680,6e9d72d..f3ea908
--- 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
@@@ -25,8 -25,8 +25,9 @@@
"translations/es.json",
"translations/fr.json",
"translations/ja.json",
+ "translations/pt.json",
- "translations/ru.json"
+ "translations/ru.json",
+ "translations/zh.json"
]
}
diff --cc extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
index 8bc54f2,707bbe5..312ad88
--- 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
@@@ -25,8 -25,8 +25,9 @@@
"translations/es.json",
"translations/fr.json",
"translations/ja.json",
+ "translations/pt.json",
- "translations/ru.json"
+ "translations/ru.json",
+ "translations/zh.json"
]
}
diff --cc extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
index bba5d22,17fc577..3c7c679
--- 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
@@@ -25,8 -25,8 +25,9 @@@
"translations/es.json",
"translations/fr.json",
"translations/ja.json",
+ "translations/pt.json",
- "translations/ru.json"
+ "translations/ru.json",
+ "translations/zh.json"
]
}
diff --cc extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
index 2056e02,60c6f77..9090d22
--- a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
@@@ -13,10 -13,9 +13,11 @@@
"translations/ca.json",
"translations/de.json",
"translations/en.json",
+ "translations/fr.json",
"translations/ja.json",
+ "translations/pt.json",
- "translations/ru.json"
+ "translations/ru.json",
+ "translations/zh.json"
],
"js" : [
diff --cc extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
index c825a72,62200b4..0e1a40d
--- a/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
@@@ -24,10 -24,9 +24,11 @@@
"translations/ca.json",
"translations/de.json",
"translations/en.json",
+ "translations/fr.json",
"translations/ja.json",
+ "translations/pt.json",
- "translations/ru.json"
+ "translations/ru.json",
+ "translations/zh.json"
],
"resources" : {
diff --cc extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
index 131df65,6256d57..23bdd66
--- a/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
@@@ -13,10 -13,9 +13,11 @@@
"translations/ca.json",
"translations/de.json",
"translations/en.json",
+ "translations/fr.json",
"translations/ja.json",
+ "translations/pt.json",
- "translations/ru.json"
+ "translations/ru.json",
+ "translations/zh.json"
],
"js" : [