Merge 1.3.0 changes back to master.

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" : "请稍候，正在重定向到身份提供者..."
+    }
+
+}