Merge branch 'master' into changeOwnPasswd

src/utils/i18n/en.json

@@ -438,5 +438,14 @@
   },
   "LastOnlineIp": {
     "One": "Last Online Ip"
+  },
+  "ConfirmPassword": {
+    "One": "Confirm Password"
+  },
+  "PasswordNotMatchConfirmPassword": {
+    "One": "Password not match Confirm Password"
+  },
+  "ToLogin": {
+    "One": "To Login"
   }
 }

src/utils/i18n/ko.json

@@ -424,5 +424,14 @@
   },
   "LastOnlineIp": {
     "One": "마지막 온라인 IP"
+  },
+  "ConfirmPassword": {
+    "One": "비밀번호 확인"
+  },
+  "PasswordNotMatchConfirmPassword": {
+    "One": "비밀번호가 확인 비밀번호와 일치하지 않습니다"
+  },
+  "ToLogin": {
+    "One": "로그인하려면 클릭하십시오"
   }
 }

src/utils/i18n/ru.json

@@ -438,6 +438,15 @@
   },
   "LastOnlineIp": {
     "One": "Последний IP онлайн"
+  },
+  "ConfirmPassword": {
+    "One": "Подтвердите пароль"
+  },
+  "PasswordNotMatchConfirmPassword": {
+    "One": "Пароль и подтверждение пароля не совпадают"
+  },
+  "ToLogin": {
+    "One": "Войти"
   }
 }
 

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": "去登录"
   }
 }