Merge branch 'master' into changeOwnPasswd

src/utils/i18n/zh_CN.json

@@ -428,8 +428,7 @@
   "LastOnlineIp": {
     "One": "最后在线IP"
   },
-  "or login in with" :
-  {
+  "or login in with": {
     "One": "或使用以下登陆"
   },
   "Optional, default is" :
@@ -450,7 +449,13 @@
   "New PassWD": {
     "One": "新密码"
   },
-  "ConformPassWD": {
+  "ConfirmPassword": {
     "One": "确认密码"
+  },
+  "PasswordNotMatchConfirmPassword": {
+    "One": "密码与确认密码不匹配"
+  },
+  "ToLogin": {
+    "One": "去登录"
   }
 }