Revert "fix: disable cookie for static files (#1656)"

This reverts commit 312412ffe4.

.github/workflows/build.yml

@@ -132,7 +132,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          fetch-depth: -1
+          fetch-depth: 0
       - name: Setup Node.js
         uses: actions/setup-node@v2
         with:
@@ -192,7 +192,6 @@ jobs:
         uses: docker/build-push-action@v3
         if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
         with:
-          context: .
           target: STANDARD
           platforms: linux/amd64,linux/arm64
           push: true
@@ -202,7 +201,6 @@ jobs:
         uses: docker/build-push-action@v3
         if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
         with:
-          context: .
           target: ALLINONE
           platforms: linux/amd64,linux/arm64
           push: true

Dockerfile

@@ -9,7 +9,7 @@ FROM golang:1.17.5 AS BACK
 WORKDIR /go/src/casdoor
 COPY . .
 RUN ./build.sh
-RUN go test -v -run TestGetVersionInfo ./util/system_test.go ./util/system.go > version_info.txt
+
 
 FROM alpine:latest AS STANDARD
 LABEL MAINTAINER="https://casdoor.org/"
@@ -34,7 +34,6 @@ WORKDIR /
 COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/server_${BUILDX_ARCH} ./server
 COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/swagger ./swagger
 COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/conf/app.conf ./conf/app.conf
-COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/version_info.txt ./go/src/casdoor/version_info.txt
 COPY --from=FRONT --chown=$USER:$USER /web/build ./web/build
 
 ENTRYPOINT ["/server"]
@@ -62,7 +61,6 @@ COPY --from=BACK /go/src/casdoor/server_${BUILDX_ARCH} ./server
 COPY --from=BACK /go/src/casdoor/swagger ./swagger
 COPY --from=BACK /go/src/casdoor/docker-entrypoint.sh /docker-entrypoint.sh
 COPY --from=BACK /go/src/casdoor/conf/app.conf ./conf/app.conf
-COPY --from=BACK /go/src/casdoor/version_info.txt ./go/src/casdoor/version_info.txt
 COPY --from=FRONT /web/build ./web/build
 
 ENTRYPOINT ["/bin/bash"]

authz/authz.go

@@ -87,7 +87,6 @@ p, *, *, POST, /api/logout, *, *
 p, *, *, GET, /api/logout, *, *
 p, *, *, GET, /api/get-account, *, *
 p, *, *, GET, /api/userinfo, *, *
-p, *, *, GET, /api/user, *, *
 p, *, *, POST, /api/webhook, *, *
 p, *, *, GET, /api/get-webhook-event, *, *
 p, *, *, *, /api/login/oauth, *, *

conf/app.conf

@@ -20,5 +20,5 @@ staticBaseUrl = "https://cdn.casbin.org"
 isDemoMode = false
 batchSize = 100
 ldapServerPort = 389
-languages = en,zh,es,fr,de,id,ja,ko,ru,vi
+languages = en,zh,es,fr,de,ja,ko,ru,vi
 quota = {"organization": -1, "user": -1, "application": -1, "provider": -1}

controllers/account.go

@@ -50,7 +50,6 @@ type RequestForm struct {
 	Region       string `json:"region"`
 
 	Application string `json:"application"`
-	ClientId    string `json:"clientId"`
 	Provider    string `json:"provider"`
 	Code        string `json:"code"`
 	State       string `json:"state"`
@@ -104,7 +103,7 @@ type Captcha struct {
 // @router /signup [post]
 func (c *ApiController) Signup() {
 	if c.GetSessionUsername() != "" {
-		c.ResponseError(c.T("account:Please sign out first"), c.GetSessionUsername())
+		c.ResponseError(c.T("account:Please sign out first before signing up"), c.GetSessionUsername())
 		return
 	}
 
@@ -212,7 +211,7 @@ func (c *ApiController) Signup() {
 
 	affected := object.AddUser(user)
 	if !affected {
-		c.ResponseError(c.T("account:Failed to add user"), util.StructToJson(user))
+		c.ResponseError(c.T("account:Invalid information"), util.StructToJson(user))
 		return
 	}
 
@@ -370,43 +369,6 @@ func (c *ApiController) GetUserinfo() {
 	c.ServeJSON()
 }
 
-// GetUserinfo2
-// LaravelResponse
-// @Title UserInfo2
-// @Tag Account API
-// @Description return Laravel compatible user information according to OAuth 2.0
-// @Success 200 {object} LaravelResponse The Response object
-// @router /user [get]
-func (c *ApiController) GetUserinfo2() {
-	user, ok := c.RequireSignedInUser()
-	if !ok {
-		return
-	}
-
-	// this API is used by "Api URL" of Flarum's FoF Passport plugin
-	// https://github.com/FriendsOfFlarum/passport
-	type LaravelResponse struct {
-		Id              string `json:"id"`
-		Name            string `json:"name"`
-		Email           string `json:"email"`
-		EmailVerifiedAt string `json:"email_verified_at"`
-		CreatedAt       string `json:"created_at"`
-		UpdatedAt       string `json:"updated_at"`
-	}
-
-	response := LaravelResponse{
-		Id:              user.Id,
-		Name:            user.Name,
-		Email:           user.Email,
-		EmailVerifiedAt: user.CreatedTime,
-		CreatedAt:       user.CreatedTime,
-		UpdatedAt:       user.UpdatedTime,
-	}
-
-	c.Data["json"] = response
-	c.ServeJSON()
-}
-
 // GetCaptcha ...
 // @Tag Login API
 // @Title GetCaptcha

controllers/auth.go

@@ -237,7 +237,7 @@ func (c *ApiController) Login() {
 	if form.Username != "" {
 		if form.Type == ResponseTypeLogin {
 			if c.GetSessionUsername() != "" {
-				c.ResponseError(c.T("account:Please sign out first"), c.GetSessionUsername())
+				c.ResponseError(c.T("account:Please sign out first before signing in"), c.GetSessionUsername())
 				return
 			}
 		}
@@ -308,7 +308,7 @@ func (c *ApiController) Login() {
 				}
 
 				if !isHuman {
-					c.ResponseError(c.T("verification:Turing test failed."))
+					c.ResponseError(c.T("auth:Turing test failed."))
 					return
 				}
 			}
@@ -334,13 +334,7 @@ func (c *ApiController) Login() {
 			util.SafeGoroutine(func() { object.AddRecord(record) })
 		}
 	} else if form.Provider != "" {
-		var application *object.Application
-		if form.ClientId != "" {
-			application = object.GetApplicationByClientId(form.ClientId)
-		} else {
-			application = object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
-		}
-
+		application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
 		if application == nil {
 			c.ResponseError(fmt.Sprintf(c.T("auth:The application: %s does not exist"), form.Application))
 			return
@@ -374,7 +368,7 @@ func (c *ApiController) Login() {
 
 			idProvider := idp.GetIdProvider(provider.Type, provider.SubType, clientId, clientSecret, provider.AppId, form.RedirectUri, provider.Domain, provider.CustomAuthUrl, provider.CustomTokenUrl, provider.CustomUserInfoUrl)
 			if idProvider == nil {
-				c.ResponseError(fmt.Sprintf(c.T("storage:The provider type: %s is not supported"), provider.Type))
+				c.ResponseError(fmt.Sprintf(c.T("auth:The provider type: %s is not supported"), provider.Type))
 				return
 			}
 
@@ -416,7 +410,7 @@ func (c *ApiController) Login() {
 				// Sign in via OAuth (want to sign up but already have account)
 
 				if user.IsForbidden {
-					c.ResponseError(c.T("check:The user is forbidden to sign in, please contact the administrator"))
+					c.ResponseError(c.T("auth:The user is forbidden to sign in, please contact the administrator"))
 				}
 
 				resp = c.HandleLoggedIn(application, user, &form)

controllers/resource.go

@@ -195,7 +195,7 @@ func (c *ApiController) UploadResource() {
 		}
 	}
 
-	fileUrl, objectKey, err := object.UploadFileSafe(provider, fullFilePath, fileBuffer, c.GetAcceptLanguage())
+	fileUrl, objectKey, err := object.UploadFileSafe(provider, fullFilePath, fileBuffer)
 	if err != nil {
 		c.ResponseError(err.Error())
 		return

controllers/system_info.go

@@ -48,14 +48,9 @@ func (c *ApiController) GetSystemInfo() {
 // @router /get-version-info [get]
 func (c *ApiController) GetVersionInfo() {
 	versionInfo, err := util.GetVersionInfo()
-
-	if versionInfo.Version == "" {
-		versionInfo, err = util.GetVersionInfoFromFile()
-
-		if err != nil {
-			c.ResponseError(err.Error())
-			return
-		}
+	if err != nil {
+		c.ResponseError(err.Error())
+		return
 	}
 
 	c.ResponseOk(versionInfo)

controllers/verification.go

@@ -96,7 +96,7 @@ func (c *ApiController) SendVerificationCode() {
 	application := object.GetApplication(applicationId)
 	organization := object.GetOrganization(util.GetId(application.Owner, application.Organization))
 	if organization == nil {
-		c.ResponseError(c.T("check:Organization does not exist"))
+		c.ResponseError(c.T("verification:Organization does not exist"))
 		return
 	}
 
@@ -112,7 +112,7 @@ func (c *ApiController) SendVerificationCode() {
 	switch destType {
 	case "email":
 		if !util.IsEmailValid(dest) {
-			c.ResponseError(c.T("check:Email is invalid"))
+			c.ResponseError(c.T("verification:Email is invalid"))
 			return
 		}
 

i18n/generate.go

@@ -99,7 +99,7 @@ func getAllFilePathsInFolder(folder string, fileSuffix string) []string {
 	return res
 }
 
-func parseAllWords(category string) *I18nData {
+func parseEnData(category string) *I18nData {
 	var paths []string
 	if category == "backend" {
 		paths = getAllFilePathsInFolder("../", ".go")
@@ -136,11 +136,3 @@ func parseAllWords(category string) *I18nData {
 
 	return &data
 }
-
-func applyToOtherLanguage(category string, language string, newData *I18nData) {
-	oldData := readI18nFile(category, language)
-	println(oldData)
-
-	applyData(newData, oldData)
-	writeI18nFile(category, language, newData)
-}

i18n/generate_test.go

@@ -17,34 +17,42 @@
 
 package i18n
 
-import "testing"
+import (
+	"testing"
+)
+
+func applyToOtherLanguage(category string, language string, i18nData *I18nData) {
+	newData := readI18nFile(category, language)
+	println(newData)
+
+	applyData(i18nData, newData)
+	writeI18nFile(category, language, i18nData)
+}
 
 func TestGenerateI18nFrontend(t *testing.T) {
-	data := parseAllWords("frontend")
+	enData := parseEnData("frontend")
+	writeI18nFile("frontend", "en", enData)
 
-	applyToOtherLanguage("frontend", "en", data)
-	applyToOtherLanguage("frontend", "zh", data)
-	applyToOtherLanguage("frontend", "es", data)
-	applyToOtherLanguage("frontend", "fr", data)
-	applyToOtherLanguage("frontend", "de", data)
-	applyToOtherLanguage("frontend", "id", data)
-	applyToOtherLanguage("frontend", "ja", data)
-	applyToOtherLanguage("frontend", "ko", data)
-	applyToOtherLanguage("frontend", "ru", data)
-	applyToOtherLanguage("frontend", "vi", data)
+	applyToOtherLanguage("frontend", "zh", enData)
+	applyToOtherLanguage("frontend", "es", enData)
+	applyToOtherLanguage("frontend", "fr", enData)
+	applyToOtherLanguage("frontend", "de", enData)
+	applyToOtherLanguage("frontend", "ja", enData)
+	applyToOtherLanguage("frontend", "ko", enData)
+	applyToOtherLanguage("frontend", "ru", enData)
+	applyToOtherLanguage("frontend", "vi", enData)
 }
 
 func TestGenerateI18nBackend(t *testing.T) {
-	data := parseAllWords("backend")
+	enData := parseEnData("backend")
+	writeI18nFile("backend", "en", enData)
 
-	applyToOtherLanguage("backend", "en", data)
-	applyToOtherLanguage("backend", "zh", data)
-	applyToOtherLanguage("backend", "es", data)
-	applyToOtherLanguage("backend", "fr", data)
-	applyToOtherLanguage("backend", "de", data)
-	applyToOtherLanguage("backend", "id", data)
-	applyToOtherLanguage("backend", "ja", data)
-	applyToOtherLanguage("backend", "ko", data)
-	applyToOtherLanguage("backend", "ru", data)
-	applyToOtherLanguage("backend", "vi", data)
+	applyToOtherLanguage("backend", "zh", enData)
+	applyToOtherLanguage("backend", "es", enData)
+	applyToOtherLanguage("backend", "fr", enData)
+	applyToOtherLanguage("backend", "de", enData)
+	applyToOtherLanguage("backend", "ja", enData)
+	applyToOtherLanguage("backend", "ko", enData)
+	applyToOtherLanguage("backend", "ru", enData)
+	applyToOtherLanguage("backend", "vi", enData)
 }

i18n/locales/de/data.json

@@ -1,140 +1,146 @@
 {
   "account": {
-    "Failed to add user": "Konnte den Benutzer nicht hinzufügen",
-    "Get init score failed, error: %w": "Init-Score konnte nicht abgerufen werden, Fehler: %w",
-    "Please sign out first": "Bitte melden Sie sich zuerst ab",
-    "The application does not allow to sign up new account": "Die Anwendung erlaubt es nicht, sich für ein neues Konto anzumelden"
+    "Get init score failed, error: %w": "Get init score failed, error: %w",
+    "Invalid information": "Invalid information",
+    "Please sign out first before signing in": "Please sign out first before signing in",
+    "Please sign out first before signing up": "Please sign out first before signing up",
+    "The application does not allow to sign up new account": "The application does not allow to sign up new account"
   },
   "auth": {
-    "Challenge method should be S256": "Die Challenge-Methode sollte S256 sein",
-    "Failed to create user, user information is invalid: %s": "Es konnte kein Benutzer erstellt werden, da die Benutzerinformationen ungültig sind: %s",
-    "Failed to login in: %s": "Konnte nicht anmelden: %s",
-    "Invalid token": "Ungültiges Token",
-    "State expected: %s, but got: %s": "Erwarteter Zustand: %s, aber erhalten: %s",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "Das Konto für den Anbieter: %s und Benutzernamen: %s (%s) existiert nicht und darf nicht über %%s als neues Konto erstellt werden. Bitte nutzen Sie einen anderen Weg, um sich anzumelden",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "Das Konto für den Anbieter %s und Benutzernamen %s (%s) existiert nicht und es ist nicht erlaubt, ein neues Konto anzumelden. Bitte wenden Sie sich an Ihren IT-Support",
-    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "Das Konto für den Anbieter %s und Benutzernamen %s (%s) ist bereits mit einem anderen Konto verknüpft: %s (%s)",
-    "The application: %s does not exist": "Die Anwendung: %s existiert nicht",
-    "The login method: login with password is not enabled for the application": "Die Anmeldeart \"Anmeldung mit Passwort\" ist für die Anwendung nicht aktiviert",
-    "The provider: %s is not enabled for the application": "Der Anbieter: %s ist nicht für die Anwendung aktiviert",
-    "Unauthorized operation": "Nicht autorisierte Operation",
-    "Unknown authentication type (not password or provider), form = %s": "Unbekannter Authentifizierungstyp (nicht Passwort oder Anbieter), Formular = %s"
+    "Challenge method should be S256": "Challenge method should be S256",
+    "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
+    "Failed to login in: %s": "Failed to login in: %s",
+    "Invalid token": "Invalid token",
+    "State expected: %s, but got: %s": "State expected: %s, but got: %s",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
+    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
+    "The application: %s does not exist": "The application: %s does not exist",
+    "The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
+    "The provider type: %s is not supported": "The provider type: %s is not supported",
+    "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "Turing test failed.": "Turing test failed.",
+    "Unauthorized operation": "Unauthorized operation",
+    "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
   },
   "cas": {
-    "Service %s and %s do not match": "Service %s und %s stimmen nicht überein"
+    "Service %s and %s do not match": "Service %s and %s do not match"
   },
   "check": {
-    "Affiliation cannot be blank": "Zugehörigkeit darf nicht leer sein",
-    "DisplayName cannot be blank": "Anzeigename kann nicht leer sein",
-    "DisplayName is not valid real name": "DisplayName ist kein gültiger Vorname",
-    "Email already exists": "E-Mail existiert bereits",
-    "Email cannot be empty": "E-Mail darf nicht leer sein",
-    "Email is invalid": "E-Mail ist ungültig",
-    "Empty username.": "Leerer Benutzername.",
-    "FirstName cannot be blank": "Vorname darf nicht leer sein",
-    "LastName cannot be blank": "Nachname darf nicht leer sein",
-    "Ldap user name or password incorrect": "Ldap Benutzername oder Passwort falsch",
-    "Multiple accounts with same uid, please check your ldap server": "Mehrere Konten mit derselben uid, bitte überprüfen Sie Ihren LDAP-Server",
-    "Organization does not exist": "Organisation existiert nicht",
-    "Password must have at least 6 characters": "Das Passwort muss mindestens 6 Zeichen enthalten",
-    "Phone already exists": "Telefon existiert bereits",
-    "Phone cannot be empty": "Das Telefon darf nicht leer sein",
-    "Phone number is invalid": "Die Telefonnummer ist ungültig",
-    "Session outdated, please login again": "Sitzung abgelaufen, bitte erneut anmelden",
-    "The user is forbidden to sign in, please contact the administrator": "Dem Benutzer ist der Zugang verboten, bitte kontaktieren Sie den Administrator",
-    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "Der Benutzername darf nur alphanumerische Zeichen, Unterstriche oder Bindestriche enthalten, keine aufeinanderfolgenden Bindestriche oder Unterstriche haben und darf nicht mit einem Bindestrich oder Unterstrich beginnen oder enden.",
-    "Username already exists": "Benutzername existiert bereits",
-    "Username cannot be an email address": "Benutzername kann keine E-Mail-Adresse sein",
-    "Username cannot contain white spaces": "Benutzername darf keine Leerzeichen enthalten",
-    "Username cannot start with a digit": "Benutzername darf nicht mit einer Ziffer beginnen",
-    "Username is too long (maximum is 39 characters).": "Benutzername ist zu lang (das Maximum beträgt 39 Zeichen).",
+    "Affiliation cannot be blank": "Affiliation cannot be blank",
+    "DisplayName cannot be blank": "DisplayName cannot be blank",
+    "DisplayName is not valid real name": "DisplayName is not valid real name",
+    "Email already exists": "Email already exists",
+    "Email cannot be empty": "Email cannot be empty",
+    "Email is invalid": "Email is invalid",
+    "Empty username.": "Empty username.",
+    "FirstName cannot be blank": "FirstName cannot be blank",
+    "LastName cannot be blank": "LastName cannot be blank",
+    "Ldap user name or password incorrect": "Ldap user name or password incorrect",
+    "Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
+    "Organization does not exist": "Organization does not exist",
+    "Password must have at least 6 characters": "Password must have at least 6 characters",
+    "Phone already exists": "Phone already exists",
+    "Phone cannot be empty": "Phone cannot be empty",
+    "Phone number is invalid": "Phone number is invalid",
+    "Session outdated, please login again": "Session outdated, please login again",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
+    "Username already exists": "Username already exists",
+    "Username cannot be an email address": "Username cannot be an email address",
+    "Username cannot contain white spaces": "Username cannot contain white spaces",
+    "Username cannot start with a digit": "Username cannot start with a digit",
+    "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
     "Username must have at least 2 characters": "Benutzername muss mindestens 2 Zeichen lang sein",
-    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "Sie haben zu oft das falsche Passwort oder den falschen Code eingegeben. Bitte warten Sie %d Minuten und versuchen Sie es erneut",
-    "Your region is not allow to signup by phone": "Ihre Region ist nicht berechtigt, sich telefonisch anzumelden",
-    "password or code is incorrect, you have %d remaining chances": "Das Passwort oder der Code ist falsch. Du hast noch %d Versuche übrig",
-    "unsupported password type: %s": "Nicht unterstützter Passworttyp: %s"
+    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
+    "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
+    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "unsupported password type: %s": "unsupported password type: %s"
   },
   "general": {
-    "Missing parameter": "Fehlender Parameter",
-    "Please login first": "Bitte zuerst einloggen",
-    "The user: %s doesn't exist": "Der Benutzer %s existiert nicht",
-    "don't support captchaProvider: ": "Unterstütze captchaProvider nicht:"
+    "Missing parameter": "Missing parameter",
+    "Please login first": "Please login first",
+    "The user: %s doesn't exist": "The user: %s doesn't exist",
+    "don't support captchaProvider: ": "don't support captchaProvider: "
   },
   "ldap": {
-    "Ldap server exist": "Es gibt einen LDAP-Server"
+    "Ldap server exist": "Ldap server exist"
   },
   "link": {
-    "Please link first": "Bitte verlinken Sie zuerst",
-    "This application has no providers": "Diese Anwendung hat keine Anbieter",
-    "This application has no providers of type": "Diese Anwendung hat keine Anbieter des Typs",
-    "This provider can't be unlinked": "Dieser Anbieter kann nicht entkoppelt werden",
-    "You are not the global admin, you can't unlink other users": "Sie sind nicht der globale Administrator, Sie können keine anderen Benutzer trennen",
-    "You can't unlink yourself, you are not a member of any application": "Du kannst dich nicht abmelden, du bist kein Mitglied einer Anwendung"
+    "Please link first": "Please link first",
+    "This application has no providers": "This application has no providers",
+    "This application has no providers of type": "This application has no providers of type",
+    "This provider can't be unlinked": "This provider can't be unlinked",
+    "You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
+    "You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
   },
   "organization": {
-    "Only admin can modify the %s.": "Nur der Administrator kann das %s ändern.",
-    "The %s is immutable.": "Das %s ist unveränderlich.",
-    "Unknown modify rule %s.": "Unbekannte Änderungsregel %s."
+    "Only admin can modify the %s.": "Only admin can modify the %s.",
+    "The %s is immutable.": "The %s is immutable.",
+    "Unknown modify rule %s.": "Unknown modify rule %s."
   },
   "provider": {
-    "Invalid application id": "Ungültige Anwendungs-ID",
-    "the provider: %s does not exist": "Der Anbieter %s existiert nicht"
+    "Invalid application id": "Invalid application id",
+    "the provider: %s does not exist": "the provider: %s does not exist"
   },
   "resource": {
-    "User is nil for tag: avatar": "Benutzer ist null für Tag: Avatar",
-    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Benutzername oder vollständiger Dateipfad sind leer: Benutzername = %s, vollständiger Dateipfad = %s"
+    "User is nil for tag: avatar": "User is nil for tag: avatar",
+    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
   },
   "saml": {
-    "Application %s not found": "Anwendung %s wurde nicht gefunden"
+    "Application %s not found": "Application %s not found"
   },
   "saml_sp": {
-    "provider %s's category is not SAML": "Der Anbieter %s ist keine Kategorie von SAML"
+    "provider %s's category is not SAML": "provider %s's category is not SAML"
   },
   "service": {
-    "Empty parameters for emailForm: %v": "Leere Parameter für Email-Formular: %v",
-    "Invalid Email receivers: %s": "Ungültige E-Mail-Empfänger: %s",
-    "Invalid phone receivers: %s": "Ungültige Telefonempfänger: %s"
+    "Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
+    "Invalid Email receivers: %s": "Invalid Email receivers: %s",
+    "Invalid phone receivers: %s": "Invalid phone receivers: %s"
   },
   "storage": {
-    "The objectKey: %s is not allowed": "Der Objektschlüssel %s ist nicht erlaubt",
-    "The provider type: %s is not supported": "Der Anbieter-Typ %s wird nicht unterstützt"
+    "The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
+    "The provider type: %s is not supported": "The provider type: %s is not supported"
   },
   "token": {
-    "Empty clientId or clientSecret": "Leerer clientId oder clientSecret",
-    "Grant_type: %s is not supported in this application": "Grant_type: %s wird von dieser Anwendung nicht unterstützt",
-    "Invalid application or wrong clientSecret": "Ungültige Anwendung oder falsches clientSecret",
-    "Invalid client_id": "Ungültige client_id",
-    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Weiterleitungs-URI: %s ist nicht in der Liste erlaubter Weiterleitungs-URIs vorhanden",
-    "Token not found, invalid accessToken": "Token nicht gefunden, ungültiger Zugriffs-Token"
+    "Empty clientId or clientSecret": "Empty clientId or clientSecret",
+    "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
+    "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
+    "Invalid client_id": "Invalid client_id",
+    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
+    "Token not found, invalid accessToken": "Token not found, invalid accessToken"
   },
   "user": {
-    "Display name cannot be empty": "Anzeigename darf nicht leer sein",
-    "New password cannot contain blank space.": "Das neue Passwort darf keine Leerzeichen enthalten.",
-    "New password must have at least 6 characters": "Das neue Passwort muss mindestens 6 Zeichen haben"
+    "Display name cannot be empty": "Display name cannot be empty",
+    "New password cannot contain blank space.": "New password cannot contain blank space.",
+    "New password must have at least 6 characters": "New password must have at least 6 characters"
   },
   "user_upload": {
-    "Failed to import users": "Fehler beim Importieren von Benutzern"
+    "Failed to import users": "Failed to import users"
   },
   "util": {
-    "No application is found for userId: %s": "Es wurde keine Anwendung für die Benutzer-ID gefunden: %s",
-    "No provider for category: %s is found for application: %s": "Kein Anbieter für die Kategorie %s gefunden für die Anwendung: %s",
-    "The provider: %s is not found": "Der Anbieter: %s wurde nicht gefunden"
+    "No application is found for userId: %s": "No application is found for userId: %s",
+    "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
+    "The provider: %s is not found": "The provider: %s is not found"
   },
   "verification": {
-    "Code has not been sent yet!": "Der Code wurde noch nicht versendet!",
-    "Invalid captcha provider.": "Ungültiger Captcha-Anbieter.",
-    "Phone number is invalid in your region %s": "Die Telefonnummer ist in Ihrer Region %s ungültig",
-    "Turing test failed.": "Turing-Test fehlgeschlagen.",
-    "Unable to get the email modify rule.": "Nicht in der Lage, die E-Mail-Änderungsregel zu erhalten.",
-    "Unable to get the phone modify rule.": "Nicht in der Lage, die Telefon-Änderungsregel zu erhalten.",
-    "Unknown type": "Unbekannter Typ",
-    "Wrong parameter": "Falscher Parameter",
-    "Wrong verification code!": "Falscher Bestätigungscode!",
-    "You should verify your code in %d min!": "Du solltest deinen Code in %d Minuten verifizieren!",
-    "the user does not exist, please sign up first": "Der Benutzer existiert nicht, bitte zuerst anmelden"
+    "Code has not been sent yet!": "Code has not been sent yet!",
+    "Email is invalid": "Email is invalid",
+    "Invalid captcha provider.": "Invalid captcha provider.",
+    "Organization does not exist": "Organization does not exist",
+    "Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
+    "Turing test failed.": "Turing test failed.",
+    "Unable to get the email modify rule.": "Unable to get the email modify rule.",
+    "Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
+    "Unknown type": "Unknown type",
+    "Wrong parameter": "Wrong parameter",
+    "Wrong verification code!": "Wrong verification code!",
+    "You should verify your code in %d min!": "You should verify your code in %d min!",
+    "the user does not exist, please sign up first": "the user does not exist, please sign up first"
   },
   "webauthn": {
-    "Found no credentials for this user": "Es wurden keine Anmeldeinformationen für diesen Benutzer gefunden",
-    "Please call WebAuthnSigninBegin first": "Bitte rufen Sie zuerst WebAuthnSigninBegin auf"
+    "Found no credentials for this user": "Found no credentials for this user",
+    "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
   }
 }

i18n/locales/en/data.json

@@ -1,8 +1,9 @@
 {
   "account": {
-    "Failed to add user": "Failed to add user",
     "Get init score failed, error: %w": "Get init score failed, error: %w",
-    "Please sign out first": "Please sign out first",
+    "Invalid information": "Invalid information",
+    "Please sign out first before signing in": "Please sign out first before signing in",
+    "Please sign out first before signing up": "Please sign out first before signing up",
     "The application does not allow to sign up new account": "The application does not allow to sign up new account"
   },
   "auth": {
@@ -16,7 +17,10 @@
     "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
     "The application: %s does not exist": "The application: %s does not exist",
     "The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
+    "The provider type: %s is not supported": "The provider type: %s is not supported",
     "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "Turing test failed.": "Turing test failed.",
     "Unauthorized operation": "Unauthorized operation",
     "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
   },
@@ -122,7 +126,9 @@
   },
   "verification": {
     "Code has not been sent yet!": "Code has not been sent yet!",
+    "Email is invalid": "Email is invalid",
     "Invalid captcha provider.": "Invalid captcha provider.",
+    "Organization does not exist": "Organization does not exist",
     "Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
     "Turing test failed.": "Turing test failed.",
     "Unable to get the email modify rule.": "Unable to get the email modify rule.",

i18n/locales/es/data.json

@@ -1,140 +1,146 @@
 {
   "account": {
-    "Failed to add user": "No se pudo agregar el usuario",
-    "Get init score failed, error: %w": "Error al obtener el puntaje de inicio, error: %w",
-    "Please sign out first": "Por favor, cierra sesión primero",
-    "The application does not allow to sign up new account": "La aplicación no permite registrarse con una cuenta nueva"
+    "Get init score failed, error: %w": "Get init score failed, error: %w",
+    "Invalid information": "Invalid information",
+    "Please sign out first before signing in": "Please sign out first before signing in",
+    "Please sign out first before signing up": "Please sign out first before signing up",
+    "The application does not allow to sign up new account": "The application does not allow to sign up new account"
   },
   "auth": {
-    "Challenge method should be S256": "El método de desafío debe ser S256",
-    "Failed to create user, user information is invalid: %s": "No se pudo crear el usuario, la información del usuario es inválida: %s",
-    "Failed to login in: %s": "No se ha podido iniciar sesión en: %s",
-    "Invalid token": "Token inválido",
-    "State expected: %s, but got: %s": "Estado esperado: %s, pero se obtuvo: %s",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "La cuenta para el proveedor: %s y nombre de usuario: %s (%s) no existe y no está permitido registrarse como una cuenta nueva a través de %%s, por favor use otro método para registrarse",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "La cuenta para el proveedor: %s y el nombre de usuario: %s (%s) no existe y no se permite registrarse como una nueva cuenta, por favor contacte a su soporte de TI",
-    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "La cuenta para proveedor: %s y nombre de usuario: %s (%s) ya está vinculada a otra cuenta: %s (%s)",
-    "The application: %s does not exist": "La aplicación: %s no existe",
-    "The login method: login with password is not enabled for the application": "El método de inicio de sesión: inicio de sesión con contraseña no está habilitado para la aplicación",
-    "The provider: %s is not enabled for the application": "El proveedor: %s no está habilitado para la aplicación",
-    "Unauthorized operation": "Operación no autorizada",
-    "Unknown authentication type (not password or provider), form = %s": "Tipo de autenticación desconocido (no es contraseña o proveedor), formulario = %s"
+    "Challenge method should be S256": "Challenge method should be S256",
+    "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
+    "Failed to login in: %s": "Failed to login in: %s",
+    "Invalid token": "Invalid token",
+    "State expected: %s, but got: %s": "State expected: %s, but got: %s",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
+    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
+    "The application: %s does not exist": "The application: %s does not exist",
+    "The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
+    "The provider type: %s is not supported": "The provider type: %s is not supported",
+    "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "Turing test failed.": "Turing test failed.",
+    "Unauthorized operation": "Unauthorized operation",
+    "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
   },
   "cas": {
-    "Service %s and %s do not match": "Los servicios %s y %s no coinciden"
+    "Service %s and %s do not match": "Service %s and %s do not match"
   },
   "check": {
-    "Affiliation cannot be blank": "Afiliación no puede estar en blanco",
-    "DisplayName cannot be blank": "El nombre de visualización no puede estar en blanco",
-    "DisplayName is not valid real name": "El nombre de pantalla no es un nombre real válido",
-    "Email already exists": "El correo electrónico ya existe",
-    "Email cannot be empty": "El correo electrónico no puede estar vacío",
-    "Email is invalid": "El correo electrónico no es válido",
-    "Empty username.": "Nombre de usuario vacío.",
-    "FirstName cannot be blank": "El nombre no puede estar en blanco",
-    "LastName cannot be blank": "El apellido no puede estar en blanco",
-    "Ldap user name or password incorrect": "Nombre de usuario o contraseña de Ldap incorrectos",
-    "Multiple accounts with same uid, please check your ldap server": "Cuentas múltiples con el mismo uid, por favor revise su servidor ldap",
-    "Organization does not exist": "La organización no existe",
-    "Password must have at least 6 characters": "La contraseña debe tener al menos 6 caracteres",
-    "Phone already exists": "El teléfono ya existe",
-    "Phone cannot be empty": "Teléfono no puede estar vacío",
-    "Phone number is invalid": "El número de teléfono no es válido",
-    "Session outdated, please login again": "Sesión expirada, por favor vuelva a iniciar sesión",
-    "The user is forbidden to sign in, please contact the administrator": "El usuario no está autorizado a iniciar sesión, por favor contacte al administrador",
-    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "El nombre de usuario solo puede contener caracteres alfanuméricos, guiones bajos o guiones, no puede tener guiones o subrayados consecutivos, y no puede comenzar ni terminar con un guión o subrayado.",
-    "Username already exists": "El nombre de usuario ya existe",
-    "Username cannot be an email address": "Nombre de usuario no puede ser una dirección de correo electrónico",
-    "Username cannot contain white spaces": "Nombre de usuario no puede contener espacios en blanco",
-    "Username cannot start with a digit": "El nombre de usuario no puede empezar con un dígito",
-    "Username is too long (maximum is 39 characters).": "El nombre de usuario es demasiado largo (el máximo es de 39 caracteres).",
-    "Username must have at least 2 characters": "Nombre de usuario debe tener al menos 2 caracteres",
-    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "Has ingresado la contraseña o código incorrecto demasiadas veces, por favor espera %d minutos e intenta de nuevo",
-    "Your region is not allow to signup by phone": "Tu región no está permitida para registrarse por teléfono",
-    "password or code is incorrect, you have %d remaining chances": "Contraseña o código incorrecto, tienes %d intentos restantes",
-    "unsupported password type: %s": "Tipo de contraseña no compatible: %s"
+    "Affiliation cannot be blank": "Affiliation cannot be blank",
+    "DisplayName cannot be blank": "DisplayName cannot be blank",
+    "DisplayName is not valid real name": "DisplayName is not valid real name",
+    "Email already exists": "Email already exists",
+    "Email cannot be empty": "Email cannot be empty",
+    "Email is invalid": "Email is invalid",
+    "Empty username.": "Empty username.",
+    "FirstName cannot be blank": "FirstName cannot be blank",
+    "LastName cannot be blank": "LastName cannot be blank",
+    "Ldap user name or password incorrect": "Ldap user name or password incorrect",
+    "Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
+    "Organization does not exist": "Organization does not exist",
+    "Password must have at least 6 characters": "Password must have at least 6 characters",
+    "Phone already exists": "Phone already exists",
+    "Phone cannot be empty": "Phone cannot be empty",
+    "Phone number is invalid": "Phone number is invalid",
+    "Session outdated, please login again": "Session outdated, please login again",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
+    "Username already exists": "Username already exists",
+    "Username cannot be an email address": "Username cannot be an email address",
+    "Username cannot contain white spaces": "Username cannot contain white spaces",
+    "Username cannot start with a digit": "Username cannot start with a digit",
+    "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
+    "Username must have at least 2 characters": "Username must have at least 2 characters",
+    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
+    "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
+    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "unsupported password type: %s": "unsupported password type: %s"
   },
   "general": {
-    "Missing parameter": "Parámetro faltante",
-    "Please login first": "Por favor, inicia sesión primero",
-    "The user: %s doesn't exist": "El usuario: %s no existe",
-    "don't support captchaProvider: ": "No apoyo a captchaProvider"
+    "Missing parameter": "Missing parameter",
+    "Please login first": "Please login first",
+    "The user: %s doesn't exist": "The user: %s doesn't exist",
+    "don't support captchaProvider: ": "don't support captchaProvider: "
   },
   "ldap": {
-    "Ldap server exist": "El servidor LDAP existe"
+    "Ldap server exist": "Ldap server exist"
   },
   "link": {
-    "Please link first": "Por favor, enlaza primero",
-    "This application has no providers": "Esta aplicación no tiene proveedores",
-    "This application has no providers of type": "Esta aplicación no tiene proveedores del tipo",
-    "This provider can't be unlinked": "Este proveedor no se puede desvincular",
-    "You are not the global admin, you can't unlink other users": "No eres el administrador global, no puedes desvincular a otros usuarios",
-    "You can't unlink yourself, you are not a member of any application": "No puedes desvincularte, no eres miembro de ninguna aplicación"
+    "Please link first": "Please link first",
+    "This application has no providers": "This application has no providers",
+    "This application has no providers of type": "This application has no providers of type",
+    "This provider can't be unlinked": "This provider can't be unlinked",
+    "You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
+    "You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
   },
   "organization": {
-    "Only admin can modify the %s.": "Solo el administrador puede modificar los %s.",
-    "The %s is immutable.": "El %s es inmutable.",
-    "Unknown modify rule %s.": "Regla de modificación desconocida %s."
+    "Only admin can modify the %s.": "Only admin can modify the %s.",
+    "The %s is immutable.": "The %s is immutable.",
+    "Unknown modify rule %s.": "Unknown modify rule %s."
   },
   "provider": {
-    "Invalid application id": "Identificación de aplicación no válida",
-    "the provider: %s does not exist": "El proveedor: %s no existe"
+    "Invalid application id": "Invalid application id",
+    "the provider: %s does not exist": "the provider: %s does not exist"
   },
   "resource": {
-    "User is nil for tag: avatar": "El usuario es nulo para la etiqueta: avatar",
-    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Nombre de usuario o ruta completa de archivo está vacío: nombre de usuario = %s, ruta completa de archivo = %s"
+    "User is nil for tag: avatar": "User is nil for tag: avatar",
+    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
   },
   "saml": {
-    "Application %s not found": "Aplicación %s no encontrada"
+    "Application %s not found": "Application %s not found"
   },
   "saml_sp": {
-    "provider %s's category is not SAML": "La categoría del proveedor %s no es SAML"
+    "provider %s's category is not SAML": "provider %s's category is not SAML"
   },
   "service": {
-    "Empty parameters for emailForm: %v": "Parámetros vacíos para el formulario de correo electrónico: %v",
-    "Invalid Email receivers: %s": "Receptores de correo electrónico no válidos: %s",
-    "Invalid phone receivers: %s": "Receptores de teléfono no válidos: %s"
+    "Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
+    "Invalid Email receivers: %s": "Invalid Email receivers: %s",
+    "Invalid phone receivers: %s": "Invalid phone receivers: %s"
   },
   "storage": {
-    "The objectKey: %s is not allowed": "El objectKey: %s no está permitido",
-    "The provider type: %s is not supported": "El tipo de proveedor: %s no es compatible"
+    "The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
+    "The provider type: %s is not supported": "The provider type: %s is not supported"
   },
   "token": {
-    "Empty clientId or clientSecret": "ClienteId o clienteSecret vacío",
-    "Grant_type: %s is not supported in this application": "El tipo de subvención: %s no es compatible con esta aplicación",
-    "Invalid application or wrong clientSecret": "Solicitud inválida o clientSecret incorrecto",
-    "Invalid client_id": "Identificador de cliente no válido",
-    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "El URI de redirección: %s no existe en la lista de URI de redirección permitidos",
-    "Token not found, invalid accessToken": "Token no encontrado, accessToken inválido"
+    "Empty clientId or clientSecret": "Empty clientId or clientSecret",
+    "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
+    "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
+    "Invalid client_id": "Invalid client_id",
+    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
+    "Token not found, invalid accessToken": "Token not found, invalid accessToken"
   },
   "user": {
-    "Display name cannot be empty": "El nombre de pantalla no puede estar vacío",
-    "New password cannot contain blank space.": "La nueva contraseña no puede contener espacios en blanco.",
-    "New password must have at least 6 characters": "La nueva contraseña debe tener al menos 6 caracteres"
+    "Display name cannot be empty": "Display name cannot be empty",
+    "New password cannot contain blank space.": "New password cannot contain blank space.",
+    "New password must have at least 6 characters": "New password must have at least 6 characters"
   },
   "user_upload": {
-    "Failed to import users": "Error al importar usuarios"
+    "Failed to import users": "Failed to import users"
   },
   "util": {
-    "No application is found for userId: %s": "No se encuentra ninguna aplicación para el Id de usuario: %s",
-    "No provider for category: %s is found for application: %s": "No se encuentra un proveedor para la categoría: %s para la aplicación: %s",
-    "The provider: %s is not found": "El proveedor: %s no se encuentra"
+    "No application is found for userId: %s": "No application is found for userId: %s",
+    "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
+    "The provider: %s is not found": "The provider: %s is not found"
   },
   "verification": {
-    "Code has not been sent yet!": "¡El código aún no ha sido enviado!",
-    "Invalid captcha provider.": "Proveedor de captcha no válido.",
-    "Phone number is invalid in your region %s": "El número de teléfono es inválido en tu región %s",
-    "Turing test failed.": "El test de Turing falló.",
-    "Unable to get the email modify rule.": "No se puede obtener la regla de modificación de correo electrónico.",
-    "Unable to get the phone modify rule.": "No se pudo obtener la regla de modificación del teléfono.",
-    "Unknown type": "Tipo desconocido",
-    "Wrong parameter": "Parámetro incorrecto",
-    "Wrong verification code!": "¡Código de verificación incorrecto!",
-    "You should verify your code in %d min!": "¡Deberías verificar tu código en %d minutos!",
-    "the user does not exist, please sign up first": "El usuario no existe, por favor regístrese primero"
+    "Code has not been sent yet!": "Code has not been sent yet!",
+    "Email is invalid": "Email is invalid",
+    "Invalid captcha provider.": "Invalid captcha provider.",
+    "Organization does not exist": "Organization does not exist",
+    "Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
+    "Turing test failed.": "Turing test failed.",
+    "Unable to get the email modify rule.": "Unable to get the email modify rule.",
+    "Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
+    "Unknown type": "Unknown type",
+    "Wrong parameter": "Wrong parameter",
+    "Wrong verification code!": "Wrong verification code!",
+    "You should verify your code in %d min!": "You should verify your code in %d min!",
+    "the user does not exist, please sign up first": "the user does not exist, please sign up first"
   },
   "webauthn": {
-    "Found no credentials for this user": "No se encontraron credenciales para este usuario",
-    "Please call WebAuthnSigninBegin first": "Por favor, llama primero a WebAuthnSigninBegin"
+    "Found no credentials for this user": "Found no credentials for this user",
+    "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
   }
 }

i18n/locales/fr/data.json

@@ -1,140 +1,146 @@
 {
   "account": {
-    "Failed to add user": "Échec d'ajout d'utilisateur",
-    "Get init score failed, error: %w": "Obtention du score initiale échouée, erreur : %w",
-    "Please sign out first": "Veuillez vous déconnecter en premier",
-    "The application does not allow to sign up new account": "L'application ne permet pas de créer un nouveau compte"
+    "Get init score failed, error: %w": "Get init score failed, error: %w",
+    "Invalid information": "Invalid information",
+    "Please sign out first before signing in": "Please sign out first before signing in",
+    "Please sign out first before signing up": "Please sign out first before signing up",
+    "The application does not allow to sign up new account": "The application does not allow to sign up new account"
   },
   "auth": {
-    "Challenge method should be S256": "La méthode de défi doit être S256",
-    "Failed to create user, user information is invalid: %s": "Échec de la création de l'utilisateur, les informations utilisateur sont invalides : %s",
-    "Failed to login in: %s": "Échec de la connexion : %s",
-    "Invalid token": "Jeton invalide",
-    "State expected: %s, but got: %s": "État attendu : %s, mais obtenu : %s",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "Le compte pour le fournisseur : %s et le nom d'utilisateur : %s (%s) n'existe pas et n'est pas autorisé à s'inscrire en tant que nouveau compte via %%s, veuillez utiliser une autre méthode pour vous inscrire",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "Le compte pour le fournisseur : %s et le nom d'utilisateur : %s (%s) n'existe pas et n'est pas autorisé à s'inscrire comme nouveau compte, veuillez contacter votre support informatique",
-    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "Le compte du fournisseur : %s et le nom d'utilisateur : %s (%s) sont déjà liés à un autre compte : %s (%s)",
-    "The application: %s does not exist": "L'application : %s n'existe pas",
-    "The login method: login with password is not enabled for the application": "La méthode de connexion : connexion avec mot de passe n'est pas activée pour l'application",
-    "The provider: %s is not enabled for the application": "Le fournisseur :%s n'est pas activé pour l'application",
-    "Unauthorized operation": "Opération non autorisée",
-    "Unknown authentication type (not password or provider), form = %s": "Type d'authentification inconnu (pas de mot de passe ou de fournisseur), formulaire = %s"
+    "Challenge method should be S256": "Challenge method should be S256",
+    "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
+    "Failed to login in: %s": "Failed to login in: %s",
+    "Invalid token": "Invalid token",
+    "State expected: %s, but got: %s": "State expected: %s, but got: %s",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
+    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
+    "The application: %s does not exist": "The application: %s does not exist",
+    "The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
+    "The provider type: %s is not supported": "The provider type: %s is not supported",
+    "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "Turing test failed.": "Turing test failed.",
+    "Unauthorized operation": "Unauthorized operation",
+    "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
   },
   "cas": {
-    "Service %s and %s do not match": "Les services %s et %s ne correspondent pas"
+    "Service %s and %s do not match": "Service %s and %s do not match"
   },
   "check": {
-    "Affiliation cannot be blank": "Affiliation ne peut pas être vide",
-    "DisplayName cannot be blank": "Le nom d'affichage ne peut pas être vide",
-    "DisplayName is not valid real name": "DisplayName n'est pas un nom réel valide",
-    "Email already exists": "E-mail déjà existant",
-    "Email cannot be empty": "L'e-mail ne peut pas être vide",
-    "Email is invalid": "L'adresse e-mail est invalide",
-    "Empty username.": "Nom d'utilisateur vide.",
-    "FirstName cannot be blank": "Le prénom ne peut pas être laissé vide",
-    "LastName cannot be blank": "Le nom de famille ne peut pas être vide",
-    "Ldap user name or password incorrect": "Nom d'utilisateur ou mot de passe LDAP incorrect",
-    "Multiple accounts with same uid, please check your ldap server": "Plusieurs comptes avec le même identifiant d'utilisateur, veuillez vérifier votre serveur LDAP",
-    "Organization does not exist": "L'organisation n'existe pas",
-    "Password must have at least 6 characters": "Le mot de passe doit comporter au moins 6 caractères",
-    "Phone already exists": "Le téléphone existe déjà",
-    "Phone cannot be empty": "Le téléphone ne peut pas être vide",
-    "Phone number is invalid": "Le numéro de téléphone est invalide",
-    "Session outdated, please login again": "Session expirée, veuillez vous connecter à nouveau",
-    "The user is forbidden to sign in, please contact the administrator": "L'utilisateur est interdit de se connecter, veuillez contacter l'administrateur",
-    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "Le nom d'utilisateur ne peut contenir que des caractères alphanumériques, des traits soulignés ou des tirets, ne peut pas avoir de tirets ou de traits soulignés consécutifs et ne peut pas commencer ou se terminer par un tiret ou un trait souligné.",
-    "Username already exists": "Nom d'utilisateur existe déjà",
-    "Username cannot be an email address": "Nom d'utilisateur ne peut pas être une adresse e-mail",
-    "Username cannot contain white spaces": "Nom d'utilisateur ne peut pas contenir d'espaces blancs",
-    "Username cannot start with a digit": "Nom d'utilisateur ne peut pas commencer par un chiffre",
-    "Username is too long (maximum is 39 characters).": "Nom d'utilisateur est trop long (maximum de 39 caractères).",
-    "Username must have at least 2 characters": "Le nom d'utilisateur doit comporter au moins 2 caractères",
-    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "Vous avez entré le mauvais mot de passe ou code plusieurs fois, veuillez attendre %d minutes et réessayer",
-    "Your region is not allow to signup by phone": "Votre région n'est pas autorisée à s'inscrire par téléphone",
-    "password or code is incorrect, you have %d remaining chances": "Le mot de passe ou le code est incorrect, il vous reste %d chances",
-    "unsupported password type: %s": "Type de mot de passe non pris en charge : %s"
+    "Affiliation cannot be blank": "Affiliation cannot be blank",
+    "DisplayName cannot be blank": "DisplayName cannot be blank",
+    "DisplayName is not valid real name": "DisplayName is not valid real name",
+    "Email already exists": "Email already exists",
+    "Email cannot be empty": "Email cannot be empty",
+    "Email is invalid": "Email is invalid",
+    "Empty username.": "Empty username.",
+    "FirstName cannot be blank": "FirstName cannot be blank",
+    "LastName cannot be blank": "LastName cannot be blank",
+    "Ldap user name or password incorrect": "Ldap user name or password incorrect",
+    "Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
+    "Organization does not exist": "Organization does not exist",
+    "Password must have at least 6 characters": "Password must have at least 6 characters",
+    "Phone already exists": "Phone already exists",
+    "Phone cannot be empty": "Phone cannot be empty",
+    "Phone number is invalid": "Phone number is invalid",
+    "Session outdated, please login again": "Session outdated, please login again",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
+    "Username already exists": "Username already exists",
+    "Username cannot be an email address": "Username cannot be an email address",
+    "Username cannot contain white spaces": "Username cannot contain white spaces",
+    "Username cannot start with a digit": "Username cannot start with a digit",
+    "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
+    "Username must have at least 2 characters": "Username must have at least 2 characters",
+    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
+    "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
+    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "unsupported password type: %s": "unsupported password type: %s"
   },
   "general": {
-    "Missing parameter": "Paramètre manquant",
-    "Please login first": "Veuillez d'abord vous connecter",
-    "The user: %s doesn't exist": "L'utilisateur : %s n'existe pas",
-    "don't support captchaProvider: ": "Ne pas prendre en charge la captchaProvider"
+    "Missing parameter": "Missing parameter",
+    "Please login first": "Please login first",
+    "The user: %s doesn't exist": "The user: %s doesn't exist",
+    "don't support captchaProvider: ": "don't support captchaProvider: "
   },
   "ldap": {
-    "Ldap server exist": "Le serveur LDAP existe"
+    "Ldap server exist": "Ldap server exist"
   },
   "link": {
-    "Please link first": "Veuillez d'abord faire le lien",
-    "This application has no providers": "Cette application n'a aucun fournisseur",
-    "This application has no providers of type": "Cette application ne dispose d'aucun fournisseur de type",
-    "This provider can't be unlinked": "Ce fournisseur ne peut pas être dissocié",
-    "You are not the global admin, you can't unlink other users": "Vous n'êtes pas l'administrateur global, vous ne pouvez pas détacher d'autres utilisateurs",
-    "You can't unlink yourself, you are not a member of any application": "Vous ne pouvez pas vous désolidariser, car vous n'êtes membre d'aucune application"
+    "Please link first": "Please link first",
+    "This application has no providers": "This application has no providers",
+    "This application has no providers of type": "This application has no providers of type",
+    "This provider can't be unlinked": "This provider can't be unlinked",
+    "You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
+    "You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
   },
   "organization": {
-    "Only admin can modify the %s.": "Seul l'administrateur peut modifier le %s.",
-    "The %s is immutable.": "Le %s est immuable.",
-    "Unknown modify rule %s.": "Règle de modification inconnue %s."
+    "Only admin can modify the %s.": "Only admin can modify the %s.",
+    "The %s is immutable.": "The %s is immutable.",
+    "Unknown modify rule %s.": "Unknown modify rule %s."
   },
   "provider": {
-    "Invalid application id": "Identifiant d'application invalide",
-    "the provider: %s does not exist": "Le fournisseur : %s n'existe pas"
+    "Invalid application id": "Invalid application id",
+    "the provider: %s does not exist": "the provider: %s does not exist"
   },
   "resource": {
-    "User is nil for tag: avatar": "L'utilisateur est nul pour la balise : avatar",
-    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Nom d'utilisateur ou chemin complet du fichier est vide : nom d'utilisateur = %s, chemin complet du fichier = %s"
+    "User is nil for tag: avatar": "User is nil for tag: avatar",
+    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
   },
   "saml": {
-    "Application %s not found": "L'application %s n'a pas été trouvée"
+    "Application %s not found": "Application %s not found"
   },
   "saml_sp": {
-    "provider %s's category is not SAML": "La catégorie du fournisseur %s n'est pas SAML"
+    "provider %s's category is not SAML": "provider %s's category is not SAML"
   },
   "service": {
-    "Empty parameters for emailForm: %v": "Paramètres vides pour emailForm : %v",
-    "Invalid Email receivers: %s": "Destinataires d'e-mail invalides : %s",
-    "Invalid phone receivers: %s": "Destinataires de téléphone invalide : %s"
+    "Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
+    "Invalid Email receivers: %s": "Invalid Email receivers: %s",
+    "Invalid phone receivers: %s": "Invalid phone receivers: %s"
   },
   "storage": {
-    "The objectKey: %s is not allowed": "La clé d'objet : %s n'est pas autorisée",
-    "The provider type: %s is not supported": "Le type de fournisseur : %s n'est pas pris en charge"
+    "The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
+    "The provider type: %s is not supported": "The provider type: %s is not supported"
   },
   "token": {
-    "Empty clientId or clientSecret": "clientId ou clientSecret vide",
-    "Grant_type: %s is not supported in this application": "Type_de_subvention : %s n'est pas pris en charge dans cette application",
-    "Invalid application or wrong clientSecret": "Application invalide ou clientSecret incorrect",
-    "Invalid client_id": "Identifiant de client invalide",
-    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "URI de redirection: %s n'existe pas dans la liste des URI de redirection autorisés",
-    "Token not found, invalid accessToken": "Jeton non trouvé, accessToken invalide"
+    "Empty clientId or clientSecret": "Empty clientId or clientSecret",
+    "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
+    "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
+    "Invalid client_id": "Invalid client_id",
+    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
+    "Token not found, invalid accessToken": "Token not found, invalid accessToken"
   },
   "user": {
-    "Display name cannot be empty": "Le nom d'affichage ne peut pas être vide",
-    "New password cannot contain blank space.": "Le nouveau mot de passe ne peut pas contenir d'espace.",
-    "New password must have at least 6 characters": "Le nouveau mot de passe doit comporter au moins 6 caractères"
+    "Display name cannot be empty": "Display name cannot be empty",
+    "New password cannot contain blank space.": "New password cannot contain blank space.",
+    "New password must have at least 6 characters": "New password must have at least 6 characters"
   },
   "user_upload": {
-    "Failed to import users": "Échec de l'importation des utilisateurs"
+    "Failed to import users": "Failed to import users"
   },
   "util": {
-    "No application is found for userId: %s": "Aucune application n'a été trouvée pour l'identifiant d'utilisateur : %s",
-    "No provider for category: %s is found for application: %s": "Aucun fournisseur pour la catégorie: %s n'est trouvé pour l'application: %s",
-    "The provider: %s is not found": "Le fournisseur : %s n'a pas été trouvé"
+    "No application is found for userId: %s": "No application is found for userId: %s",
+    "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
+    "The provider: %s is not found": "The provider: %s is not found"
   },
   "verification": {
-    "Code has not been sent yet!": "Le code n'a pas encore été envoyé !",
-    "Invalid captcha provider.": "Fournisseur de captcha invalide.",
-    "Phone number is invalid in your region %s": "Le numéro de téléphone n'est pas valide dans votre région %s",
-    "Turing test failed.": "Le test de Turing a échoué.",
-    "Unable to get the email modify rule.": "Incapable d'obtenir la règle de modification de courriel.",
-    "Unable to get the phone modify rule.": "Impossible d'obtenir la règle de modification de téléphone.",
-    "Unknown type": "Type inconnu",
-    "Wrong parameter": "Mauvais paramètre",
-    "Wrong verification code!": "Mauvais code de vérification !",
-    "You should verify your code in %d min!": "Vous devriez vérifier votre code en %d min !",
-    "the user does not exist, please sign up first": "L'utilisateur n'existe pas, veuillez vous inscrire d'abord"
+    "Code has not been sent yet!": "Code has not been sent yet!",
+    "Email is invalid": "Email is invalid",
+    "Invalid captcha provider.": "Invalid captcha provider.",
+    "Organization does not exist": "Organization does not exist",
+    "Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
+    "Turing test failed.": "Turing test failed.",
+    "Unable to get the email modify rule.": "Unable to get the email modify rule.",
+    "Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
+    "Unknown type": "Unknown type",
+    "Wrong parameter": "Wrong parameter",
+    "Wrong verification code!": "Wrong verification code!",
+    "You should verify your code in %d min!": "You should verify your code in %d min!",
+    "the user does not exist, please sign up first": "the user does not exist, please sign up first"
   },
   "webauthn": {
-    "Found no credentials for this user": "Aucune référence trouvée pour cet utilisateur",
-    "Please call WebAuthnSigninBegin first": "Veuillez d'abord appeler WebAuthnSigninBegin"
+    "Found no credentials for this user": "Found no credentials for this user",
+    "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
   }
 }

i18n/locales/id/data.json

@@ -1,140 +0,0 @@
-{
-  "account": {
-    "Failed to add user": "Gagal menambahkan pengguna",
-    "Get init score failed, error: %w": "Gagal mendapatkan nilai init, kesalahan: %w",
-    "Please sign out first": "Silakan keluar terlebih dahulu",
-    "The application does not allow to sign up new account": "Aplikasi tidak memperbolehkan untuk mendaftar akun baru"
-  },
-  "auth": {
-    "Challenge method should be S256": "Metode tantangan harus S256",
-    "Failed to create user, user information is invalid: %s": "Gagal membuat pengguna, informasi pengguna tidak valid: %s",
-    "Failed to login in: %s": "Gagal masuk: %s",
-    "Invalid token": "Token tidak valid",
-    "State expected: %s, but got: %s": "Diharapkan: %s, tapi diperoleh: %s",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "Akun untuk penyedia: %s dan nama pengguna: %s (%s) tidak ada dan tidak diizinkan untuk mendaftar sebagai akun baru melalui %%s, silakan gunakan cara lain untuk mendaftar",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "Akun untuk penyedia: %s dan nama pengguna: %s (%s) tidak ada dan tidak diizinkan untuk mendaftar sebagai akun baru, silakan hubungi dukungan IT Anda",
-    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "Akun untuk provider: %s dan username: %s (%s) sudah terhubung dengan akun lain: %s (%s)",
-    "The application: %s does not exist": "Aplikasi: %s tidak ada",
-    "The login method: login with password is not enabled for the application": "Metode login: login dengan kata sandi tidak diaktifkan untuk aplikasi tersebut",
-    "The provider: %s is not enabled for the application": "Penyedia: %s tidak diaktifkan untuk aplikasi ini",
-    "Unauthorized operation": "Operasi tidak sah",
-    "Unknown authentication type (not password or provider), form = %s": "Jenis otentikasi tidak diketahui (bukan kata sandi atau pemberi), formulir = %s"
-  },
-  "cas": {
-    "Service %s and %s do not match": "Layanan %s dan %s tidak cocok"
-  },
-  "check": {
-    "Affiliation cannot be blank": "Keterkaitan tidak boleh kosong",
-    "DisplayName cannot be blank": "Nama Pengguna tidak boleh kosong",
-    "DisplayName is not valid real name": "DisplayName bukanlah nama asli yang valid",
-    "Email already exists": "Email sudah ada",
-    "Email cannot be empty": "Email tidak boleh kosong",
-    "Email is invalid": "Email tidak valid",
-    "Empty username.": "Nama pengguna kosong.",
-    "FirstName cannot be blank": "Nama depan tidak boleh kosong",
-    "LastName cannot be blank": "Nama belakang tidak boleh kosong",
-    "Ldap user name or password incorrect": "Nama pengguna atau kata sandi Ldap salah",
-    "Multiple accounts with same uid, please check your ldap server": "Beberapa akun dengan uid yang sama, harap periksa server ldap Anda",
-    "Organization does not exist": "Organisasi tidak ada",
-    "Password must have at least 6 characters": "Kata sandi harus memiliki minimal 6 karakter",
-    "Phone already exists": "Telepon sudah ada",
-    "Phone cannot be empty": "Telepon tidak boleh kosong",
-    "Phone number is invalid": "Nomor telepon tidak valid",
-    "Session outdated, please login again": "Sesi kedaluwarsa, silakan masuk lagi",
-    "The user is forbidden to sign in, please contact the administrator": "Pengguna dilarang masuk, silakan hubungi administrator",
-    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "Nama pengguna hanya bisa menggunakan karakter alfanumerik, garis bawah atau tanda hubung, tidak boleh memiliki dua tanda hubung atau garis bawah berurutan, dan tidak boleh diawali atau diakhiri dengan tanda hubung atau garis bawah.",
-    "Username already exists": "Nama pengguna sudah ada",
-    "Username cannot be an email address": "Username tidak bisa menjadi alamat email",
-    "Username cannot contain white spaces": "Username tidak boleh mengandung spasi",
-    "Username cannot start with a digit": "Username tidak dapat dimulai dengan angka",
-    "Username is too long (maximum is 39 characters).": "Nama pengguna terlalu panjang (maksimum 39 karakter).",
-    "Username must have at least 2 characters": "Nama pengguna harus memiliki setidaknya 2 karakter",
-    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "Anda telah memasukkan kata sandi atau kode yang salah terlalu banyak kali, mohon tunggu selama %d menit dan coba lagi",
-    "Your region is not allow to signup by phone": "Wilayah Anda tidak diizinkan untuk mendaftar melalui telepon",
-    "password or code is incorrect, you have %d remaining chances": "Kata sandi atau kode salah, Anda memiliki %d kesempatan tersisa",
-    "unsupported password type: %s": "jenis sandi tidak didukung: %s"
-  },
-  "general": {
-    "Missing parameter": "Parameter hilang",
-    "Please login first": "Silahkan login terlebih dahulu",
-    "The user: %s doesn't exist": "Pengguna: %s tidak ada",
-    "don't support captchaProvider: ": "Jangan mendukung captchaProvider:"
-  },
-  "ldap": {
-    "Ldap server exist": "Server ldap ada"
-  },
-  "link": {
-    "Please link first": "Tolong tautkan terlebih dahulu",
-    "This application has no providers": "Aplikasi ini tidak memiliki penyedia",
-    "This application has no providers of type": " Aplikasi ini tidak memiliki penyedia tipe ",
-    "This provider can't be unlinked": "Pemberi layanan ini tidak dapat dipisahkan",
-    "You are not the global admin, you can't unlink other users": "Anda bukan admin global, Anda tidak dapat memutuskan tautan pengguna lain",
-    "You can't unlink yourself, you are not a member of any application": "Anda tidak dapat memutuskan tautan diri sendiri, karena Anda bukan anggota dari aplikasi apa pun"
-  },
-  "organization": {
-    "Only admin can modify the %s.": "Hanya admin yang dapat memodifikasi %s.",
-    "The %s is immutable.": "%s tidak dapat diubah.",
-    "Unknown modify rule %s.": "Aturan modifikasi tidak diketahui %s."
-  },
-  "provider": {
-    "Invalid application id": "ID aplikasi tidak valid",
-    "the provider: %s does not exist": "provider: %s tidak ada"
-  },
-  "resource": {
-    "User is nil for tag: avatar": "Pengguna kosong untuk tag: avatar",
-    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Nama pengguna atau path lengkap file kosong: nama_pengguna = %s, path_lengkap_file = %s"
-  },
-  "saml": {
-    "Application %s not found": "Aplikasi %s tidak ditemukan"
-  },
-  "saml_sp": {
-    "provider %s's category is not SAML": "kategori penyedia %s bukan SAML"
-  },
-  "service": {
-    "Empty parameters for emailForm: %v": "Parameter kosong untuk emailForm: %v",
-    "Invalid Email receivers: %s": "Penerima email tidak valid: %s",
-    "Invalid phone receivers: %s": "Penerima telepon tidak valid: %s"
-  },
-  "storage": {
-    "The objectKey: %s is not allowed": "Kunci objek: %s tidak diizinkan",
-    "The provider type: %s is not supported": "Jenis penyedia: %s tidak didukung"
-  },
-  "token": {
-    "Empty clientId or clientSecret": "Kosong clientId atau clientSecret",
-    "Grant_type: %s is not supported in this application": "Jenis grant (grant_type) %s tidak didukung dalam aplikasi ini",
-    "Invalid application or wrong clientSecret": "Aplikasi tidak valid atau clientSecret salah",
-    "Invalid client_id": "Invalid client_id = ID klien tidak valid",
-    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "URI pengalihan: %s tidak ada dalam daftar URI Pengalihan yang diizinkan",
-    "Token not found, invalid accessToken": "Token tidak ditemukan, accessToken tidak valid"
-  },
-  "user": {
-    "Display name cannot be empty": "Nama tampilan tidak boleh kosong",
-    "New password cannot contain blank space.": "Kata sandi baru tidak boleh mengandung spasi kosong.",
-    "New password must have at least 6 characters": "Kata sandi baru harus memiliki setidaknya 6 karakter"
-  },
-  "user_upload": {
-    "Failed to import users": "Gagal mengimpor pengguna"
-  },
-  "util": {
-    "No application is found for userId: %s": "Tidak ditemukan aplikasi untuk userId: %s",
-    "No provider for category: %s is found for application: %s": "Tidak ditemukan penyedia untuk kategori: %s untuk aplikasi: %s",
-    "The provider: %s is not found": "Penyedia: %s tidak ditemukan"
-  },
-  "verification": {
-    "Code has not been sent yet!": "Kode belum dikirimkan!",
-    "Invalid captcha provider.": "Penyedia captcha tidak valid.",
-    "Phone number is invalid in your region %s": "Nomor telepon tidak valid di wilayah anda %s",
-    "Turing test failed.": "Tes Turing gagal.",
-    "Unable to get the email modify rule.": "Tidak dapat memperoleh aturan modifikasi email.",
-    "Unable to get the phone modify rule.": "Tidak dapat memodifikasi aturan telepon.",
-    "Unknown type": "Tipe tidak diketahui",
-    "Wrong parameter": "Parameter yang salah",
-    "Wrong verification code!": "Kode verifikasi salah!",
-    "You should verify your code in %d min!": "Anda harus memverifikasi kode Anda dalam %d menit!",
-    "the user does not exist, please sign up first": "Pengguna tidak ada, silakan daftar terlebih dahulu"
-  },
-  "webauthn": {
-    "Found no credentials for this user": "Tidak ditemukan kredensial untuk pengguna ini",
-    "Please call WebAuthnSigninBegin first": "Harap panggil WebAuthnSigninBegin terlebih dahulu"
-  }
-}

i18n/locales/ja/data.json

@@ -1,140 +1,146 @@
 {
   "account": {
-    "Failed to add user": "ユーザーの追加に失敗しました",
-    "Get init score failed, error: %w": "イニットスコアの取得に失敗しました。エラー：%w",
-    "Please sign out first": "最初にサインアウトしてください",
-    "The application does not allow to sign up new account": "アプリケーションは新しいアカウントの登録を許可しません"
+    "Get init score failed, error: %w": "Get init score failed, error: %w",
+    "Invalid information": "Invalid information",
+    "Please sign out first before signing in": "Please sign out first before signing in",
+    "Please sign out first before signing up": "Please sign out first before signing up",
+    "The application does not allow to sign up new account": "The application does not allow to sign up new account"
   },
   "auth": {
-    "Challenge method should be S256": "チャレンジメソッドはS256である必要があります",
-    "Failed to create user, user information is invalid: %s": "ユーザーの作成に失敗しました。ユーザー情報が無効です：%s",
-    "Failed to login in: %s": "ログインできませんでした：%s",
-    "Invalid token": "無効なトークン",
-    "State expected: %s, but got: %s": "期待される状態： %s、実際には：%s",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "プロバイダーのアカウント：%s とユーザー名：%s（%s）が存在せず、新しいアカウントを %%s 経由でサインアップすることはできません。他の方法でサインアップしてください",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "プロバイダー名：%sとユーザー名：%s（%s）のアカウントは存在しません。新しいアカウントとしてサインアップすることはできません。 ITサポートに連絡してください",
-    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "プロバイダのアカウント：%s とユーザー名：%s (%s) は既に別のアカウント：%s (%s) にリンクされています",
-    "The application: %s does not exist": "アプリケーション: %sは存在しません",
-    "The login method: login with password is not enabled for the application": "ログイン方法：パスワードでのログインはアプリケーションで有効になっていません",
-    "The provider: %s is not enabled for the application": "プロバイダー：%sはアプリケーションでは有効化されていません",
-    "Unauthorized operation": "不正操作",
-    "Unknown authentication type (not password or provider), form = %s": "不明な認証タイプ（パスワードまたはプロバイダーではない）フォーム=%s"
+    "Challenge method should be S256": "Challenge method should be S256",
+    "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
+    "Failed to login in: %s": "Failed to login in: %s",
+    "Invalid token": "Invalid token",
+    "State expected: %s, but got: %s": "State expected: %s, but got: %s",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
+    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
+    "The application: %s does not exist": "The application: %s does not exist",
+    "The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
+    "The provider type: %s is not supported": "The provider type: %s is not supported",
+    "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "Turing test failed.": "Turing test failed.",
+    "Unauthorized operation": "Unauthorized operation",
+    "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
   },
   "cas": {
-    "Service %s and %s do not match": "サービス%sと%sは一致しません"
+    "Service %s and %s do not match": "Service %s and %s do not match"
   },
   "check": {
-    "Affiliation cannot be blank": "所属は空白にできません",
-    "DisplayName cannot be blank": "表示名は空白にできません",
-    "DisplayName is not valid real name": "表示名は有効な実名ではありません",
-    "Email already exists": "メールは既に存在します",
-    "Email cannot be empty": "メールが空白にできません",
-    "Email is invalid": "電子メールは無効です",
-    "Empty username.": "空のユーザー名。",
-    "FirstName cannot be blank": "ファーストネームは空白にできません",
-    "LastName cannot be blank": "姓は空白にできません",
-    "Ldap user name or password incorrect": "Ldapのユーザー名またはパスワードが間違っています",
-    "Multiple accounts with same uid, please check your ldap server": "同じuidを持つ複数のアカウントがあります。あなたのLDAPサーバーを確認してください",
-    "Organization does not exist": "組織は存在しません",
-    "Password must have at least 6 characters": "パスワードは少なくとも6つの文字が必要です",
-    "Phone already exists": "電話はすでに存在しています",
-    "Phone cannot be empty": "電話は空っぽにできません",
-    "Phone number is invalid": "電話番号が無効です",
-    "Session outdated, please login again": "セッションが期限切れになりました。再度ログインしてください",
-    "The user is forbidden to sign in, please contact the administrator": "ユーザーはサインインできません。管理者に連絡してください",
-    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "ユーザー名には英数字、アンダースコア、ハイフンしか含めることができません。連続したハイフンまたはアンダースコアは不可であり、ハイフンまたはアンダースコアで始まるまたは終わることもできません。",
-    "Username already exists": "ユーザー名はすでに存在しています",
-    "Username cannot be an email address": "ユーザー名には電子メールアドレスを使用できません",
-    "Username cannot contain white spaces": "ユーザ名にはスペースを含めることはできません",
-    "Username cannot start with a digit": "ユーザー名は数字で始めることはできません",
-    "Username is too long (maximum is 39 characters).": "ユーザー名が長すぎます（最大39文字）。",
-    "Username must have at least 2 characters": "ユーザー名は少なくとも2文字必要です",
-    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "あなたは間違ったパスワードまたはコードを何度も入力しました。%d 分間待ってから再度お試しください",
-    "Your region is not allow to signup by phone": "あなたの地域は電話でサインアップすることができません",
-    "password or code is incorrect, you have %d remaining chances": "パスワードまたはコードが間違っています。あと%d回の試行機会があります",
-    "unsupported password type: %s": "サポートされていないパスワードタイプ：%s"
+    "Affiliation cannot be blank": "Affiliation cannot be blank",
+    "DisplayName cannot be blank": "DisplayName cannot be blank",
+    "DisplayName is not valid real name": "DisplayName is not valid real name",
+    "Email already exists": "Email already exists",
+    "Email cannot be empty": "Email cannot be empty",
+    "Email is invalid": "Email is invalid",
+    "Empty username.": "Empty username.",
+    "FirstName cannot be blank": "FirstName cannot be blank",
+    "LastName cannot be blank": "LastName cannot be blank",
+    "Ldap user name or password incorrect": "Ldap user name or password incorrect",
+    "Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
+    "Organization does not exist": "Organization does not exist",
+    "Password must have at least 6 characters": "Password must have at least 6 characters",
+    "Phone already exists": "Phone already exists",
+    "Phone cannot be empty": "Phone cannot be empty",
+    "Phone number is invalid": "Phone number is invalid",
+    "Session outdated, please login again": "Session outdated, please login again",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
+    "Username already exists": "Username already exists",
+    "Username cannot be an email address": "Username cannot be an email address",
+    "Username cannot contain white spaces": "Username cannot contain white spaces",
+    "Username cannot start with a digit": "Username cannot start with a digit",
+    "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
+    "Username must have at least 2 characters": "Username must have at least 2 characters",
+    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
+    "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
+    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "unsupported password type: %s": "unsupported password type: %s"
   },
   "general": {
-    "Missing parameter": "不足しているパラメーター",
-    "Please login first": "最初にログインしてください",
-    "The user: %s doesn't exist": "そのユーザー：%sは存在しません",
-    "don't support captchaProvider: ": "captchaProviderをサポートしないでください"
+    "Missing parameter": "Missing parameter",
+    "Please login first": "Please login first",
+    "The user: %s doesn't exist": "The user: %s doesn't exist",
+    "don't support captchaProvider: ": "don't support captchaProvider: "
   },
   "ldap": {
-    "Ldap server exist": "LDAPサーバーは存在します"
+    "Ldap server exist": "Ldap server exist"
   },
   "link": {
-    "Please link first": "最初にリンクしてください",
-    "This application has no providers": "このアプリケーションにはプロバイダーがありません",
-    "This application has no providers of type": "「このアプリケーションには、タイプのプロバイダーがありません」と翻訳されます",
-    "This provider can't be unlinked": "このプロバイダーはリンク解除できません",
-    "You are not the global admin, you can't unlink other users": "あなたはグローバル管理者ではありません、他のユーザーとのリンクを解除することはできません",
-    "You can't unlink yourself, you are not a member of any application": "あなたは自分自身をアンリンクすることはできません、あなたはどのアプリケーションのメンバーでもありません"
+    "Please link first": "Please link first",
+    "This application has no providers": "This application has no providers",
+    "This application has no providers of type": "This application has no providers of type",
+    "This provider can't be unlinked": "This provider can't be unlinked",
+    "You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
+    "You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
   },
   "organization": {
-    "Only admin can modify the %s.": "管理者のみが%sを変更できます。",
-    "The %s is immutable.": "%sは不変です。",
-    "Unknown modify rule %s.": "未知の変更ルール%s。"
+    "Only admin can modify the %s.": "Only admin can modify the %s.",
+    "The %s is immutable.": "The %s is immutable.",
+    "Unknown modify rule %s.": "Unknown modify rule %s."
   },
   "provider": {
-    "Invalid application id": "アプリケーションIDが無効です",
-    "the provider: %s does not exist": "プロバイダー%sは存在しません"
+    "Invalid application id": "Invalid application id",
+    "the provider: %s does not exist": "the provider: %s does not exist"
   },
   "resource": {
-    "User is nil for tag: avatar": "ユーザーはタグ「アバター」に対してnilです",
-    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "ユーザー名または完全なファイルパスが空です：ユーザー名 = %s、完全なファイルパス = %s"
+    "User is nil for tag: avatar": "User is nil for tag: avatar",
+    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
   },
   "saml": {
-    "Application %s not found": "アプリケーション%sは見つかりません"
+    "Application %s not found": "Application %s not found"
   },
   "saml_sp": {
-    "provider %s's category is not SAML": "プロバイダ %s のカテゴリはSAMLではありません"
+    "provider %s's category is not SAML": "provider %s's category is not SAML"
   },
   "service": {
-    "Empty parameters for emailForm: %v": "EmailFormの空のパラメーター：％v",
-    "Invalid Email receivers: %s": "無効な電子メール受信者：%s",
-    "Invalid phone receivers: %s": "電話受信者が無効です：%s"
+    "Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
+    "Invalid Email receivers: %s": "Invalid Email receivers: %s",
+    "Invalid phone receivers: %s": "Invalid phone receivers: %s"
   },
   "storage": {
-    "The objectKey: %s is not allowed": "オブジェクトキー %s は許可されていません",
-    "The provider type: %s is not supported": "プロバイダータイプ：%sはサポートされていません"
+    "The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
+    "The provider type: %s is not supported": "The provider type: %s is not supported"
   },
   "token": {
-    "Empty clientId or clientSecret": "クライアントIDまたはクライアントシークレットが空です",
-    "Grant_type: %s is not supported in this application": "grant_type：%sはこのアプリケーションでサポートされていません",
-    "Invalid application or wrong clientSecret": "無効なアプリケーションまたは誤ったクライアントシークレットです",
-    "Invalid client_id": "client_idが無効です",
-    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "リダイレクトURI：%sは許可されたリダイレクトURIリストに存在しません",
-    "Token not found, invalid accessToken": "トークンが見つかりません。無効なアクセストークンです"
+    "Empty clientId or clientSecret": "Empty clientId or clientSecret",
+    "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
+    "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
+    "Invalid client_id": "Invalid client_id",
+    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
+    "Token not found, invalid accessToken": "Token not found, invalid accessToken"
   },
   "user": {
-    "Display name cannot be empty": "表示名は空にできません",
-    "New password cannot contain blank space.": "新しいパスワードにはスペースを含めることはできません。",
-    "New password must have at least 6 characters": "新しいパスワードは少なくとも6文字必要です"
+    "Display name cannot be empty": "Display name cannot be empty",
+    "New password cannot contain blank space.": "New password cannot contain blank space.",
+    "New password must have at least 6 characters": "New password must have at least 6 characters"
   },
   "user_upload": {
-    "Failed to import users": "ユーザーのインポートに失敗しました"
+    "Failed to import users": "Failed to import users"
   },
   "util": {
-    "No application is found for userId: %s": "ユーザーIDに対するアプリケーションが見つかりません： %s",
-    "No provider for category: %s is found for application: %s": "アプリケーション：%sのカテゴリ%sのプロバイダが見つかりません",
-    "The provider: %s is not found": "プロバイダー：%sが見つかりません"
+    "No application is found for userId: %s": "No application is found for userId: %s",
+    "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
+    "The provider: %s is not found": "The provider: %s is not found"
   },
   "verification": {
-    "Code has not been sent yet!": "まだコードが送信されていません！",
-    "Invalid captcha provider.": "無効なCAPTCHAプロバイダー。",
-    "Phone number is invalid in your region %s": "電話番号はあなたの地域で無効です %s",
-    "Turing test failed.": "チューリングテストは失敗しました。",
-    "Unable to get the email modify rule.": "電子メール変更規則を取得できません。",
-    "Unable to get the phone modify rule.": "電話の変更ルールを取得できません。",
-    "Unknown type": "不明なタイプ",
-    "Wrong parameter": "誤ったパラメータ",
-    "Wrong verification code!": "誤った検証コードです！",
-    "You should verify your code in %d min!": "あなたは%d分であなたのコードを確認する必要があります！",
-    "the user does not exist, please sign up first": "ユーザーは存在しません。まず登録してください"
+    "Code has not been sent yet!": "Code has not been sent yet!",
+    "Email is invalid": "Email is invalid",
+    "Invalid captcha provider.": "Invalid captcha provider.",
+    "Organization does not exist": "Organization does not exist",
+    "Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
+    "Turing test failed.": "Turing test failed.",
+    "Unable to get the email modify rule.": "Unable to get the email modify rule.",
+    "Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
+    "Unknown type": "Unknown type",
+    "Wrong parameter": "Wrong parameter",
+    "Wrong verification code!": "Wrong verification code!",
+    "You should verify your code in %d min!": "You should verify your code in %d min!",
+    "the user does not exist, please sign up first": "the user does not exist, please sign up first"
   },
   "webauthn": {
-    "Found no credentials for this user": "このユーザーの資格情報が見つかりませんでした",
-    "Please call WebAuthnSigninBegin first": "最初にWebAuthnSigninBeginを呼び出してください"
+    "Found no credentials for this user": "Found no credentials for this user",
+    "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
   }
 }

i18n/locales/ko/data.json

@@ -1,140 +1,146 @@
 {
   "account": {
-    "Failed to add user": "사용자 추가 실패",
-    "Get init score failed, error: %w": "초기 점수 획득 실패, 오류: %w",
-    "Please sign out first": "먼저 로그아웃해주세요",
-    "The application does not allow to sign up new account": "이 응용 프로그램은 새로운 계정 가입을 허용하지 않습니다"
+    "Get init score failed, error: %w": "Get init score failed, error: %w",
+    "Invalid information": "Invalid information",
+    "Please sign out first before signing in": "Please sign out first before signing in",
+    "Please sign out first before signing up": "Please sign out first before signing up",
+    "The application does not allow to sign up new account": "The application does not allow to sign up new account"
   },
   "auth": {
-    "Challenge method should be S256": "도전 방식은 S256이어야 합니다",
-    "Failed to create user, user information is invalid: %s": "사용자를 만들지 못했습니다. 사용자 정보가 잘못되었습니다: %s",
-    "Failed to login in: %s": "로그인에 실패했습니다.: %s",
-    "Invalid token": "유효하지 않은 토큰",
-    "State expected: %s, but got: %s": "예상한 상태: %s, 실제 상태: %s",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "제공자 계정: %s와 사용자 이름: %s (%s)은(는) 존재하지 않으며 %%s를 통해 새 계정으로 가입하는 것이 허용되지 않습니다. 다른 방법으로 가입하십시오",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "공급자 계정 %s과 사용자 이름 %s (%s)는 존재하지 않으며 새 계정으로 등록할 수 없습니다. IT 지원팀에 문의하십시오",
-    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "공급자 계정 %s과 사용자 이름 %s(%s)는 이미 다른 계정 %s(%s)에 연결되어 있습니다",
-    "The application: %s does not exist": "해당 애플리케이션(%s)이 존재하지 않습니다",
-    "The login method: login with password is not enabled for the application": "어플리케이션에서는 암호를 사용한 로그인 방법이 활성화되어 있지 않습니다",
-    "The provider: %s is not enabled for the application": "제공자 %s은(는) 응용 프로그램에서 활성화되어 있지 않습니다",
-    "Unauthorized operation": "무단 조작",
-    "Unknown authentication type (not password or provider), form = %s": "알 수 없는 인증 유형(암호 또는 공급자가 아님), 폼 = %s"
+    "Challenge method should be S256": "Challenge method should be S256",
+    "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
+    "Failed to login in: %s": "Failed to login in: %s",
+    "Invalid token": "Invalid token",
+    "State expected: %s, but got: %s": "State expected: %s, but got: %s",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
+    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
+    "The application: %s does not exist": "The application: %s does not exist",
+    "The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
+    "The provider type: %s is not supported": "The provider type: %s is not supported",
+    "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "Turing test failed.": "Turing test failed.",
+    "Unauthorized operation": "Unauthorized operation",
+    "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
   },
   "cas": {
-    "Service %s and %s do not match": "서비스 %s와 %s는 일치하지 않습니다"
+    "Service %s and %s do not match": "Service %s and %s do not match"
   },
   "check": {
-    "Affiliation cannot be blank": "소속은 비워 둘 수 없습니다",
-    "DisplayName cannot be blank": "DisplayName는 비어 있을 수 없습니다",
-    "DisplayName is not valid real name": "DisplayName는 유효한 실제 이름이 아닙니다",
-    "Email already exists": "이메일이 이미 존재합니다",
-    "Email cannot be empty": "이메일은 비어 있을 수 없습니다",
-    "Email is invalid": "이메일이 유효하지 않습니다",
-    "Empty username.": "빈 사용자 이름.",
-    "FirstName cannot be blank": "이름은 공백일 수 없습니다",
-    "LastName cannot be blank": "성은 비어 있을 수 없습니다",
-    "Ldap user name or password incorrect": "LDAP 사용자 이름 또는 암호가 잘못되었습니다",
-    "Multiple accounts with same uid, please check your ldap server": "동일한 UID를 가진 여러 계정이 있습니다. LDAP 서버를 확인해주세요",
-    "Organization does not exist": "조직은 존재하지 않습니다",
-    "Password must have at least 6 characters": "암호는 적어도 6자 이상이어야 합니다",
-    "Phone already exists": "전화기는 이미 존재합니다",
-    "Phone cannot be empty": "전화는 비워 둘 수 없습니다",
-    "Phone number is invalid": "전화번호가 유효하지 않습니다",
-    "Session outdated, please login again": "세션이 만료되었습니다. 다시 로그인해주세요",
-    "The user is forbidden to sign in, please contact the administrator": "사용자는 로그인이 금지되어 있습니다. 관리자에게 문의하십시오",
-    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "사용자 이름은 알파벳, 숫자, 밑줄 또는 하이픈만 포함할 수 있으며, 연속된 하이픈 또는 밑줄을 가질 수 없으며, 하이픈 또는 밑줄로 시작하거나 끝날 수 없습니다.",
-    "Username already exists": "사용자 이름이 이미 존재합니다",
-    "Username cannot be an email address": "사용자 이름은 이메일 주소가 될 수 없습니다",
-    "Username cannot contain white spaces": "사용자 이름에는 공백이 포함될 수 없습니다",
-    "Username cannot start with a digit": "사용자 이름은 숫자로 시작할 수 없습니다",
-    "Username is too long (maximum is 39 characters).": "사용자 이름이 너무 깁니다 (최대 39자).",
-    "Username must have at least 2 characters": "사용자 이름은 적어도 2개의 문자가 있어야 합니다",
-    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "올바르지 않은 비밀번호나 코드를 여러 번 입력했습니다. %d분 동안 기다리신 후 다시 시도해주세요",
-    "Your region is not allow to signup by phone": "당신의 지역은 전화로 가입할 수 없습니다",
-    "password or code is incorrect, you have %d remaining chances": "암호 또는 코드가 올바르지 않습니다. %d번의 기회가 남아 있습니다",
-    "unsupported password type: %s": "지원되지 않는 암호 유형: %s"
+    "Affiliation cannot be blank": "Affiliation cannot be blank",
+    "DisplayName cannot be blank": "DisplayName cannot be blank",
+    "DisplayName is not valid real name": "DisplayName is not valid real name",
+    "Email already exists": "Email already exists",
+    "Email cannot be empty": "Email cannot be empty",
+    "Email is invalid": "Email is invalid",
+    "Empty username.": "Empty username.",
+    "FirstName cannot be blank": "FirstName cannot be blank",
+    "LastName cannot be blank": "LastName cannot be blank",
+    "Ldap user name or password incorrect": "Ldap user name or password incorrect",
+    "Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
+    "Organization does not exist": "Organization does not exist",
+    "Password must have at least 6 characters": "Password must have at least 6 characters",
+    "Phone already exists": "Phone already exists",
+    "Phone cannot be empty": "Phone cannot be empty",
+    "Phone number is invalid": "Phone number is invalid",
+    "Session outdated, please login again": "Session outdated, please login again",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
+    "Username already exists": "Username already exists",
+    "Username cannot be an email address": "Username cannot be an email address",
+    "Username cannot contain white spaces": "Username cannot contain white spaces",
+    "Username cannot start with a digit": "Username cannot start with a digit",
+    "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
+    "Username must have at least 2 characters": "Username must have at least 2 characters",
+    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
+    "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
+    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "unsupported password type: %s": "unsupported password type: %s"
   },
   "general": {
-    "Missing parameter": "누락된 매개변수",
-    "Please login first": "먼저 로그인 하십시오",
-    "The user: %s doesn't exist": "사용자 %s는 존재하지 않습니다",
-    "don't support captchaProvider: ": "CaptchaProvider를 지원하지 마세요"
+    "Missing parameter": "Missing parameter",
+    "Please login first": "Please login first",
+    "The user: %s doesn't exist": "The user: %s doesn't exist",
+    "don't support captchaProvider: ": "don't support captchaProvider: "
   },
   "ldap": {
-    "Ldap server exist": "LDAP 서버가 존재합니다"
+    "Ldap server exist": "Ldap server exist"
   },
   "link": {
-    "Please link first": "먼저 링크해주세요",
-    "This application has no providers": "이 애플리케이션에는 제공자가 없습니다",
-    "This application has no providers of type": "이 응용 프로그램은 타입의 공급자가 없습니다",
-    "This provider can't be unlinked": "이 공급자는 연결이 해제될 수 없습니다",
-    "You are not the global admin, you can't unlink other users": "당신은 전역 관리자가 아니므로 다른 사용자와의 연결을 해제할 수 없습니다",
-    "You can't unlink yourself, you are not a member of any application": "당신은 어떤 애플리케이션의 회원이 아니기 때문에 스스로 링크를 해제할 수 없습니다"
+    "Please link first": "Please link first",
+    "This application has no providers": "This application has no providers",
+    "This application has no providers of type": "This application has no providers of type",
+    "This provider can't be unlinked": "This provider can't be unlinked",
+    "You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
+    "You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
   },
   "organization": {
-    "Only admin can modify the %s.": "관리자만 %s을(를) 수정할 수 있습니다.",
-    "The %s is immutable.": "%s 는 변경할 수 없습니다.",
-    "Unknown modify rule %s.": "미확인 수정 규칙 %s."
+    "Only admin can modify the %s.": "Only admin can modify the %s.",
+    "The %s is immutable.": "The %s is immutable.",
+    "Unknown modify rule %s.": "Unknown modify rule %s."
   },
   "provider": {
-    "Invalid application id": "잘못된 애플리케이션 ID입니다",
-    "the provider: %s does not exist": "제공자 %s가 존재하지 않습니다"
+    "Invalid application id": "Invalid application id",
+    "the provider: %s does not exist": "the provider: %s does not exist"
   },
   "resource": {
-    "User is nil for tag: avatar": "사용자는 아바타 태그에 대해 nil입니다",
-    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "사용자 이름 또는 전체 파일 경로가 비어 있습니다: 사용자 이름 = %s, 전체 파일 경로 = %s"
+    "User is nil for tag: avatar": "User is nil for tag: avatar",
+    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
   },
   "saml": {
-    "Application %s not found": "어플리케이션 %s을(를) 찾을 수 없습니다"
+    "Application %s not found": "Application %s not found"
   },
   "saml_sp": {
-    "provider %s's category is not SAML": "제공 업체 %s의 카테고리는 SAML이 아닙니다"
+    "provider %s's category is not SAML": "provider %s's category is not SAML"
   },
   "service": {
-    "Empty parameters for emailForm: %v": "이메일 형식의 빈 매개 변수: %v",
-    "Invalid Email receivers: %s": "잘못된 이메일 수신자: %s",
-    "Invalid phone receivers: %s": "잘못된 전화 수신자: %s"
+    "Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
+    "Invalid Email receivers: %s": "Invalid Email receivers: %s",
+    "Invalid phone receivers: %s": "Invalid phone receivers: %s"
   },
   "storage": {
-    "The objectKey: %s is not allowed": "객체 키 : %s 는 허용되지 않습니다",
-    "The provider type: %s is not supported": "제공자 유형: %s은/는 지원되지 않습니다"
+    "The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
+    "The provider type: %s is not supported": "The provider type: %s is not supported"
   },
   "token": {
-    "Empty clientId or clientSecret": "클라이언트 ID 또는 클라이언트 비밀번호가 비어 있습니다",
-    "Grant_type: %s is not supported in this application": "그랜트 유형: %s은(는) 이 어플리케이션에서 지원되지 않습니다",
-    "Invalid application or wrong clientSecret": "잘못된 어플리케이션 또는 올바르지 않은 클라이언트 시크릿입니다",
-    "Invalid client_id": "잘못된 클라이언트 ID입니다",
-    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "허용된 Redirect URI 목록에서 %s이(가) 존재하지 않습니다",
-    "Token not found, invalid accessToken": "토큰을 찾을 수 없습니다. 잘못된 액세스 토큰입니다"
+    "Empty clientId or clientSecret": "Empty clientId or clientSecret",
+    "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
+    "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
+    "Invalid client_id": "Invalid client_id",
+    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
+    "Token not found, invalid accessToken": "Token not found, invalid accessToken"
   },
   "user": {
-    "Display name cannot be empty": "디스플레이 이름은 비어 있을 수 없습니다",
-    "New password cannot contain blank space.": "새 비밀번호에는 공백이 포함될 수 없습니다.",
-    "New password must have at least 6 characters": "새로운 비밀번호는 최소 6자 이상이어야 합니다"
+    "Display name cannot be empty": "Display name cannot be empty",
+    "New password cannot contain blank space.": "New password cannot contain blank space.",
+    "New password must have at least 6 characters": "New password must have at least 6 characters"
   },
   "user_upload": {
-    "Failed to import users": "사용자 가져오기를 실패했습니다"
+    "Failed to import users": "Failed to import users"
   },
   "util": {
-    "No application is found for userId: %s": "어플리케이션을 찾을 수 없습니다. userId: %s",
-    "No provider for category: %s is found for application: %s": "어플리케이션 %s에서 %s 카테고리를 위한 공급자가 찾을 수 없습니다",
-    "The provider: %s is not found": "제공자: %s를 찾을 수 없습니다"
+    "No application is found for userId: %s": "No application is found for userId: %s",
+    "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
+    "The provider: %s is not found": "The provider: %s is not found"
   },
   "verification": {
-    "Code has not been sent yet!": "코드는 아직 전송되지 않았습니다!",
-    "Invalid captcha provider.": "잘못된 captcha 제공자입니다.",
-    "Phone number is invalid in your region %s": "전화 번호가 당신의 지역 %s에서 유효하지 않습니다",
-    "Turing test failed.": "튜링 테스트 실패.",
-    "Unable to get the email modify rule.": "이메일 수정 규칙을 가져올 수 없습니다.",
-    "Unable to get the phone modify rule.": "전화 수정 규칙을 가져올 수 없습니다.",
-    "Unknown type": "알 수 없는 유형",
-    "Wrong parameter": "잘못된 매개 변수입니다",
-    "Wrong verification code!": "잘못된 인증 코드입니다!",
-    "You should verify your code in %d min!": "당신은 %d분 안에 코드를 검증해야 합니다!",
-    "the user does not exist, please sign up first": "사용자가 존재하지 않습니다. 먼저 회원 가입 해주세요"
+    "Code has not been sent yet!": "Code has not been sent yet!",
+    "Email is invalid": "Email is invalid",
+    "Invalid captcha provider.": "Invalid captcha provider.",
+    "Organization does not exist": "Organization does not exist",
+    "Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
+    "Turing test failed.": "Turing test failed.",
+    "Unable to get the email modify rule.": "Unable to get the email modify rule.",
+    "Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
+    "Unknown type": "Unknown type",
+    "Wrong parameter": "Wrong parameter",
+    "Wrong verification code!": "Wrong verification code!",
+    "You should verify your code in %d min!": "You should verify your code in %d min!",
+    "the user does not exist, please sign up first": "the user does not exist, please sign up first"
   },
   "webauthn": {
-    "Found no credentials for this user": "이 사용자의 자격 증명을 찾을 수 없습니다",
-    "Please call WebAuthnSigninBegin first": "WebAuthnSigninBegin을 먼저 호출해주세요"
+    "Found no credentials for this user": "Found no credentials for this user",
+    "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
   }
 }

i18n/locales/ru/data.json

@@ -1,140 +1,146 @@
 {
   "account": {
-    "Failed to add user": "Не удалось добавить пользователя",
-    "Get init score failed, error: %w": "Не удалось получить исходный балл, ошибка: %w",
-    "Please sign out first": "Пожалуйста, сначала выйдите из системы",
-    "The application does not allow to sign up new account": "Приложение не позволяет зарегистрироваться новому аккаунту"
+    "Get init score failed, error: %w": "Get init score failed, error: %w",
+    "Invalid information": "Invalid information",
+    "Please sign out first before signing in": "Please sign out first before signing in",
+    "Please sign out first before signing up": "Please sign out first before signing up",
+    "The application does not allow to sign up new account": "The application does not allow to sign up new account"
   },
   "auth": {
-    "Challenge method should be S256": "Метод испытаний должен быть S256",
-    "Failed to create user, user information is invalid: %s": "Не удалось создать пользователя, информация о пользователе недействительна: %s",
-    "Failed to login in: %s": "Не удалось войти в систему: %s",
-    "Invalid token": "Недействительный токен",
-    "State expected: %s, but got: %s": "Ожидался статус: %s, но получен: %s",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "Аккаунт провайдера: %s и имя пользователя: %s (%s) не существует и не может быть зарегистрирован через %%s, пожалуйста, используйте другой способ регистрации",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "Аккаунт для провайдера: %s и имя пользователя: %s (%s) не существует и не может быть зарегистрирован как новый аккаунт. Пожалуйста, обратитесь в службу поддержки IT",
-    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "Аккаунт поставщика: %s и имя пользователя: %s (%s) уже связаны с другим аккаунтом: %s (%s)",
-    "The application: %s does not exist": "Приложение: %s не существует",
-    "The login method: login with password is not enabled for the application": "Метод входа: вход с паролем не включен для приложения",
-    "The provider: %s is not enabled for the application": "Провайдер: %s не включен для приложения",
-    "Unauthorized operation": "Несанкционированная операция",
-    "Unknown authentication type (not password or provider), form = %s": "Неизвестный тип аутентификации (не пароль и не провайдер), форма = %s"
+    "Challenge method should be S256": "Challenge method should be S256",
+    "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
+    "Failed to login in: %s": "Failed to login in: %s",
+    "Invalid token": "Invalid token",
+    "State expected: %s, but got: %s": "State expected: %s, but got: %s",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
+    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
+    "The application: %s does not exist": "The application: %s does not exist",
+    "The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
+    "The provider type: %s is not supported": "The provider type: %s is not supported",
+    "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "Turing test failed.": "Turing test failed.",
+    "Unauthorized operation": "Unauthorized operation",
+    "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
   },
   "cas": {
-    "Service %s and %s do not match": "Сервисы %s и %s не совпадают"
+    "Service %s and %s do not match": "Service %s and %s do not match"
   },
   "check": {
-    "Affiliation cannot be blank": "Принадлежность не может быть пустым значением",
-    "DisplayName cannot be blank": "Имя отображения не может быть пустым",
-    "DisplayName is not valid real name": "DisplayName не является действительным именем",
-    "Email already exists": "Электронная почта уже существует",
-    "Email cannot be empty": "Электронная почта не может быть пустой",
-    "Email is invalid": "Адрес электронной почты недействительный",
-    "Empty username.": "Пустое имя пользователя.",
-    "FirstName cannot be blank": "Имя не может быть пустым",
-    "LastName cannot be blank": "Фамилия не может быть пустой",
-    "Ldap user name or password incorrect": "Неправильное имя пользователя или пароль Ldap",
-    "Multiple accounts with same uid, please check your ldap server": "Множественные учетные записи с тем же UID. Пожалуйста, проверьте свой сервер LDAP",
-    "Organization does not exist": "Организация не существует",
-    "Password must have at least 6 characters": "Пароль должен содержать не менее 6 символов",
-    "Phone already exists": "Телефон уже существует",
-    "Phone cannot be empty": "Телефон не может быть пустым",
-    "Phone number is invalid": "Номер телефона является недействительным",
-    "Session outdated, please login again": "Сессия устарела, пожалуйста, войдите снова",
-    "The user is forbidden to sign in, please contact the administrator": "Пользователю запрещен вход, пожалуйста, обратитесь к администратору",
-    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "Имя пользователя может состоять только из буквенно-цифровых символов, нижних подчеркиваний или дефисов, не может содержать последовательные дефисы или подчеркивания, а также не может начинаться или заканчиваться на дефис или подчеркивание.",
-    "Username already exists": "Имя пользователя уже существует",
-    "Username cannot be an email address": "Имя пользователя не может быть адресом электронной почты",
-    "Username cannot contain white spaces": "Имя пользователя не может содержать пробелы",
-    "Username cannot start with a digit": "Имя пользователя не может начинаться с цифры",
-    "Username is too long (maximum is 39 characters).": "Имя пользователя слишком длинное (максимальная длина - 39 символов).",
-    "Username must have at least 2 characters": "Имя пользователя должно содержать не менее 2 символов",
-    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "Вы ввели неправильный пароль или код слишком много раз, пожалуйста, подождите %d минут и попробуйте снова",
-    "Your region is not allow to signup by phone": "Ваш регион не разрешает регистрацию по телефону",
-    "password or code is incorrect, you have %d remaining chances": "Неправильный пароль или код, у вас осталось %d попыток",
-    "unsupported password type: %s": "неподдерживаемый тип пароля: %s"
+    "Affiliation cannot be blank": "Affiliation cannot be blank",
+    "DisplayName cannot be blank": "DisplayName cannot be blank",
+    "DisplayName is not valid real name": "DisplayName is not valid real name",
+    "Email already exists": "Email already exists",
+    "Email cannot be empty": "Email cannot be empty",
+    "Email is invalid": "Email is invalid",
+    "Empty username.": "Empty username.",
+    "FirstName cannot be blank": "FirstName cannot be blank",
+    "LastName cannot be blank": "LastName cannot be blank",
+    "Ldap user name or password incorrect": "Ldap user name or password incorrect",
+    "Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
+    "Organization does not exist": "Organization does not exist",
+    "Password must have at least 6 characters": "Password must have at least 6 characters",
+    "Phone already exists": "Phone already exists",
+    "Phone cannot be empty": "Phone cannot be empty",
+    "Phone number is invalid": "Phone number is invalid",
+    "Session outdated, please login again": "Session outdated, please login again",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
+    "Username already exists": "Username already exists",
+    "Username cannot be an email address": "Username cannot be an email address",
+    "Username cannot contain white spaces": "Username cannot contain white spaces",
+    "Username cannot start with a digit": "Username cannot start with a digit",
+    "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
+    "Username must have at least 2 characters": "Username must have at least 2 characters",
+    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
+    "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
+    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "unsupported password type: %s": "unsupported password type: %s"
   },
   "general": {
-    "Missing parameter": "Отсутствующий параметр",
-    "Please login first": "Пожалуйста, сначала войдите в систему",
-    "The user: %s doesn't exist": "Пользователь %s не существует",
-    "don't support captchaProvider: ": "не поддерживайте captchaProvider:"
+    "Missing parameter": "Missing parameter",
+    "Please login first": "Please login first",
+    "The user: %s doesn't exist": "The user: %s doesn't exist",
+    "don't support captchaProvider: ": "don't support captchaProvider: "
   },
   "ldap": {
-    "Ldap server exist": "LDAP-сервер существует"
+    "Ldap server exist": "Ldap server exist"
   },
   "link": {
-    "Please link first": "Пожалуйста, сначала установите ссылку",
-    "This application has no providers": "Это приложение не имеет провайдеров",
-    "This application has no providers of type": "Это приложение не имеет провайдеров данного типа",
-    "This provider can't be unlinked": "Этот провайдер не может быть отсоединен",
-    "You are not the global admin, you can't unlink other users": "Вы не являетесь глобальным администратором, вы не можете отсоединять других пользователей",
-    "You can't unlink yourself, you are not a member of any application": "Вы не можете отвязаться, так как вы не являетесь участником никакого приложения"
+    "Please link first": "Please link first",
+    "This application has no providers": "This application has no providers",
+    "This application has no providers of type": "This application has no providers of type",
+    "This provider can't be unlinked": "This provider can't be unlinked",
+    "You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
+    "You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
   },
   "organization": {
-    "Only admin can modify the %s.": "Только администратор может изменять %s.",
-    "The %s is immutable.": "%s неизменяемый.",
-    "Unknown modify rule %s.": "Неизвестное изменение правила %s."
+    "Only admin can modify the %s.": "Only admin can modify the %s.",
+    "The %s is immutable.": "The %s is immutable.",
+    "Unknown modify rule %s.": "Unknown modify rule %s."
   },
   "provider": {
-    "Invalid application id": "Неверный идентификатор приложения",
-    "the provider: %s does not exist": "провайдер: %s не существует"
+    "Invalid application id": "Invalid application id",
+    "the provider: %s does not exist": "the provider: %s does not exist"
   },
   "resource": {
-    "User is nil for tag: avatar": "Пользователь равен нулю для тега: аватар",
-    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Имя пользователя или полный путь к файлу пусты: имя_пользователя = %s, полный_путь_к_файлу = %s"
+    "User is nil for tag: avatar": "User is nil for tag: avatar",
+    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
   },
   "saml": {
-    "Application %s not found": "Приложение %s не найдено"
+    "Application %s not found": "Application %s not found"
   },
   "saml_sp": {
-    "provider %s's category is not SAML": "категория провайдера %s не является SAML"
+    "provider %s's category is not SAML": "provider %s's category is not SAML"
   },
   "service": {
-    "Empty parameters for emailForm: %v": "Пустые параметры для emailForm: %v",
-    "Invalid Email receivers: %s": "Некорректные получатели электронной почты: %s",
-    "Invalid phone receivers: %s": "Некорректные получатели телефонных звонков: %s"
+    "Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
+    "Invalid Email receivers: %s": "Invalid Email receivers: %s",
+    "Invalid phone receivers: %s": "Invalid phone receivers: %s"
   },
   "storage": {
-    "The objectKey: %s is not allowed": "Объект «objectKey: %s» не разрешен",
-    "The provider type: %s is not supported": "Тип поставщика: %s не поддерживается"
+    "The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
+    "The provider type: %s is not supported": "The provider type: %s is not supported"
   },
   "token": {
-    "Empty clientId or clientSecret": "Пустой идентификатор клиента или секрет клиента",
-    "Grant_type: %s is not supported in this application": "Тип предоставления: %s не поддерживается в данном приложении",
-    "Invalid application or wrong clientSecret": "Недействительное приложение или неправильный clientSecret",
-    "Invalid client_id": "Недействительный идентификатор клиента",
-    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "URI перенаправления: %s не существует в списке разрешенных URI перенаправления",
-    "Token not found, invalid accessToken": "Токен не найден, недействительный accessToken"
+    "Empty clientId or clientSecret": "Empty clientId or clientSecret",
+    "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
+    "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
+    "Invalid client_id": "Invalid client_id",
+    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
+    "Token not found, invalid accessToken": "Token not found, invalid accessToken"
   },
   "user": {
-    "Display name cannot be empty": "Отображаемое имя не может быть пустым",
-    "New password cannot contain blank space.": "Новый пароль не может содержать пробелы.",
-    "New password must have at least 6 characters": "Новый пароль должен содержать не менее 6 символов"
+    "Display name cannot be empty": "Display name cannot be empty",
+    "New password cannot contain blank space.": "New password cannot contain blank space.",
+    "New password must have at least 6 characters": "New password must have at least 6 characters"
   },
   "user_upload": {
-    "Failed to import users": "Не удалось импортировать пользователей"
+    "Failed to import users": "Failed to import users"
   },
   "util": {
-    "No application is found for userId: %s": "Не найдено заявки для пользователя с идентификатором: %s",
-    "No provider for category: %s is found for application: %s": "Нет поставщика для категории: %s для приложения: %s",
-    "The provider: %s is not found": "Поставщик: %s не найден"
+    "No application is found for userId: %s": "No application is found for userId: %s",
+    "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
+    "The provider: %s is not found": "The provider: %s is not found"
   },
   "verification": {
-    "Code has not been sent yet!": "Код еще не был отправлен!",
-    "Invalid captcha provider.": "Недействительный поставщик CAPTCHA.",
-    "Phone number is invalid in your region %s": "Номер телефона недействителен в вашем регионе %s",
-    "Turing test failed.": "Тест Тьюринга не удался.",
-    "Unable to get the email modify rule.": "Невозможно получить правило изменения электронной почты.",
-    "Unable to get the phone modify rule.": "Невозможно получить правило изменения телефона.",
-    "Unknown type": "Неизвестный тип",
-    "Wrong parameter": "Неправильный параметр",
-    "Wrong verification code!": "Неправильный код подтверждения!",
-    "You should verify your code in %d min!": "Вы должны проверить свой код через %d минут!",
-    "the user does not exist, please sign up first": "Пользователь не существует, пожалуйста, сначала зарегистрируйтесь"
+    "Code has not been sent yet!": "Code has not been sent yet!",
+    "Email is invalid": "Email is invalid",
+    "Invalid captcha provider.": "Invalid captcha provider.",
+    "Organization does not exist": "Organization does not exist",
+    "Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
+    "Turing test failed.": "Turing test failed.",
+    "Unable to get the email modify rule.": "Unable to get the email modify rule.",
+    "Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
+    "Unknown type": "Unknown type",
+    "Wrong parameter": "Wrong parameter",
+    "Wrong verification code!": "Wrong verification code!",
+    "You should verify your code in %d min!": "You should verify your code in %d min!",
+    "the user does not exist, please sign up first": "the user does not exist, please sign up first"
   },
   "webauthn": {
-    "Found no credentials for this user": "Не найдено учетных данных для этого пользователя",
-    "Please call WebAuthnSigninBegin first": "Пожалуйста, сначала вызовите WebAuthnSigninBegin"
+    "Found no credentials for this user": "Found no credentials for this user",
+    "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
   }
 }

i18n/locales/vi/data.json

@@ -1,140 +1,146 @@
 {
   "account": {
-    "Failed to add user": "Không thể thêm người dùng",
-    "Get init score failed, error: %w": "Lấy điểm khởi đầu thất bại, lỗi: %w",
-    "Please sign out first": "Vui lòng đăng xuất trước",
-    "The application does not allow to sign up new account": "Ứng dụng không cho phép đăng ký tài khoản mới"
+    "Get init score failed, error: %w": "Get init score failed, error: %w",
+    "Invalid information": "Invalid information",
+    "Please sign out first before signing in": "Please sign out first before signing in",
+    "Please sign out first before signing up": "Please sign out first before signing up",
+    "The application does not allow to sign up new account": "The application does not allow to sign up new account"
   },
   "auth": {
-    "Challenge method should be S256": "Phương pháp thách thức nên là S256",
-    "Failed to create user, user information is invalid: %s": "Không thể tạo người dùng, thông tin người dùng không hợp lệ: %s",
-    "Failed to login in: %s": "Đăng nhập không thành công: %s",
-    "Invalid token": "Mã thông báo không hợp lệ",
-    "State expected: %s, but got: %s": "Trạng thái dự kiến: %s, nhưng nhận được: %s",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "Tài khoản cho nhà cung cấp: %s và tên người dùng: %s (%s) không tồn tại và không được phép đăng ký làm tài khoản mới qua %%s, vui lòng sử dụng cách khác để đăng ký",
-    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "Tài khoản cho nhà cung cấp: %s và tên người dùng: %s (%s) không tồn tại và không được phép đăng ký như một tài khoản mới, vui lòng liên hệ với bộ phận hỗ trợ công nghệ thông tin của bạn",
-    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "Tài khoản cho nhà cung cấp: %s và tên người dùng: %s (%s) đã được liên kết với tài khoản khác: %s (%s)",
-    "The application: %s does not exist": "Ứng dụng: %s không tồn tại",
-    "The login method: login with password is not enabled for the application": "Phương thức đăng nhập: đăng nhập bằng mật khẩu không được kích hoạt cho ứng dụng",
-    "The provider: %s is not enabled for the application": "Nhà cung cấp: %s không được kích hoạt cho ứng dụng",
-    "Unauthorized operation": "Hoạt động không được ủy quyền",
-    "Unknown authentication type (not password or provider), form = %s": "Loại xác thực không xác định (không phải mật khẩu hoặc nhà cung cấp), biểu mẫu = %s"
+    "Challenge method should be S256": "Challenge method should be S256",
+    "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s",
+    "Failed to login in: %s": "Failed to login in: %s",
+    "Invalid token": "Invalid token",
+    "State expected: %s, but got: %s": "State expected: %s, but got: %s",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up",
+    "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support",
+    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)",
+    "The application: %s does not exist": "The application: %s does not exist",
+    "The login method: login with password is not enabled for the application": "The login method: login with password is not enabled for the application",
+    "The provider type: %s is not supported": "The provider type: %s is not supported",
+    "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "Turing test failed.": "Turing test failed.",
+    "Unauthorized operation": "Unauthorized operation",
+    "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s"
   },
   "cas": {
-    "Service %s and %s do not match": "Dịch sang tiếng Việt: Dịch vụ %s và %s không khớp"
+    "Service %s and %s do not match": "Service %s and %s do not match"
   },
   "check": {
-    "Affiliation cannot be blank": "Tình trạng liên kết không thể để trống",
-    "DisplayName cannot be blank": "Tên hiển thị không thể để trống",
-    "DisplayName is not valid real name": "DisplayName không phải là tên thật hợp lệ",
-    "Email already exists": "Email đã tồn tại",
-    "Email cannot be empty": "Email không thể để trống",
-    "Email is invalid": "Địa chỉ email không hợp lệ",
-    "Empty username.": "Tên đăng nhập trống.",
-    "FirstName cannot be blank": "Tên không được để trống",
-    "LastName cannot be blank": "Họ không thể để trống",
-    "Ldap user name or password incorrect": "Tên người dùng hoặc mật khẩu Ldap không chính xác",
-    "Multiple accounts with same uid, please check your ldap server": "Nhiều tài khoản với cùng một uid, vui lòng kiểm tra máy chủ ldap của bạn",
-    "Organization does not exist": "Tổ chức không tồn tại",
-    "Password must have at least 6 characters": "Mật khẩu phải ít nhất 6 ký tự",
-    "Phone already exists": "Điện thoại đã tồn tại",
-    "Phone cannot be empty": "Điện thoại không thể để trống",
-    "Phone number is invalid": "Số điện thoại không hợp lệ",
-    "Session outdated, please login again": "Phiên làm việc hết hạn, vui lòng đăng nhập lại",
-    "The user is forbidden to sign in, please contact the administrator": "Người dùng bị cấm đăng nhập, vui lòng liên hệ với quản trị viên",
-    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "Tên người dùng chỉ có thể chứa các ký tự chữ và số, gạch dưới hoặc gạch ngang, không được có hai ký tự gạch dưới hoặc gạch ngang liền kề và không được bắt đầu hoặc kết thúc bằng dấu gạch dưới hoặc gạch ngang.",
-    "Username already exists": "Tên đăng nhập đã tồn tại",
-    "Username cannot be an email address": "Tên người dùng không thể là địa chỉ email",
-    "Username cannot contain white spaces": "Tên người dùng không thể chứa khoảng trắng",
-    "Username cannot start with a digit": "Tên người dùng không thể bắt đầu bằng chữ số",
-    "Username is too long (maximum is 39 characters).": "Tên đăng nhập quá dài (tối đa là 39 ký tự).",
-    "Username must have at least 2 characters": "Tên đăng nhập phải có ít nhất 2 ký tự",
-    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "Bạn đã nhập sai mật khẩu hoặc mã quá nhiều lần, vui lòng đợi %d phút và thử lại",
-    "Your region is not allow to signup by phone": "Vùng của bạn không được phép đăng ký bằng điện thoại",
-    "password or code is incorrect, you have %d remaining chances": "Mật khẩu hoặc mã không chính xác, bạn còn %d lần cơ hội",
-    "unsupported password type: %s": "Loại mật khẩu không được hỗ trợ: %s"
+    "Affiliation cannot be blank": "Affiliation cannot be blank",
+    "DisplayName cannot be blank": "DisplayName cannot be blank",
+    "DisplayName is not valid real name": "DisplayName is not valid real name",
+    "Email already exists": "Email already exists",
+    "Email cannot be empty": "Email cannot be empty",
+    "Email is invalid": "Email is invalid",
+    "Empty username.": "Empty username.",
+    "FirstName cannot be blank": "FirstName cannot be blank",
+    "LastName cannot be blank": "LastName cannot be blank",
+    "Ldap user name or password incorrect": "Ldap user name or password incorrect",
+    "Multiple accounts with same uid, please check your ldap server": "Multiple accounts with same uid, please check your ldap server",
+    "Organization does not exist": "Organization does not exist",
+    "Password must have at least 6 characters": "Password must have at least 6 characters",
+    "Phone already exists": "Phone already exists",
+    "Phone cannot be empty": "Phone cannot be empty",
+    "Phone number is invalid": "Phone number is invalid",
+    "Session outdated, please login again": "Session outdated, please login again",
+    "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator",
+    "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.",
+    "Username already exists": "Username already exists",
+    "Username cannot be an email address": "Username cannot be an email address",
+    "Username cannot contain white spaces": "Username cannot contain white spaces",
+    "Username cannot start with a digit": "Username cannot start with a digit",
+    "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).",
+    "Username must have at least 2 characters": "Username must have at least 2 characters",
+    "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again",
+    "Your region is not allow to signup by phone": "Your region is not allow to signup by phone",
+    "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances",
+    "unsupported password type: %s": "unsupported password type: %s"
   },
   "general": {
-    "Missing parameter": "Thiếu tham số",
-    "Please login first": "Vui lòng đăng nhập trước",
-    "The user: %s doesn't exist": "Người dùng: %s không tồn tại",
-    "don't support captchaProvider: ": "Không hỗ trợ captchaProvider:"
+    "Missing parameter": "Missing parameter",
+    "Please login first": "Please login first",
+    "The user: %s doesn't exist": "The user: %s doesn't exist",
+    "don't support captchaProvider: ": "don't support captchaProvider: "
   },
   "ldap": {
-    "Ldap server exist": "Máy chủ Ldap tồn tại"
+    "Ldap server exist": "Ldap server exist"
   },
   "link": {
-    "Please link first": "Vui lòng kết nối trước tiên",
-    "This application has no providers": "Ứng dụng này không có nhà cung cấp",
-    "This application has no providers of type": "Ứng dụng này không có nhà cung cấp loại nào",
-    "This provider can't be unlinked": "Nhà cung cấp này không thể được tách ra",
-    "You are not the global admin, you can't unlink other users": "Bạn không phải là quản trị viên toàn cầu, bạn không thể hủy liên kết người dùng khác",
-    "You can't unlink yourself, you are not a member of any application": "Bạn không thể hủy liên kết của mình, bởi vì bạn không phải là thành viên của bất kỳ ứng dụng nào"
+    "Please link first": "Please link first",
+    "This application has no providers": "This application has no providers",
+    "This application has no providers of type": "This application has no providers of type",
+    "This provider can't be unlinked": "This provider can't be unlinked",
+    "You are not the global admin, you can't unlink other users": "You are not the global admin, you can't unlink other users",
+    "You can't unlink yourself, you are not a member of any application": "You can't unlink yourself, you are not a member of any application"
   },
   "organization": {
-    "Only admin can modify the %s.": "Chỉ những người quản trị mới có thể sửa đổi %s.",
-    "The %s is immutable.": "%s không thể thay đổi được.",
-    "Unknown modify rule %s.": "Quy tắc thay đổi không xác định %s."
+    "Only admin can modify the %s.": "Only admin can modify the %s.",
+    "The %s is immutable.": "The %s is immutable.",
+    "Unknown modify rule %s.": "Unknown modify rule %s."
   },
   "provider": {
-    "Invalid application id": "Sai ID ứng dụng",
-    "the provider: %s does not exist": "Nhà cung cấp: %s không tồn tại"
+    "Invalid application id": "Invalid application id",
+    "the provider: %s does not exist": "the provider: %s does not exist"
   },
   "resource": {
-    "User is nil for tag: avatar": "Người dùng không có giá trị cho thẻ: hình đại diện",
-    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Tên người dùng hoặc đường dẫn tệp đầy đủ trống: tên người dùng = %s, đường dẫn tệp đầy đủ = %s"
+    "User is nil for tag: avatar": "User is nil for tag: avatar",
+    "Username or fullFilePath is empty: username = %s, fullFilePath = %s": "Username or fullFilePath is empty: username = %s, fullFilePath = %s"
   },
   "saml": {
-    "Application %s not found": "Ứng dụng %s không tìm thấy"
+    "Application %s not found": "Application %s not found"
   },
   "saml_sp": {
-    "provider %s's category is not SAML": "Danh mục của nhà cung cấp %s không phải là SAML"
+    "provider %s's category is not SAML": "provider %s's category is not SAML"
   },
   "service": {
-    "Empty parameters for emailForm: %v": "Tham số trống cho emailForm: %v",
-    "Invalid Email receivers: %s": "Người nhận Email không hợp lệ: %s",
-    "Invalid phone receivers: %s": "Người nhận điện thoại không hợp lệ: %s"
+    "Empty parameters for emailForm: %v": "Empty parameters for emailForm: %v",
+    "Invalid Email receivers: %s": "Invalid Email receivers: %s",
+    "Invalid phone receivers: %s": "Invalid phone receivers: %s"
   },
   "storage": {
-    "The objectKey: %s is not allowed": "Khóa đối tượng: %s không được phép",
-    "The provider type: %s is not supported": "Loại nhà cung cấp: %s không được hỗ trợ"
+    "The objectKey: %s is not allowed": "The objectKey: %s is not allowed",
+    "The provider type: %s is not supported": "The provider type: %s is not supported"
   },
   "token": {
-    "Empty clientId or clientSecret": "ClientId hoặc clientSecret trống",
-    "Grant_type: %s is not supported in this application": "Loại cấp phép: %s không được hỗ trợ trong ứng dụng này",
-    "Invalid application or wrong clientSecret": "Đơn đăng ký không hợp lệ hoặc sai clientSecret",
-    "Invalid client_id": "Client_id không hợp lệ",
-    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Đường dẫn chuyển hướng URI: %s không tồn tại trong danh sách URI được phép chuyển hướng",
-    "Token not found, invalid accessToken": "Token không tìm thấy, accessToken không hợp lệ"
+    "Empty clientId or clientSecret": "Empty clientId or clientSecret",
+    "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application",
+    "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret",
+    "Invalid client_id": "Invalid client_id",
+    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "Redirect URI: %s doesn't exist in the allowed Redirect URI list",
+    "Token not found, invalid accessToken": "Token not found, invalid accessToken"
   },
   "user": {
-    "Display name cannot be empty": "Tên hiển thị không thể trống",
-    "New password cannot contain blank space.": "Mật khẩu mới không thể chứa dấu trắng.",
-    "New password must have at least 6 characters": "Mật khẩu mới phải có ít nhất 6 ký tự"
+    "Display name cannot be empty": "Display name cannot be empty",
+    "New password cannot contain blank space.": "New password cannot contain blank space.",
+    "New password must have at least 6 characters": "New password must have at least 6 characters"
   },
   "user_upload": {
-    "Failed to import users": "Không thể nhập người dùng"
+    "Failed to import users": "Failed to import users"
   },
   "util": {
-    "No application is found for userId: %s": "Không tìm thấy ứng dụng cho ID người dùng: %s",
-    "No provider for category: %s is found for application: %s": "Không tìm thấy nhà cung cấp cho danh mục: %s cho ứng dụng: %s",
-    "The provider: %s is not found": "Nhà cung cấp: %s không được tìm thấy"
+    "No application is found for userId: %s": "No application is found for userId: %s",
+    "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s",
+    "The provider: %s is not found": "The provider: %s is not found"
   },
   "verification": {
-    "Code has not been sent yet!": "Mã chưa được gửi đến!",
-    "Invalid captcha provider.": "Nhà cung cấp captcha không hợp lệ.",
-    "Phone number is invalid in your region %s": "Số điện thoại không hợp lệ trong vùng của bạn %s",
-    "Turing test failed.": "Kiểm định Turing thất bại.",
-    "Unable to get the email modify rule.": "Không thể lấy quy tắc sửa đổi email.",
-    "Unable to get the phone modify rule.": "Không thể thay đổi quy tắc trên điện thoại.",
-    "Unknown type": "Loại không xác định",
-    "Wrong parameter": "Tham số không đúng",
-    "Wrong verification code!": "Mã xác thực sai!",
-    "You should verify your code in %d min!": "Bạn nên kiểm tra mã của mình trong %d phút!",
-    "the user does not exist, please sign up first": "Người dùng không tồn tại, vui lòng đăng ký trước"
+    "Code has not been sent yet!": "Code has not been sent yet!",
+    "Email is invalid": "Email is invalid",
+    "Invalid captcha provider.": "Invalid captcha provider.",
+    "Organization does not exist": "Organization does not exist",
+    "Phone number is invalid in your region %s": "Phone number is invalid in your region %s",
+    "Turing test failed.": "Turing test failed.",
+    "Unable to get the email modify rule.": "Unable to get the email modify rule.",
+    "Unable to get the phone modify rule.": "Unable to get the phone modify rule.",
+    "Unknown type": "Unknown type",
+    "Wrong parameter": "Wrong parameter",
+    "Wrong verification code!": "Wrong verification code!",
+    "You should verify your code in %d min!": "You should verify your code in %d min!",
+    "the user does not exist, please sign up first": "the user does not exist, please sign up first"
   },
   "webauthn": {
-    "Found no credentials for this user": "Không tìm thấy thông tin xác thực cho người dùng này",
-    "Please call WebAuthnSigninBegin first": "Vui lòng gọi WebAuthnSigninBegin trước"
+    "Found no credentials for this user": "Found no credentials for this user",
+    "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first"
   }
 }

i18n/locales/zh/data.json

@@ -1,27 +1,31 @@
 {
   "account": {
-    "Failed to add user": "添加用户失败",
     "Get init score failed, error: %w": "初始化分数失败: %w",
-    "Please sign out first": "请先退出登录",
+    "Invalid information": "无效信息",
+    "Please sign out first before signing in": "请在登录前先退出登录",
+    "Please sign out first before signing up": "请在注册前先退出登录",
     "The application does not allow to sign up new account": "该应用不允许注册新用户"
   },
   "auth": {
-    "Challenge method should be S256": "Challenge方法应该为S256",
+    "Challenge method should be S256": "Challenge 方法应该为 S256",
     "Failed to create user, user information is invalid: %s": "创建用户失败，用户信息无效: %s",
     "Failed to login in: %s": "登录失败: %s",
     "Invalid token": "无效token",
     "State expected: %s, but got: %s": "期望状态为: %s, 实际状态为: %s",
     "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "提供商账户: %s 与用户名: %s (%s) 不存在且 不允许通过 %s 注册新账户, 请使用其他方式注册",
     "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "提供商账户: %s 与用户名: %s (%s) 不存在且 不允许注册新账户, 请联系IT支持",
-    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "提供商账户: %s与用户名: %s (%s)已经与其他账户绑定: %s (%s)",
-    "The application: %s does not exist": "应用%s不存在",
+    "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "提供商账户: %s 与用户名: %s (%s) 已经与其他账户绑定: %s (%s)",
+    "The application: %s does not exist": "应用 %s 不存在",
     "The login method: login with password is not enabled for the application": "该应用禁止采用密码登录方式",
-    "The provider: %s is not enabled for the application": "该应用的提供商: %s未被启用",
+    "The provider type: %s is not supported": "不支持该类型的提供商: %s",
+    "The provider: %s is not enabled for the application": "该应用的提供商: %s 未被启用",
+    "The user is forbidden to sign in, please contact the administrator": "该用户被禁止登录，请联系管理员",
+    "Turing test failed.": "人机验证失败",
     "Unauthorized operation": "未授权的操作",
     "Unknown authentication type (not password or provider), form = %s": "未知的认证类型（非密码或第三方提供商）：%s"
   },
   "cas": {
-    "Service %s and %s do not match": "服务%s与%s不匹配"
+    "Service %s and %s do not match": "服务 %s 与 %s 不匹配"
   },
   "check": {
     "Affiliation cannot be blank": "工作单位不可为空",
@@ -57,7 +61,7 @@
   "general": {
     "Missing parameter": "缺少参数",
     "Please login first": "请先登录",
-    "The user: %s doesn't exist": "用户: %s不存在",
+    "The user: %s doesn't exist": "用户: %s 不存在",
     "don't support captchaProvider: ": "不支持验证码提供商: "
   },
   "ldap": {
@@ -72,13 +76,13 @@
     "You can't unlink yourself, you are not a member of any application": "您无法自行解绑，您不是任何应用程序的成员"
   },
   "organization": {
-    "Only admin can modify the %s.": "仅允许管理员可以修改%s",
-    "The %s is immutable.": "%s是不可变的",
+    "Only admin can modify the %s.": "仅允许管理员可以修改 %s",
+    "The %s is immutable.": "%s 是不可变的",
     "Unknown modify rule %s.": "未知的修改规则: %s"
   },
   "provider": {
     "Invalid application id": "无效的应用ID",
-    "the provider: %s does not exist": "提供商: %s不存在"
+    "the provider: %s does not exist": "提供商: %s 不存在"
   },
   "resource": {
     "User is nil for tag: avatar": "上传头像时用户为空",
@@ -88,15 +92,15 @@
     "Application %s not found": "未找到应用: %s"
   },
   "saml_sp": {
-    "provider %s's category is not SAML": "提供商: %s不是SAML类型"
+    "provider %s's category is not SAML": "提供商: %s 不是SAML类型"
   },
   "service": {
     "Empty parameters for emailForm: %v": "邮件参数为空: %v",
-    "Invalid Email receivers: %s": "无效的邮箱收件人: %s",
+    "Invalid Email receivers: %s": " 无效的邮箱收件人: %s",
     "Invalid phone receivers: %s": "无效的手机短信收信人: %s"
   },
   "storage": {
-    "The objectKey: %s is not allowed": "objectKey: %s被禁止",
+    "The objectKey: %s is not allowed": "objectKey: %s 被禁止",
     "The provider type: %s is not supported": "不支持的提供商类型: %s"
   },
   "token": {
@@ -104,7 +108,7 @@
     "Grant_type: %s is not supported in this application": "该应用不支持Grant_type: %s",
     "Invalid application or wrong clientSecret": "无效应用或错误的clientSecret",
     "Invalid client_id": "无效的ClientId",
-    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "重定向 URI：%s在许可跳转列表中未找到",
+    "Redirect URI: %s doesn't exist in the allowed Redirect URI list": "重定向 URI：%s 在许可跳转列表中未找到",
     "Token not found, invalid accessToken": "未查询到对应token, accessToken无效"
   },
   "user": {
@@ -116,13 +120,15 @@
     "Failed to import users": "导入用户失败"
   },
   "util": {
-    "No application is found for userId: %s": "未找到用户: %s的应用",
-    "No provider for category: %s is found for application: %s": "未找到类别为: %s的提供商来满足应用: %s",
+    "No application is found for userId: %s": "未找到用户: %s 的应用",
+    "No provider for category: %s is found for application: %s": "未找到类别为: %s 的提供商来满足应用: %s",
     "The provider: %s is not found": "未找到提供商: %s"
   },
   "verification": {
     "Code has not been sent yet!": "验证码还未发送",
+    "Email is invalid": "非法的邮箱",
     "Invalid captcha provider.": "非法的验证码提供商",
+    "Organization does not exist": "组织不存在",
     "Phone number is invalid in your region %s": "您所在地区的电话号码无效 %s",
     "Turing test failed.": "验证码还未发送",
     "Unable to get the email modify rule.": "无法获取邮箱修改规则",
@@ -134,7 +140,7 @@
     "the user does not exist, please sign up first": "用户不存在，请先注册"
   },
   "webauthn": {
-    "Found no credentials for this user": "该用户没有WebAuthn凭据",
-    "Please call WebAuthnSigninBegin first": "请先调用WebAuthnSigninBegin函数"
+    "Found no credentials for this user": "该用户没有 WebAuthn 凭据",
+    "Please call WebAuthnSigninBegin first": "请先调用 WebAuthnSigninBegin"
   }
 }

init_data.json.template

@@ -12,7 +12,7 @@
       "defaultAvatar": "",
       "defaultApplication": "",
       "tags": [],
-      "languages": ["en", "zh", "es", "fr", "de", "id", "ja", "ko", "ru", "vi"],
+      "languages": ["en", "zh", "es", "fr", "de", "ja", "ko", "ru", "vi"],
       "masterPassword": "",
       "initScore": 2000,
       "enableSoftDeletion": false,

object/avatar.go

@@ -63,19 +63,19 @@ func getPermanentAvatarUrl(organization string, username string, url string, upl
 	uploadedFileUrl, _ := GetUploadFileUrl(defaultStorageProvider, fullFilePath, false)
 
 	if upload {
-		DownloadAndUpload(url, fullFilePath, "en")
+		DownloadAndUpload(url, fullFilePath)
 	}
 
 	return uploadedFileUrl
 }
 
-func DownloadAndUpload(url string, fullFilePath string, lang string) {
+func DownloadAndUpload(url string, fullFilePath string) {
 	fileBuffer, err := downloadFile(url)
 	if err != nil {
 		panic(err)
 	}
 
-	_, _, err = UploadFileSafe(defaultStorageProvider, fullFilePath, fileBuffer, lang)
+	_, _, err = UploadFileSafe(defaultStorageProvider, fullFilePath, fileBuffer)
 	if err != nil {
 		panic(err)
 	}

object/init.go

@@ -89,7 +89,7 @@ func initBuiltInOrganization() bool {
 		CountryCodes:       []string{"US", "ES", "CN", "FR", "DE", "GB", "JP", "KR", "VN", "ID", "SG", "IN"},
 		DefaultAvatar:      fmt.Sprintf("%s/img/casbin.svg", conf.GetConfigString("staticBaseUrl")),
 		Tags:               []string{},
-		Languages:          []string{"en", "zh", "es", "fr", "de", "id", "ja", "ko", "ru", "vi"},
+		Languages:          []string{"en", "zh", "es", "fr", "de", "ja", "ko", "ru", "vi"},
 		InitScore:          2000,
 		AccountItems:       getBuiltInAccountItems(),
 		EnableSoftDeletion: false,

object/permission_enforcer.go

@@ -20,7 +20,6 @@ import (
 
 	"github.com/casbin/casbin/v2"
 	"github.com/casbin/casbin/v2/config"
-	"github.com/casbin/casbin/v2/log"
 	"github.com/casbin/casbin/v2/model"
 	"github.com/casdoor/casdoor/conf"
 	xormadapter "github.com/casdoor/xorm-adapter/v3"
@@ -51,30 +50,27 @@ func getEnforcer(permission *Permission) *casbin.Enforcer {
 		panic(err)
 	}
 
-	// Init an enforcer instance without specifying a model or adapter.
-	// If you specify an adapter, it will load all policies, which is a
-	// heavy process that can slow down the application.
-	enforcer, err := casbin.NewEnforcer(&log.DefaultLogger{}, false)
+	policyFilter := xormadapter.Filter{}
+
+	if !HasRoleDefinition(m) {
+		policyFilter.Ptype = []string{"p"}
+		err = adapter.LoadFilteredPolicy(m, policyFilter)
+		if err != nil {
+			panic(err)
+		}
+	}
+
+	enforcer, err := casbin.NewEnforcer(m, adapter)
 	if err != nil {
 		panic(err)
 	}
 
-	enforcer.InitWithModelAndAdapter(m, nil)
-	enforcer.SetAdapter(adapter)
-
-	policyFilter := xormadapter.Filter{
-		V5: []string{permission.GetId()},
-	}
-
-	if !HasRoleDefinition(m) {
-		policyFilter.Ptype = []string{"p"}
-	}
-
+	// load Policy with a specific Permission
+	policyFilter.V5 = []string{permission.GetId()}
 	err = enforcer.LoadFilteredPolicy(policyFilter)
 	if err != nil {
 		panic(err)
 	}
-
 	return enforcer
 }
 

object/saml_sp.go

@@ -36,11 +36,13 @@ func ParseSamlResponse(samlResponse string, providerType string) (string, error)
 		return "", err
 	}
 	assertionInfo, err := sp.RetrieveAssertionInfo(samlResponse)
-
-	return assertionInfo.NameID, err
+	if err != nil {
+		panic(err)
+	}
+	return assertionInfo.NameID, nil
 }
 
-func GenerateSamlLoginUrl(id, relayState, lang string) (auth string, method string, err error) {
+func GenerateSamlLoginUrl(id, relayState, lang string) (string, string, error) {
 	provider := GetProvider(id)
 	if provider.Category != "SAML" {
 		return "", "", fmt.Errorf(i18n.Translate(lang, "saml_sp:provider %s's category is not SAML"), provider.Name)
@@ -49,7 +51,8 @@ func GenerateSamlLoginUrl(id, relayState, lang string) (auth string, method stri
 	if err != nil {
 		return "", "", err
 	}
-
+	auth := ""
+	method := ""
 	if provider.EnableSignAuthnRequest {
 		post, err := sp.BuildAuthBodyPost(relayState)
 		if err != nil {

object/storage.go

@@ -106,11 +106,11 @@ func GetUploadFileUrl(provider *Provider, fullFilePath string, hasTimestamp bool
 	return fileUrl, objectKey
 }
 
-func uploadFile(provider *Provider, fullFilePath string, fileBuffer *bytes.Buffer, lang string) (string, string, error) {
+func uploadFile(provider *Provider, fullFilePath string, fileBuffer *bytes.Buffer) (string, string, error) {
 	endpoint := getProviderEndpoint(provider)
 	storageProvider := storage.GetStorageProvider(provider.Type, provider.ClientId, provider.ClientSecret, provider.RegionId, provider.Bucket, endpoint)
 	if storageProvider == nil {
-		return "", "", fmt.Errorf(i18n.Translate(lang, "storage:The provider type: %s is not supported"), provider.Type)
+		return "", "", fmt.Errorf("the provider type: %s is not supported", provider.Type)
 	}
 
 	if provider.Domain == "" {
@@ -128,7 +128,7 @@ func uploadFile(provider *Provider, fullFilePath string, fileBuffer *bytes.Buffe
 	return fileUrl, objectKey, nil
 }
 
-func UploadFileSafe(provider *Provider, fullFilePath string, fileBuffer *bytes.Buffer, lang string) (string, string, error) {
+func UploadFileSafe(provider *Provider, fullFilePath string, fileBuffer *bytes.Buffer) (string, string, error) {
 	// check fullFilePath is there security issue
 	if strings.Contains(fullFilePath, "..") {
 		return "", "", fmt.Errorf("the fullFilePath: %s is not allowed", fullFilePath)
@@ -139,7 +139,7 @@ func UploadFileSafe(provider *Provider, fullFilePath string, fileBuffer *bytes.B
 	var err error
 	times := 0
 	for {
-		fileUrl, objectKey, err = uploadFile(provider, fullFilePath, fileBuffer, lang)
+		fileUrl, objectKey, err = uploadFile(provider, fullFilePath, fileBuffer)
 		if err != nil {
 			times += 1
 			if times >= 5 {

object/token.go

@@ -613,8 +613,7 @@ func GetClientCredentialsToken(application *Application, clientSecret string, sc
 	nullUser := &User{
 		Owner: application.Owner,
 		Id:    application.GetId(),
-		Name:  application.Name,
-		Type:  "application",
+		Name:  fmt.Sprintf("app/%s", application.Name),
 	}
 
 	accessToken, _, tokenName, err := generateJwtToken(application, nullUser, "", scope, host)

routers/router.go

@@ -50,7 +50,6 @@ func initAPI() {
 	beego.Router("/api/logout", &controllers.ApiController{}, "GET,POST:Logout")
 	beego.Router("/api/get-account", &controllers.ApiController{}, "GET:GetAccount")
 	beego.Router("/api/userinfo", &controllers.ApiController{}, "GET:GetUserinfo")
-	beego.Router("/api/user", &controllers.ApiController{}, "GET:GetUserinfo2")
 	beego.Router("/api/unlink", &controllers.ApiController{}, "POST:Unlink")
 	beego.Router("/api/get-saml-login", &controllers.ApiController{}, "GET:GetSamlLogin")
 	beego.Router("/api/acs", &controllers.ApiController{}, "POST:HandleSamlLogin")

util/system.go

@@ -15,13 +15,8 @@
 package util
 
 import (
-	"bufio"
-	"os"
 	"path"
-	"regexp"
 	"runtime"
-	"strconv"
-	"strings"
 	"time"
 
 	"github.com/go-git/go-git/v5"
@@ -145,47 +140,3 @@ func GetVersionInfo() (*VersionInfo, error) {
 	}
 	return res, nil
 }
-
-func GetVersionInfoFromFile() (*VersionInfo, error) {
-	res := &VersionInfo{
-		Version:      "",
-		CommitId:     "",
-		CommitOffset: -1,
-	}
-
-	_, filename, _, _ := runtime.Caller(0)
-	rootPath := path.Dir(path.Dir(filename))
-	file, err := os.Open(path.Join(rootPath, "version_info.txt"))
-	if err != nil {
-		return res, err
-	}
-	defer file.Close()
-
-	// Read file contents line by line
-	scanner := bufio.NewScanner(file)
-
-	for scanner.Scan() {
-		// Use regular expressions to match strings
-		re := regexp.MustCompile(`\{([^{}]+)\}`)
-		versionInfo := scanner.Text()
-		matches := re.FindStringSubmatch(versionInfo)
-		if len(matches) > 1 {
-			split := strings.Split(matches[1], " ")
-			version := split[0]
-			commitId := split[1]
-			commitOffset, _ := strconv.Atoi(split[2])
-			res = &VersionInfo{
-				Version:      version,
-				CommitId:     commitId,
-				CommitOffset: commitOffset,
-			}
-			break
-		}
-	}
-
-	if err := scanner.Err(); err != nil {
-		return res, err
-	}
-
-	return res, nil
-}

util/system_test.go

@@ -40,7 +40,7 @@ func TestGetMemoryUsage(t *testing.T) {
 	t.Log(used, total)
 }
 
-func TestGetVersionInfo(t *testing.T) {
+func TestGetGitRepoVersion(t *testing.T) {
 	versionInfo, err := GetVersionInfo()
 	assert.Nil(t, err)
 	t.Log(versionInfo)
@@ -90,9 +90,3 @@ func TestGetVersion(t *testing.T) {
 	assert.Equal(t, 3, aheadCnt)
 	assert.Equal(t, "v1.257.0", releaseVersion)
 }
-
-func TestFromFile(t *testing.T) {
-	versionInfo, err := GetVersionInfoFromFile()
-	assert.Nil(t, err)
-	t.Log(versionInfo)
-}

web/src/AccountTable.js

@@ -64,7 +64,7 @@ class AccountTable extends React.Component {
   renderTable(table) {
     const columns = [
       {
-        title: i18next.t("general:Name"),
+        title: i18next.t("provider:Name"),
         dataIndex: "name",
         key: "name",
         render: (text, record, index) => {

web/src/App.js

@@ -332,12 +332,12 @@ class App extends Component {
           {
             this.renderAvatar()
           }
-           
-           
-          {Setting.isMobile() ? null : Setting.getNameAtLeast(this.state.account.displayName)} &nbsp; <DownOutlined />
-          &nbsp;
-          &nbsp;
-          &nbsp;
+            &nbsp;
+            &nbsp;
+          {Setting.isMobile() ? null : Setting.getShortName(this.state.account.displayName)} &nbsp; <DownOutlined />
+            &nbsp;
+            &nbsp;
+            &nbsp;
         </div>
       </Dropdown>
     );
@@ -452,7 +452,7 @@ class App extends Component {
           "/payments"
         ));
 
-        res.push(Setting.getItem(<Link to="/sysinfo">{i18next.t("general:System Info")}</Link>,
+        res.push(Setting.getItem(<Link to="/sysinfo">{i18next.t("general:SysInfo")}</Link>,
           "/sysinfo"
         ));
       }
@@ -672,9 +672,9 @@ class App extends Component {
 
     return (
       <React.Fragment>
-        {/* { */}
-        {/*   this.renderBanner() */}
-        {/* } */}
+        {
+          this.renderBanner()
+        }
         <FloatButton.BackTop />
         <CustomGithubCorner />
         {

web/src/ApplicationEditPage.js

@@ -372,7 +372,7 @@ class ApplicationEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
-            {Setting.getLabel(i18next.t("application:Enable password"), i18next.t("application:Enable password - Tooltip"))} :
+            {Setting.getLabel(i18next.t("application:Password ON"), i18next.t("application:Password ON - Tooltip"))} :
           </Col>
           <Col span={1} >
             <Switch checked={this.state.application.enablePassword} onChange={checked => {
@@ -430,16 +430,6 @@ class ApplicationEditPage extends React.Component {
             }} />
           </Col>
         </Row>
-        <Row style={{marginTop: "20px"}} >
-          <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
-            {Setting.getLabel(i18next.t("application:Enable Email linking"), i18next.t("application:Enable Email linking - Tooltip"))} :
-          </Col>
-          <Col span={1} >
-            <Switch checked={this.state.application.enableLinkWithEmail} onChange={checked => {
-              this.updateApplicationField("enableLinkWithEmail", checked);
-            }} />
-          </Col>
-        </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
             {Setting.getLabel(i18next.t("general:Signup URL"), i18next.t("general:Signup URL - Tooltip"))} :
@@ -482,7 +472,7 @@ class ApplicationEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("signup:Terms of Use"), i18next.t("signup:Terms of Use - Tooltip"))} :
+            {Setting.getLabel(i18next.t("provider:Terms of Use"), i18next.t("provider:Terms of Use - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input value={this.state.application.termsOfUse} style={{marginBottom: "10px"}} onChange={e => {
@@ -563,7 +553,7 @@ class ApplicationEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("application:SAML reply URL"), i18next.t("application:Redirect URL (Assertion Consumer Service POST Binding URL) - Tooltip"))} :
+            {Setting.getLabel(i18next.t("application:SAML Reply URL"), i18next.t("application:Redirect URL (Assertion Consumer Service POST Binding URL) - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input prefix={<LinkOutlined />} value={this.state.application.samlReplyUrl} onChange={e => {
@@ -573,7 +563,7 @@ class ApplicationEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
-            {Setting.getLabel(i18next.t("application:Enable SAML compression"), i18next.t("application:Enable SAML compression - Tooltip"))} :
+            {Setting.getLabel(i18next.t("application:Enable SAML compress"), i18next.t("application:Enable SAML compress - Tooltip"))} :
           </Col>
           <Col span={1} >
             <Switch checked={this.state.application.enableSamlCompress} onChange={checked => {
@@ -615,6 +605,16 @@ class ApplicationEditPage extends React.Component {
             />
           </Col>
         </Row>
+        <Row style={{marginTop: "20px"}} >
+          <Col span={(Setting.isMobile()) ? 19 : 6}>
+            {Setting.getLabel(i18next.t("application:Enable link accounts that with the same email"), i18next.t("application:Enable link accounts that with the same email - Tooltip"))} :
+          </Col>
+          <Col span={1} >
+            <Switch checked={this.state.application.enableLinkWithEmail} onChange={checked => {
+              this.updateApplicationField("enableLinkWithEmail", checked);
+            }} />
+          </Col>
+        </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
             {Setting.getLabel(i18next.t("general:Preview"), i18next.t("general:Preview - Tooltip"))} :

web/src/ApplicationListPage.js

@@ -176,7 +176,7 @@ class ApplicationListPage extends BaseListPage {
         render: (text, record, index) => {
           const providers = text;
           if (providers.length === 0) {
-            return `(${i18next.t("general:empty")})`;
+            return "(empty)";
           }
 
           const half = Math.floor((providers.length + 1) / 2);

web/src/CertEditPage.js

@@ -97,7 +97,7 @@ class CertEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("provider:Scope"), i18next.t("cert:Scope - Tooltip"))} :
+            {Setting.getLabel(i18next.t("cert:Scope"), i18next.t("cert:Scope - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Select virtual={false} style={{width: "100%"}} value={this.state.cert.scope} onChange={(value => {
@@ -113,7 +113,7 @@ class CertEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("provider:Type"), i18next.t("cert:Type - Tooltip"))} :
+            {Setting.getLabel(i18next.t("cert:Type"), i18next.t("cert:Type - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Select virtual={false} style={{width: "100%"}} value={this.state.cert.type} onChange={(value => {

web/src/CertListPage.js

@@ -111,7 +111,7 @@ class CertListPage extends BaseListPage {
         ...this.getColumnSearchProps("displayName"),
       },
       {
-        title: i18next.t("provider:Scope"),
+        title: i18next.t("cert:Scope"),
         dataIndex: "scope",
         key: "scope",
         filterMultiple: false,
@@ -122,7 +122,7 @@ class CertListPage extends BaseListPage {
         sorter: true,
       },
       {
-        title: i18next.t("provider:Type"),
+        title: i18next.t("cert:Type"),
         dataIndex: "type",
         key: "type",
         filterMultiple: false,

web/src/LdapEditPage.js

@@ -87,7 +87,7 @@ class LdapEditPage extends React.Component {
           <Button style={{marginLeft: "20px"}} type="primary" onClick={() => this.submitLdapEdit(true)}>{i18next.t("general:Save & Exit")}</Button>
           <Button style={{marginLeft: "20px"}}
             onClick={() => Setting.goToLink(`/ldap/sync/${this.state.organizationName}/${this.state.ldapId}`)}>
-            {i18next.t("general:Sync")} LDAP
+            {i18next.t("ldap:Sync")} LDAP
           </Button>
         </div>
       } style={{marginLeft: "5px"}} type="inner">
@@ -109,7 +109,7 @@ class LdapEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}}>
           <Col style={{lineHeight: "32px", textAlign: "right", paddingRight: "25px"}} span={3}>
-            {Setting.getLabel(i18next.t("general:ID"), i18next.t("general:ID - Tooltip"))} :
+            {Setting.getLabel(i18next.t("ldap:ID"), i18next.t("general:ID - Tooltip"))} :
           </Col>
           <Col span={21}>
             <Input value={this.state.ldap.id} disabled={true} />
@@ -117,7 +117,7 @@ class LdapEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}}>
           <Col style={{lineHeight: "32px", textAlign: "right", paddingRight: "25px"}} span={3}>
-            {Setting.getLabel(i18next.t("ldap:Server name"), i18next.t("ldap:Server name - Tooltip"))} :
+            {Setting.getLabel(i18next.t("ldap:Server Name"), i18next.t("ldap:Server Name - Tooltip"))} :
           </Col>
           <Col span={21}>
             <Input value={this.state.ldap.serverName} onChange={e => {
@@ -127,7 +127,7 @@ class LdapEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}}>
           <Col style={{lineHeight: "32px", textAlign: "right", paddingRight: "25px"}} span={3}>
-            {Setting.getLabel(i18next.t("ldap:Server host"), i18next.t("ldap:Server host - Tooltip"))} :
+            {Setting.getLabel(i18next.t("ldap:Server Host"), i18next.t("ldap:Server Host - Tooltip"))} :
           </Col>
           <Col span={21}>
             <Input value={this.state.ldap.host} onChange={e => {
@@ -137,7 +137,7 @@ class LdapEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}}>
           <Col style={{lineHeight: "32px", textAlign: "right", paddingRight: "25px"}} span={3}>
-            {Setting.getLabel(i18next.t("ldap:Server port"), i18next.t("ldap:Server port - Tooltip"))} :
+            {Setting.getLabel(i18next.t("ldap:Server Port"), i18next.t("ldap:Server Port - Tooltip"))} :
           </Col>
           <Col span={21}>
             <InputNumber min={0} max={65535} formatter={value => value.replace(/\$\s?|(,*)/g, "")}

web/src/LdapListPage.js

@@ -55,7 +55,7 @@ class LdapListPage extends React.Component {
   renderTable(ldaps) {
     const columns = [
       {
-        title: i18next.t("ldap:Server name"),
+        title: i18next.t("ldap:Server Name"),
         dataIndex: "serverName",
         key: "serverName",
         width: "200px",
@@ -137,7 +137,7 @@ class LdapListPage extends React.Component {
             <div>
               <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}}
                 type="primary"
-                onClick={() => Setting.goToLink(`/ldap/sync/${record.id}`)}>{i18next.t("general:Sync")}</Button>
+                onClick={() => Setting.goToLink(`/ldap/sync/${record.id}`)}>{i18next.t("ldap:Sync")}</Button>
               <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}}
                 onClick={() => Setting.goToLink(`/ldap/${record.id}`)}>{i18next.t("general:Edit")}</Button>
               <PopconfirmModal

web/src/LdapSyncPage.js

@@ -151,7 +151,7 @@ class LdapSyncPage extends React.Component {
         },
       },
       {
-        title: i18next.t("ldap:Group ID"),
+        title: i18next.t("ldap:Group Id"),
         dataIndex: "groupId",
         key: "groupId",
         width: "140px",
@@ -160,21 +160,21 @@ class LdapSyncPage extends React.Component {
         onFilter: (value, record) => record.groupId.indexOf(value) === 0,
       },
       {
-        title: i18next.t("general:Email"),
+        title: i18next.t("ldap:Email"),
         dataIndex: "email",
         key: "email",
         width: "240px",
         sorter: (a, b) => a.email.localeCompare(b.email),
       },
       {
-        title: i18next.t("general:Phone"),
+        title: i18next.t("ldap:Phone"),
         dataIndex: "phone",
         key: "phone",
         width: "160px",
         sorter: (a, b) => a.phone.localeCompare(b.phone),
       },
       {
-        title: i18next.t("user:Address"),
+        title: i18next.t("ldap:Address"),
         dataIndex: "address",
         key: "address",
         sorter: (a, b) => a.address.localeCompare(b.address),
@@ -205,7 +205,7 @@ class LdapSyncPage extends React.Component {
                 onConfirm={() => this.syncUsers()}
               >
                 <Button type="primary" style={{marginLeft: "10px"}}>
-                  {i18next.t("general:Sync")}
+                  {i18next.t("ldap:Sync")}
                 </Button>
               </Popconfirm>
               <Button style={{marginLeft: "20px"}}

web/src/LdapTable.js

@@ -93,7 +93,7 @@ class LdapTable extends React.Component {
   renderTable(table) {
     const columns = [
       {
-        title: i18next.t("ldap:Server name"),
+        title: i18next.t("ldap:Server Name"),
         dataIndex: "serverName",
         key: "serverName",
         width: "160px",
@@ -154,7 +154,7 @@ class LdapTable extends React.Component {
             <div>
               <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary"
                 onClick={() => Setting.goToLink(`/ldap/sync/${record.owner}/${record.id}`)}>
-                {i18next.t("general:Sync")}
+                {i18next.t("ldap:Sync")}
               </Button>
               <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}}
                 onClick={() => Setting.goToLink(`/ldap/${record.owner}/${record.id}`)}>

web/src/OrganizationEditPage.js

@@ -276,7 +276,7 @@ class OrganizationEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 19 : 2}>
-            {Setting.getLabel(i18next.t("organization:Init score"), i18next.t("organization:Init score - Tooltip"))} :
+            {Setting.getLabel(i18next.t("organization:InitScore"), i18next.t("organization:The user's initScore - Tooltip"))} :
           </Col>
           <Col span={4} >
             <InputNumber value={this.state.organization.initScore} onChange={value => {

web/src/OrganizationListPage.js

@@ -143,7 +143,7 @@ class OrganizationListPage extends BaseListPage {
         ...this.getColumnSearchProps("displayName"),
       },
       {
-        title: i18next.t("general:Favicon"),
+        title: i18next.t("organization:Favicon"),
         dataIndex: "favicon",
         key: "favicon",
         width: "50px",
@@ -192,7 +192,7 @@ class OrganizationListPage extends BaseListPage {
         ...this.getColumnSearchProps("passwordSalt"),
       },
       {
-        title: i18next.t("general:Default avatar"),
+        title: i18next.t("organization:Default avatar"),
         dataIndex: "defaultAvatar",
         key: "defaultAvatar",
         width: "120px",

web/src/PasswordModal.js

@@ -48,7 +48,7 @@ export const PasswordModal = (props) => {
     UserBackend.setPassword(user.owner, user.name, oldPassword, newPassword).then((res) => {
       setConfirmLoading(false);
       if (res.status === "ok") {
-        Setting.showMessage("success", i18next.t("user:Password set successfully"));
+        Setting.showMessage("success", i18next.t("user:Password Set"));
         setVisible(false);
       } else {Setting.showMessage("error", i18next.t(`user:${res.msg}`));}
     });
@@ -63,10 +63,10 @@ export const PasswordModal = (props) => {
       </Button>
       <Modal
         maskClosable={false}
-        title={i18next.t("general:Password")}
+        title={i18next.t("user:Password")}
         open={visible}
         okText={i18next.t("user:Set Password")}
-        cancelText={i18next.t("general:Cancel")}
+        cancelText={i18next.t("user:Cancel")}
         confirmLoading={confirmLoading}
         onCancel={handleCancel}
         onOk={handleOk}

web/src/PaymentEditPage.js

@@ -133,7 +133,7 @@ class PaymentEditPage extends React.Component {
             <Descriptions.Item label={i18next.t("payment:Person ID card")} span={3}>{this.state.payment?.personIdCard}</Descriptions.Item>
             <Descriptions.Item label={i18next.t("payment:Person Email")} span={3}>{this.state.payment?.personEmail}</Descriptions.Item>
             <Descriptions.Item label={i18next.t("payment:Person phone")} span={3}>{this.state.payment?.personPhone}</Descriptions.Item>
-            <Descriptions.Item label={i18next.t("payment:Invoice type")} span={3}>{this.state.payment?.invoiceType === "Individual" ? i18next.t("payment:Individual") : i18next.t("general:Organization")}</Descriptions.Item>
+            <Descriptions.Item label={i18next.t("payment:Invoice type")} span={3}>{this.state.payment?.invoiceType === "Individual" ? i18next.t("payment:Individual") : i18next.t("payment:Organization")}</Descriptions.Item>
             <Descriptions.Item label={i18next.t("payment:Invoice title")} span={3}>{this.state.payment?.invoiceTitle}</Descriptions.Item>
             <Descriptions.Item label={i18next.t("payment:Invoice tax ID")} span={3}>{this.state.payment?.invoiceTaxId}</Descriptions.Item>
             <Descriptions.Item label={i18next.t("payment:Invoice remark")} span={3}>{this.state.payment?.invoiceRemark}</Descriptions.Item>
@@ -195,7 +195,7 @@ class PaymentEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("provider:Type"), i18next.t("payment:Type - Tooltip"))} :
+            {Setting.getLabel(i18next.t("payment:Type"), i18next.t("payment:Type - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input disabled={true} value={this.state.payment.type} onChange={e => {
@@ -215,7 +215,7 @@ class PaymentEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("product:Price"), i18next.t("product:Price - Tooltip"))} :
+            {Setting.getLabel(i18next.t("payment:Price"), i18next.t("payment:Price - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input disabled={true} value={this.state.payment.price} onChange={e => {
@@ -235,7 +235,7 @@ class PaymentEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("general:State"), i18next.t("general:State - Tooltip"))} :
+            {Setting.getLabel(i18next.t("payment:State"), i18next.t("payment:State - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input disabled={true} value={this.state.payment.state} onChange={e => {
@@ -312,7 +312,7 @@ class PaymentEditPage extends React.Component {
               {
                 [
                   {id: "Individual", name: i18next.t("payment:Individual")},
-                  {id: "Organization", name: i18next.t("general:Organization")},
+                  {id: "Organization", name: i18next.t("payment:Organization")},
                 ].map((item, index) => <Option key={index} value={item.id}>{item.name}</Option>)
               }
             </Select>

web/src/PaymentListPage.js

@@ -167,7 +167,7 @@ class PaymentListPage extends BaseListPage {
       //   ...this.getColumnSearchProps('displayName'),
       // },
       {
-        title: i18next.t("provider:Type"),
+        title: i18next.t("payment:Type"),
         dataIndex: "type",
         key: "type",
         width: "140px",
@@ -189,7 +189,7 @@ class PaymentListPage extends BaseListPage {
         ...this.getColumnSearchProps("productDisplayName"),
       },
       {
-        title: i18next.t("product:Price"),
+        title: i18next.t("payment:Price"),
         dataIndex: "price",
         key: "price",
         width: "120px",
@@ -205,7 +205,7 @@ class PaymentListPage extends BaseListPage {
         ...this.getColumnSearchProps("currency"),
       },
       {
-        title: i18next.t("general:State"),
+        title: i18next.t("payment:State"),
         dataIndex: "state",
         key: "state",
         width: "120px",

web/src/PermissionEditPage.js

@@ -264,7 +264,7 @@ class PermissionEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("general:Resources"), i18next.t("permission:Resources - Tooltip"))} :
+            {Setting.getLabel(i18next.t("permission:Resources"), i18next.t("permission:Resources - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Select virtual={false} mode="tags" style={{width: "100%"}} value={this.state.permission.resources}
@@ -346,7 +346,7 @@ class PermissionEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("general:State"), i18next.t("general:State - Tooltip"))} :
+            {Setting.getLabel(i18next.t("permission:State"), i18next.t("permission:State - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Select virtual={false} disabled={!Setting.isLocalAdminUser(this.props.account)} style={{width: "100%"}} value={this.state.permission.state} onChange={(value => {

web/src/PermissionListPage.js

@@ -175,7 +175,7 @@ class PermissionListPage extends BaseListPage {
         sorter: true,
       },
       {
-        title: i18next.t("general:Resources"),
+        title: i18next.t("permission:Resources"),
         dataIndex: "resources",
         key: "resources",
         // width: '100px',
@@ -270,7 +270,7 @@ class PermissionListPage extends BaseListPage {
         },
       },
       {
-        title: i18next.t("general:State"),
+        title: i18next.t("permission:State"),
         dataIndex: "state",
         key: "state",
         filterMultiple: false,

web/src/PopconfirmModal.js

@@ -22,7 +22,7 @@ export const PopconfirmModal = (props) => {
       title={props.title}
       onConfirm={props.onConfirm}
       disabled={props.disabled}
-      okText={i18next.t("general:OK")}
+      okText={i18next.t("user:OK")}
       cancelText={i18next.t("general:Cancel")}
     >
       <Button style={{marginBottom: "10px"}} disabled={props.disabled} type="primary" danger>{i18next.t("general:Delete")}</Button>

web/src/ProductBuyPage.js

@@ -155,8 +155,8 @@ class ProductBuyPage extends React.Component {
       text = i18next.t("product:Alipay");
     } else if (provider.type === "WeChat Pay") {
       text = i18next.t("product:WeChat Pay");
-    } else if (provider.type === "PayPal") {
-      text = i18next.t("product:PayPal");
+    } else if (provider.type === "Paypal") {
+      text = i18next.t("product:Paypal");
     }
 
     return (
@@ -216,7 +216,7 @@ class ProductBuyPage extends React.Component {
               </span>
             </Descriptions.Item>
             <Descriptions.Item label={i18next.t("product:Detail")}><span style={{fontSize: 16}}>{Setting.getLanguageText(product?.detail)}</span></Descriptions.Item>
-            <Descriptions.Item label={i18next.t("user:Tag")}><span style={{fontSize: 16}}>{product?.tag}</span></Descriptions.Item>
+            <Descriptions.Item label={i18next.t("product:Tag")}><span style={{fontSize: 16}}>{product?.tag}</span></Descriptions.Item>
             <Descriptions.Item label={i18next.t("product:SKU")}><span style={{fontSize: 16}}>{product?.name}</span></Descriptions.Item>
             <Descriptions.Item label={i18next.t("product:Image")} span={3}>
               <img src={product?.image} alt={product?.name} height={90} style={{marginBottom: "20px"}} />

web/src/ProductEditPage.js

@@ -135,7 +135,7 @@ class ProductEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("user:Tag"), i18next.t("product:Tag - Tooltip"))} :
+            {Setting.getLabel(i18next.t("product:Tag"), i18next.t("product:Tag - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input value={this.state.product.tag} onChange={e => {
@@ -155,7 +155,7 @@ class ProductEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("general:Description"), i18next.t("general:Description - Tooltip"))} :
+            {Setting.getLabel(i18next.t("product:Description"), i18next.t("product:Description - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input value={this.state.product.description} onChange={e => {
@@ -165,7 +165,7 @@ class ProductEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("payment:Currency"), i18next.t("payment:Currency - Tooltip"))} :
+            {Setting.getLabel(i18next.t("product:Currency"), i18next.t("product:Currency - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Select virtual={false} style={{width: "100%"}} value={this.state.product.currency} onChange={(value => {

web/src/ProductListPage.js

@@ -126,7 +126,7 @@ class ProductListPage extends BaseListPage {
         },
       },
       {
-        title: i18next.t("user:Tag"),
+        title: i18next.t("product:Tag"),
         dataIndex: "tag",
         key: "tag",
         width: "160px",
@@ -134,7 +134,7 @@ class ProductListPage extends BaseListPage {
         ...this.getColumnSearchProps("tag"),
       },
       {
-        title: i18next.t("payment:Currency"),
+        title: i18next.t("product:Currency"),
         dataIndex: "currency",
         key: "currency",
         width: "120px",
@@ -182,7 +182,7 @@ class ProductListPage extends BaseListPage {
         render: (text, record, index) => {
           const providers = text;
           if (providers.length === 0) {
-            return `(${i18next.t("general:empty")})`;
+            return "(empty)";
           }
 
           const half = Math.floor((providers.length + 1) / 2);

web/src/ProviderEditPage.js

@@ -113,7 +113,7 @@ class ProviderEditPage extends React.Component {
       return Setting.getLabel(i18next.t("login:Password"), i18next.t("login:Password - Tooltip"));
     case "SMS":
       if (provider.type === "Volc Engine SMS") {
-        return Setting.getLabel(i18next.t("provider:Secret access key"), i18next.t("provider:Secret access key - Tooltip"));
+        return Setting.getLabel(i18next.t("provider:Secret access key"), i18next.t("provider:SecretAccessKey - Tooltip"));
       } else if (provider.type === "Huawei Cloud SMS") {
         return Setting.getLabel(i18next.t("provider:App secret"), i18next.t("provider:AppSecret - Tooltip"));
       } else {
@@ -121,7 +121,7 @@ class ProviderEditPage extends React.Component {
       }
     case "Captcha":
       if (provider.type === "Aliyun Captcha") {
-        return Setting.getLabel(i18next.t("provider:Secret access key"), i18next.t("provider:Secret access key - Tooltip"));
+        return Setting.getLabel(i18next.t("provider:Secret access key"), i18next.t("provider:SecretAccessKey - Tooltip"));
       } else {
         return Setting.getLabel(i18next.t("provider:Secret key"), i18next.t("provider:Secret key - Tooltip"));
       }
@@ -225,7 +225,7 @@ class ProviderEditPage extends React.Component {
           </Col>
           <Col span={22} >
             <Select virtual={false} style={{width: "100%"}} disabled={!Setting.isAdminUser(this.props.account)} value={this.state.provider.owner} onChange={(value => {this.updateProviderField("owner", value);})}>
-              {Setting.isAdminUser(this.props.account) ? <Option key={"admin"} value={"admin"}>{i18next.t("provider:admin (Shared)")}</Option> : null}
+              {Setting.isAdminUser(this.props.account) ? <Option key={"admin"} value={"admin"}>{i18next.t("provider:admin (share)")}</Option> : null}
               {
                 this.state.organizations.map((organization, index) => <Option key={index} value={organization.name}>{organization.name}</Option>)
               }
@@ -324,7 +324,7 @@ class ProviderEditPage extends React.Component {
                 this.state.provider.type !== "WeCom" ? null : (
                   <Row style={{marginTop: "20px"}} >
                     <Col style={{marginTop: "5px"}} span={2}>
-                      {Setting.getLabel(i18next.t("general:Method"), i18next.t("provider:Method - Tooltip"))} :
+                      {Setting.getLabel(i18next.t("provider:Method"), i18next.t("provider:Method - Tooltip"))} :
                     </Col>
                     <Col span={22} >
                       <Select virtual={false} style={{width: "100%"}} value={this.state.provider.method} onChange={value => {
@@ -484,7 +484,7 @@ class ProviderEditPage extends React.Component {
           )
         }
         {
-          this.state.provider.type !== "Adfs" && this.state.provider.type !== "AzureAD" && this.state.provider.type !== "Casdoor" && this.state.provider.type !== "Okta" ? null : (
+          this.state.provider.type !== "Adfs" && this.state.provider.type !== "Casdoor" && this.state.provider.type !== "Okta" ? null : (
             <Row style={{marginTop: "20px"}} >
               <Col style={{marginTop: "5px"}} span={2}>
                 {Setting.getLabel(i18next.t("provider:Domain"), i18next.t("provider:Domain - Tooltip"))} :
@@ -531,7 +531,7 @@ class ProviderEditPage extends React.Component {
             </Row>
             <Row style={{marginTop: "20px"}} >
               <Col style={{marginTop: "5px"}} span={2}>
-                {Setting.getLabel(i18next.t("provider:Path prefix"), i18next.t("provider:Path prefix - Tooltip"))} :
+                {Setting.getLabel(i18next.t("provider:Path prefix"), i18next.t("provider:The prefix path of the file - Tooltip"))} :
               </Col>
               <Col span={22} >
                 <Input value={this.state.provider.pathPrefix} onChange={e => {
@@ -626,7 +626,7 @@ class ProviderEditPage extends React.Component {
                   }} />
                 </Col>
                 <Button style={{marginLeft: "10px", marginBottom: "5px"}} type="primary" onClick={() => ProviderEditTestEmail.connectSmtpServer(this.state.provider)} >
-                  {i18next.t("provider:Test SMTP Connection")}
+                  {i18next.t("provider:Test Connection")}
                 </Button>
                 <Button style={{marginLeft: "10px", marginBottom: "5px"}} type="primary"
                   disabled={!Setting.isValidEmail(this.state.provider.receiver)}
@@ -653,7 +653,7 @@ class ProviderEditPage extends React.Component {
               }
               <Row style={{marginTop: "20px"}} >
                 <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-                  {Setting.getLabel(i18next.t("provider:Template code"), i18next.t("provider:Template code - Tooltip"))} :
+                  {Setting.getLabel(i18next.t("provider:Template Code"), i18next.t("provider:Template Code - Tooltip"))} :
                 </Col>
                 <Col span={22} >
                   <Input value={this.state.provider.templateCode} onChange={e => {
@@ -720,9 +720,9 @@ class ProviderEditPage extends React.Component {
                   <Button type="primary" onClick={() => {
                     try {
                       this.loadSamlConfiguration();
-                      Setting.showMessage("success", i18next.t("provider:Parse metadata successfully"));
+                      Setting.showMessage("success", i18next.t("provider:Parse Metadata successfully"));
                     } catch (err) {
-                      Setting.showMessage("error", i18next.t("provider:Can not parse metadata"));
+                      Setting.showMessage("error", i18next.t("provider:Can not parse Metadata"));
                     }
                   }}>
                     {i18next.t("provider:Parse")}

web/src/ProviderTable.js

@@ -65,7 +65,7 @@ class ProviderTable extends React.Component {
   renderTable(table) {
     let columns = [
       {
-        title: i18next.t("general:Name"),
+        title: i18next.t("provider:Name"),
         dataIndex: "name",
         key: "name",
         render: (text, record, index) => {
@@ -172,6 +172,27 @@ class ProviderTable extends React.Component {
           );
         },
       },
+      // {
+      //   title: i18next.t("provider:alertType"),
+      //   dataIndex: 'alertType',
+      //   key: 'alertType',
+      //   width: '120px',
+      //   render: (text, record, index) => {
+      //     return (
+      //       <Select virtual={false}  style={{width: '100%'}} value={text} onChange={(value => {
+      //         this.updateField(table, index, 'alertType', value);
+      //       })}>
+      //         {
+      //           [
+      //             {id: 'None', name: 'None'},
+      //             {id: 'Once', name: 'Once'},
+      //             {id: 'Always', name: 'Always'},
+      //           ].map((item, index) => <Option key={index} value={item.id}>{item.name}</Option>)
+      //         }
+      //       </Select>
+      //     )
+      //   }
+      // },
       {
         title: i18next.t("application:Rule"),
         dataIndex: "rule",

web/src/RecordListPage.js

@@ -156,7 +156,7 @@ class RecordListPage extends BaseListPage {
         },
       },
       {
-        title: i18next.t("record:Is triggered"),
+        title: i18next.t("record:Is Triggered"),
         dataIndex: "isTriggered",
         key: "isTriggered",
         width: "140px",

web/src/ResetModal.js

@@ -45,13 +45,13 @@ export const ResetModal = (props) => {
       return;
     }
     if (code === "") {
-      Setting.showMessage("error", i18next.t("code:Empty code"));
+      Setting.showMessage("error", i18next.t("code:Empty Code"));
       return;
     }
     setConfirmLoading(true);
     UserBackend.resetEmailOrPhone(dest, destType, code).then(res => {
       if (res.status === "ok") {
-        Setting.showMessage("success", i18next.t("user:Email/phone reset successfully"));
+        Setting.showMessage("success", i18next.t("user:" + destType + " reset"));
         window.location.reload();
       } else {
         Setting.showMessage("error", i18next.t("user:" + res.msg));
@@ -77,7 +77,7 @@ export const ResetModal = (props) => {
         title={buttonText}
         open={visible}
         okText={buttonText}
-        cancelText={i18next.t("general:Cancel")}
+        cancelText={i18next.t("user:Cancel")}
         confirmLoading={confirmLoading}
         onCancel={handleCancel}
         onOk={handleOk}
@@ -94,7 +94,7 @@ export const ResetModal = (props) => {
           </Row>
           <Row style={{width: "100%", marginBottom: "20px"}}>
             <SendCodeInput
-              textBefore={i18next.t("code:Code you received")}
+              textBefore={i18next.t("code:Code You Received")}
               onChange={setCode}
               method={"reset"}
               onButtonClickArgs={[dest, destType, Setting.getApplicationName(application)]}

web/src/ResourceListPage.js

@@ -100,7 +100,7 @@ class ResourceListPage extends BaseListPage {
         },
       },
       {
-        title: i18next.t("general:Application"),
+        title: i18next.t("resource:Application"),
         dataIndex: "application",
         key: "application",
         width: "80px",
@@ -115,7 +115,7 @@ class ResourceListPage extends BaseListPage {
         },
       },
       {
-        title: i18next.t("general:User"),
+        title: i18next.t("resource:User"),
         dataIndex: "user",
         key: "user",
         width: "80px",
@@ -156,7 +156,7 @@ class ResourceListPage extends BaseListPage {
         },
       },
       {
-        title: i18next.t("user:Tag"),
+        title: i18next.t("resource:Tag"),
         dataIndex: "tag",
         key: "tag",
         width: "80px",
@@ -171,7 +171,7 @@ class ResourceListPage extends BaseListPage {
       //   sorter: (a, b) => a.fileName.localeCompare(b.fileName),
       // },
       {
-        title: i18next.t("provider:Type"),
+        title: i18next.t("resource:Type"),
         dataIndex: "fileType",
         key: "fileType",
         width: "80px",
@@ -227,7 +227,7 @@ class ResourceListPage extends BaseListPage {
             <div>
               <Button type="normal" onClick={() => {
                 copy(record.url);
-                Setting.showMessage("success", i18next.t("provider:Link copied to clipboard successfully"));
+                Setting.showMessage("success", i18next.t("resource:Link copied to clipboard successfully"));
               }}
               >
                 {i18next.t("resource:Copy Link")}
@@ -248,8 +248,8 @@ class ResourceListPage extends BaseListPage {
               <PopconfirmModal
                 title={i18next.t("general:Sure to delete") + `: ${record.name} ?`}
                 onConfirm={() => this.deleteResource(index)}
-                okText={i18next.t("general:OK")}
-                cancelText={i18next.t("general:Cancel")}
+                okText={i18next.t("user:OK")}
+                cancelText={i18next.t("user:Cancel")}
               >
               </PopconfirmModal>
             </div>

web/src/Setting.js

@@ -38,7 +38,6 @@ export const Countries = [{label: "English", key: "en", country: "US", alt: "Eng
   {label: "Español", key: "es", country: "ES", alt: "Español"},
   {label: "Français", key: "fr", country: "FR", alt: "Français"},
   {label: "Deutsch", key: "de", country: "DE", alt: "Deutsch"},
-  {label: "Indonesia", key: "id", country: "ID", alt: "Indonesia"},
   {label: "日本語", key: "ja", country: "JP", alt: "日本語"},
   {label: "한국어", key: "ko", country: "KR", alt: "한국어"},
   {label: "Русский", key: "ru", country: "RU", alt: "Русский"},
@@ -673,22 +672,6 @@ export function getShortName(s) {
   return s.split("/").slice(-1)[0];
 }
 
-export function getNameAtLeast(s) {
-  s = getShortName(s);
-  if (s.length >= 6) {
-    return s;
-  }
-
-  return (
-    <React.Fragment>
-      &nbsp;
-      {s}
-      &nbsp;
-      &nbsp;
-    </React.Fragment>
-  );
-}
-
 export function getShortText(s, maxLength = 35) {
   if (s.length > maxLength) {
     return `${s.slice(0, maxLength)}...`;
@@ -868,7 +851,7 @@ export function getProviderTypeOptions(category) {
         {id: "OneDrive", name: "OneDrive"},
         {id: "Oura", name: "Oura"},
         {id: "Patreon", name: "Patreon"},
-        {id: "PayPal", name: "PayPal"},
+        {id: "Paypal", name: "Paypal"},
         {id: "SalesForce", name: "SalesForce"},
         {id: "Shopify", name: "Shopify"},
         {id: "Soundcloud", name: "Soundcloud"},

web/src/SignupTable.js

@@ -64,7 +64,7 @@ class SignupTable extends React.Component {
   renderTable(table) {
     const columns = [
       {
-        title: i18next.t("general:Name"),
+        title: i18next.t("provider:Name"),
         dataIndex: "name",
         key: "name",
         render: (text, record, index) => {
@@ -76,8 +76,8 @@ class SignupTable extends React.Component {
             {name: "Country/Region", displayName: i18next.t("user:Country/Region")},
             {name: "ID card", displayName: i18next.t("user:ID card")},
             {name: "Email", displayName: i18next.t("general:Email")},
-            {name: "Password", displayName: i18next.t("general:Password")},
-            {name: "Confirm password", displayName: i18next.t("signup:Confirm")},
+            {name: "Password", displayName: i18next.t("forget:Password")},
+            {name: "Confirm password", displayName: i18next.t("forget:Confirm")},
             {name: "Phone", displayName: i18next.t("general:Phone")},
             {name: "Agreement", displayName: i18next.t("signup:Agreement")},
           ];
@@ -104,7 +104,7 @@ class SignupTable extends React.Component {
         },
       },
       {
-        title: i18next.t("organization:Visible"),
+        title: i18next.t("provider:Visible"),
         dataIndex: "visible",
         key: "visible",
         width: "120px",

web/src/SystemInfo.js

@@ -67,14 +67,14 @@ class SystemInfo extends React.Component {
   }
 
   render() {
-    const cpuUi = this.state.systemInfo.cpuUsage?.length <= 0 ? i18next.t("system:Failed to get CPU usage") :
+    const cpuUi = this.state.systemInfo.cpuUsage?.length <= 0 ? i18next.t("system:Get CPU Usage Failed") :
       this.state.systemInfo.cpuUsage.map((usage, i) => {
         return (
           <Progress key={i} percent={Number(usage.toFixed(1))} />
         );
       });
 
-    const memUi = this.state.systemInfo.memoryUsed && this.state.systemInfo.memoryTotal && this.state.systemInfo.memoryTotal <= 0 ? i18next.t("system:Failed to get memory usage") :
+    const memUi = this.state.systemInfo.memoryUsed && this.state.systemInfo.memoryTotal && this.state.systemInfo.memoryTotal <= 0 ? i18next.t("system:Get Memory Usage Failed") :
       <div>
         {Setting.getFriendlyFileSize(this.state.systemInfo.memoryUsed)} / {Setting.getFriendlyFileSize(this.state.systemInfo.memoryTotal)}
         <br /> <br />
@@ -82,7 +82,7 @@ class SystemInfo extends React.Component {
       </div>;
 
     const link = this.state.versionInfo?.version !== "" ? `https://github.com/casdoor/casdoor/releases/tag/${this.state.versionInfo?.version}` : "";
-    let versionText = this.state.versionInfo?.version !== "" ? this.state.versionInfo?.version : i18next.t("system:Unknown version");
+    let versionText = this.state.versionInfo?.version !== "" ? this.state.versionInfo?.version : i18next.t("system:Unknown Version");
     if (this.state.versionInfo?.commitOffset > 0) {
       versionText += ` (ahead+${this.state.versionInfo?.commitOffset})`;
     }
@@ -111,7 +111,7 @@ class SystemInfo extends React.Component {
               <br />
               {i18next.t("system:Version")}: <a target="_blank" rel="noreferrer" href={link}>{versionText}</a>
               <br />
-              {i18next.t("system:Official website")}: <a target="_blank" rel="noreferrer" href="https://casdoor.org">https://casdoor.org</a>
+              {i18next.t("system:Official Website")}: <a target="_blank" rel="noreferrer" href="https://casdoor.org">https://casdoor.org</a>
               <br />
               {i18next.t("system:Community")}: <a target="_blank" rel="noreferrer" href="https://casdoor.org/#:~:text=Casdoor%20API-,Community,-GitHub">Get in Touch!</a>
             </Card>
@@ -139,7 +139,7 @@ class SystemInfo extends React.Component {
               <br />
               {i18next.t("system:Version")}: <a target="_blank" rel="noreferrer" href={link}>{versionText}</a>
               <br />
-              {i18next.t("system:Official website")}: <a target="_blank" rel="noreferrer" href="https://casdoor.org">https://casdoor.org</a>
+              {i18next.t("system:Official Website")}: <a target="_blank" rel="noreferrer" href="https://casdoor.org">https://casdoor.org</a>
               <br />
               {i18next.t("system:Community")}: <a target="_blank" rel="noreferrer" href="https://casdoor.org/#:~:text=Casdoor%20API-,Community,-GitHub">Get in Touch!</a>
             </Card>

web/src/TokenEditPage.js

@@ -141,7 +141,7 @@ class TokenEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {i18next.t("provider:Scope")}:
+            {i18next.t("token:Scope")}:
           </Col>
           <Col span={22} >
             <Input value={this.state.token.scope} onChange={e => {

web/src/TokenListPage.js

@@ -178,7 +178,7 @@ class TokenListPage extends BaseListPage {
         ...this.getColumnSearchProps("expiresIn"),
       },
       {
-        title: i18next.t("provider:Scope"),
+        title: i18next.t("token:Scope"),
         dataIndex: "scope",
         key: "scope",
         width: "110px",

web/src/WebhookEditPage.js

@@ -180,7 +180,7 @@ class WebhookEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("general:URL"), i18next.t("general:URL - Tooltip"))} :
+            {Setting.getLabel(i18next.t("webhook:URL"), i18next.t("webhook:URL - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input prefix={<LinkOutlined />} value={this.state.webhook.url} onChange={e => {
@@ -190,7 +190,7 @@ class WebhookEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("general:Method"), i18next.t("webhook:Method - Tooltip"))} :
+            {Setting.getLabel(i18next.t("webhook:Method"), i18next.t("webhook:Method - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Select virtual={false} style={{width: "100%"}} value={this.state.webhook.method} onChange={(value => {this.updateWebhookField("method", value);})}>

web/src/WebhookHeaderTable.js

@@ -62,7 +62,7 @@ class WebhookHeaderTable extends React.Component {
   renderTable(table) {
     const columns = [
       {
-        title: i18next.t("general:Name"),
+        title: i18next.t("webhook:Name"),
         dataIndex: "name",
         key: "name",
         width: "250px",

web/src/WebhookListPage.js

@@ -117,7 +117,7 @@ class WebhookListPage extends BaseListPage {
         },
       },
       {
-        title: i18next.t("general:URL"),
+        title: i18next.t("webhook:URL"),
         dataIndex: "url",
         key: "url",
         width: "300px",
@@ -134,7 +134,7 @@ class WebhookListPage extends BaseListPage {
         },
       },
       {
-        title: i18next.t("general:Method"),
+        title: i18next.t("webhook:Method"),
         dataIndex: "method",
         key: "method",
         width: "120px",

web/src/auth/AuthCallback.js

@@ -139,7 +139,7 @@ class AuthCallback extends React.Component {
             window.location.href = newUrl.toString();
           }
         } else {
-          Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`);
+          Setting.showMessage("error", `Failed to log in: ${res.msg}`);
         }
       });
       return;

web/src/auth/ForgetPage.js

@@ -32,6 +32,7 @@ class ForgetPage extends React.Component {
     this.state = {
       classes: props,
       applicationName: props.applicationName ?? props.match.params?.applicationName,
+      application: null,
       msg: null,
       userId: "",
       username: "",
@@ -48,11 +49,11 @@ class ForgetPage extends React.Component {
   }
 
   componentDidMount() {
-    if (this.getApplicationObj() === undefined) {
+    if (this.getApplicationObj() === null) {
       if (this.state.applicationName !== undefined) {
         this.getApplication();
       } else {
-        Setting.showMessage("error", i18next.t("forget:Unknown forget type") + ": " + this.state.type);
+        Setting.showMessage("error", i18next.t("forget:Unknown forget type: ") + this.state.type);
       }
     }
   }
@@ -65,11 +66,14 @@ class ForgetPage extends React.Component {
     ApplicationBackend.getApplication("admin", this.state.applicationName)
       .then((application) => {
         this.onUpdateApplication(application);
+        this.setState({
+          application: application,
+        });
       });
   }
 
   getApplicationObj() {
-    return this.props.application;
+    return this.props.application ?? this.state.application;
   }
 
   onUpdateApplication(application) {
@@ -389,7 +393,7 @@ class ForgetPage extends React.Component {
               <Input.Password
                 disabled={this.state.userId === ""}
                 prefix={<LockOutlined />}
-                placeholder={i18next.t("general:Password")}
+                placeholder={i18next.t("forget:Password")}
               />
             </Form.Item>
             <Form.Item
@@ -416,7 +420,7 @@ class ForgetPage extends React.Component {
               <Input.Password
                 disabled={this.state.userId === ""}
                 prefix={<CheckCircleOutlined />}
-                placeholder={i18next.t("signup:Confirm")}
+                placeholder={i18next.t("forget:Confirm")}
               />
             </Form.Item>
             <br />
@@ -432,9 +436,6 @@ class ForgetPage extends React.Component {
 
   render() {
     const application = this.getApplicationObj();
-    if (application === undefined) {
-      return null;
-    }
     if (application === null) {
       return Util.renderMessageLarge(this, this.state.msg);
     }

web/src/auth/LoginPage.js

@@ -38,9 +38,10 @@ class LoginPage extends React.Component {
     this.state = {
       classes: props,
       type: props.type,
-      applicationName: props.applicationName ?? (props.match?.params?.applicationName ?? null),
-      owner: props.owner ?? (props.match?.params?.owner ?? null),
-      mode: props.mode ?? (props.match?.params?.mode ?? null), // "signup" or "signin"
+      applicationName: props.applicationName !== undefined ? props.applicationName : (props.match === undefined ? null : props.match.params.applicationName),
+      owner: props.owner !== undefined ? props.owner : (props.match === undefined ? null : props.match.params.owner),
+      application: null,
+      mode: props.mode !== undefined ? props.mode : (props.match === undefined ? null : props.match.params.mode), // "signup" or "signin"
       msg: null,
       username: null,
       validEmailOrPhone: false,
@@ -57,19 +58,21 @@ class LoginPage extends React.Component {
     };
 
     if (this.state.type === "cas" && props.match?.params.casApplicationName !== undefined) {
-      this.state.owner = props.match?.params?.owner;
-      this.state.applicationName = props.match?.params?.casApplicationName;
+      this.state.owner = props.match?.params.owner;
+      this.state.applicationName = props.match?.params.casApplicationName;
     }
 
     this.form = React.createRef();
   }
 
   componentDidMount() {
-    if (this.getApplicationObj() === undefined) {
-      if (this.state.type === "login" || this.state.type === "cas" || this.state.type === "saml") {
+    if (this.getApplicationObj() === null) {
+      if (this.state.type === "login" || this.state.type === "cas") {
         this.getApplication();
       } else if (this.state.type === "code") {
         this.getApplicationLogin();
+      } else if (this.state.type === "saml") {
+        this.getSamlApplication();
       } else {
         Setting.showMessage("error", `Unknown authentication type: ${this.state.type}`);
       }
@@ -77,35 +80,14 @@ class LoginPage extends React.Component {
   }
 
   componentDidUpdate(prevProps, prevState, snapshot) {
-    if (prevProps.application !== this.props.application) {
-      const captchaProviderItems = this.getCaptchaProviderItems(this.props.application);
-      if (captchaProviderItems) {
-        this.setState({enableCaptchaModal: captchaProviderItems.some(providerItem => providerItem.rule === "Always")});
+    if (this.state.application && !prevState.application) {
+      const captchaProviderItems = this.getCaptchaProviderItems(this.state.application);
+
+      if (!captchaProviderItems) {
+        return;
       }
 
-      if (this.props.account && this.props.account.owner === this.props.application?.organization) {
-        const params = new URLSearchParams(this.props.location.search);
-        const silentSignin = params.get("silentSignin");
-        if (silentSignin !== null) {
-          this.sendSilentSigninData("signing-in");
-
-          const values = {};
-          values["application"] = this.props.application.name;
-          this.login(values);
-        }
-
-        if (params.get("popup") === "1") {
-          window.addEventListener("beforeunload", () => {
-            this.sendPopupData({type: "windowClosed"}, params.get("redirect_uri"));
-          });
-        }
-
-        if (this.props.application.enableAutoSignin) {
-          const values = {};
-          values["application"] = this.props.application.name;
-          this.login(values);
-        }
-      }
+      this.setState({enableCaptchaModal: captchaProviderItems.some(providerItem => providerItem.rule === "Always")});
     }
   }
 
@@ -114,49 +96,47 @@ class LoginPage extends React.Component {
     AuthBackend.getApplicationLogin(oAuthParams)
       .then((res) => {
         if (res.status === "ok") {
-          const application = res.data;
-          this.onUpdateApplication(application);
+          this.onUpdateApplication(res.data);
+          this.setState({
+            application: res.data,
+          });
         } else {
+          // Setting.showMessage("error", res.msg);
           this.onUpdateApplication(null);
           this.setState({
+            application: res.data,
             msg: res.msg,
           });
         }
       });
-    return null;
   }
 
   getApplication() {
     if (this.state.applicationName === null) {
-      return null;
+      return;
     }
 
-    if (this.state.owner === null || this.state.type === "saml") {
+    if (this.state.owner === null || this.state.owner === undefined || this.state.owner === "") {
       ApplicationBackend.getApplication("admin", this.state.applicationName)
         .then((application) => {
           this.onUpdateApplication(application);
-
-          if (application !== null && application !== undefined) {
-            Setting.getTermsOfUseContent(application.termsOfUse, res => {
-              this.setState({termsOfUseContent: res});
-            });
-          }
+          this.setState({
+            application: application,
+          }, () => Setting.getTermsOfUseContent(this.state.application.termsOfUse, res => {
+            this.setState({termsOfUseContent: res});
+          }));
         });
     } else {
       OrganizationBackend.getDefaultApplication("admin", this.state.owner)
         .then((res) => {
           if (res.status === "ok") {
-            const application = res.data;
-            this.onUpdateApplication(application);
+            this.onUpdateApplication(res.data);
             this.setState({
+              application: res.data,
               applicationName: res.data.name,
-            });
-
-            if (application !== null && application !== undefined) {
-              Setting.getTermsOfUseContent(application.termsOfUse, res => {
-                this.setState({termsOfUseContent: res});
-              });
-            }
+            }, () => Setting.getTermsOfUseContent(this.state.application.termsOfUse, res => {
+              this.setState({termsOfUseContent: res});
+            }));
           } else {
             this.onUpdateApplication(null);
             Setting.showMessage("error", res.msg);
@@ -165,8 +145,21 @@ class LoginPage extends React.Component {
     }
   }
 
+  getSamlApplication() {
+    if (this.state.applicationName === null) {
+      return;
+    }
+    ApplicationBackend.getApplication(this.state.owner, this.state.applicationName)
+      .then((application) => {
+        this.onUpdateApplication(application);
+        this.setState({
+          application: application,
+        });
+      });
+  }
+
   getApplicationObj() {
-    return this.props.application;
+    return this.props.application ?? this.state.application;
   }
 
   onUpdateAccount(account) {
@@ -190,25 +183,24 @@ class LoginPage extends React.Component {
   }
 
   populateOauthValues(values) {
-    if (this.getApplicationObj()?.organization) {
-      values["organization"] = this.getApplicationObj().organization;
+    const oAuthParams = Util.getOAuthGetParameters();
+    if (oAuthParams !== null && oAuthParams.responseType !== null && oAuthParams.responseType !== "") {
+      values["type"] = oAuthParams.responseType;
+    } else {
+      values["type"] = this.state.type;
     }
 
-    const oAuthParams = Util.getOAuthGetParameters();
-
-    values["type"] = oAuthParams?.responseType ?? this.state.type;
-
-    if (oAuthParams?.samlRequest) {
+    if (oAuthParams !== null) {
       values["samlRequest"] = oAuthParams.samlRequest;
+    }
+
+    if (values["samlRequest"] !== null && values["samlRequest"] !== "" && values["samlRequest"] !== undefined) {
       values["type"] = "saml";
       values["relayState"] = oAuthParams.relayState;
     }
-  }
 
-  sendPopupData(message, redirectUri) {
-    const params = new URLSearchParams(this.props.location.search);
-    if (params.get("popup") === "1") {
-      window.opener.postMessage(message, redirectUri);
+    if (this.getApplicationObj()?.organization) {
+      values["organization"] = this.getApplicationObj().organization;
     }
   }
 
@@ -235,7 +227,7 @@ class LoginPage extends React.Component {
               Setting.goToLinkSoft(ths, `/prompt/${application.name}?redirectUri=${oAuthParams.redirectUri}&code=${code}&state=${oAuthParams.state}`);
             }
           } else {
-            Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`);
+            Setting.showMessage("error", `${i18next.t("application:Failed to log in")}: ${res.msg}`);
           }
         });
     } else {
@@ -251,7 +243,6 @@ class LoginPage extends React.Component {
         }
       } else {
         Setting.goToLink(`${oAuthParams.redirectUri}${concatChar}code=${code}&state=${oAuthParams.state}`);
-        this.sendPopupData({type: "loginSuccess", data: {code: code, state: oAuthParams.state}}, oAuthParams.redirectUri);
       }
     }
   }
@@ -299,13 +290,14 @@ class LoginPage extends React.Component {
             window.location.href = newUrl.toString();
           }
         } else {
-          Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`);
+          Setting.showMessage("error", `${i18next.t("application:Failed to log in")}: ${res.msg}`);
         }
       });
     } else {
       // OAuth
       const oAuthParams = Util.getOAuthGetParameters();
       this.populateOauthValues(values);
+
       AuthBackend.login(values, oAuthParams)
         .then((res) => {
           if (res.status === "ok") {
@@ -318,6 +310,7 @@ class LoginPage extends React.Component {
               Setting.goToLink(link);
             } else if (responseType === "code") {
               this.postCodeLoginAction(res);
+              // Setting.showMessage("success", `Authorization code: ${res.data}`);
             } else if (responseType === "token" || responseType === "id_token") {
               const accessToken = res.data;
               Setting.goToLink(`${oAuthParams.redirectUri}#${responseType}=${accessToken}?state=${oAuthParams.state}&token_type=bearer`);
@@ -335,7 +328,7 @@ class LoginPage extends React.Component {
               }
             }
           } else {
-            Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`);
+            Setting.showMessage("error", `${i18next.t("application:Failed to log in")}: ${res.msg}`);
           }
         });
     }
@@ -376,11 +369,9 @@ class LoginPage extends React.Component {
     if (application.enablePassword) {
       let loginWidth = 320;
       if (Setting.getLanguage() === "fr") {
-        loginWidth += 20;
+        loginWidth += 10;
       } else if (Setting.getLanguage() === "es") {
         loginWidth += 40;
-      } else if (Setting.getLanguage() === "ru") {
-        loginWidth += 10;
       }
 
       return (
@@ -437,7 +428,7 @@ class LoginPage extends React.Component {
                       if (this.state.loginMethod === "verificationCode") {
                         if (!Setting.isValidEmail(value) && !Setting.isValidPhone(value)) {
                           this.setState({validEmailOrPhone: false});
-                          return Promise.reject(i18next.t("login:The input is not valid Email or phone number!"));
+                          return Promise.reject(i18next.t("login:The input is not valid Email or Phone!"));
                         }
 
                         if (Setting.isValidEmail(value)) {
@@ -633,12 +624,31 @@ class LoginPage extends React.Component {
     }
 
     const application = this.getApplicationObj();
-    if (this.props.account.owner !== application?.organization) {
+    if (this.props.account.owner !== application.organization) {
       return null;
     }
 
+    const params = new URLSearchParams(this.props.location.search);
+    const silentSignin = params.get("silentSignin");
+    if (silentSignin !== null) {
+      this.sendSilentSigninData("signing-in");
+
+      const values = {};
+      values["application"] = application.name;
+      this.onFinish(values);
+    }
+
+    if (application.enableAutoSignin) {
+      const values = {};
+      values["application"] = application.name;
+      this.onFinish(values);
+    }
+
     return (
       <div>
+        {/* {*/}
+        {/*  JSON.stringify(silentSignin)*/}
+        {/* }*/}
         <div style={{fontSize: 16, textAlign: "left"}}>
           {i18next.t("login:Continue with")}&nbsp;:
         </div>
@@ -646,7 +656,7 @@ class LoginPage extends React.Component {
         <SelfLoginButton account={this.props.account} onClick={() => {
           const values = {};
           values["application"] = application.name;
-          this.login(values);
+          this.onFinish(values);
         }} />
         <br />
         <br />
@@ -711,7 +721,7 @@ class LoginPage extends React.Component {
                 const accessToken = res.data;
                 Setting.goToLink(`${oAuthParams.redirectUri}#${responseType}=${accessToken}?state=${oAuthParams.state}&token_type=bearer`);
               } else {
-                Setting.showMessage("success", i18next.t("login:Successfully logged in with WebAuthn credentials"));
+                Setting.showMessage("success", i18next.t("login:Successfully logged in with webauthn credentials"));
                 Setting.goToLink("/");
               }
             } else {
@@ -736,7 +746,7 @@ class LoginPage extends React.Component {
             <Input.Password
               prefix={<LockOutlined className="site-form-item-icon" />}
               type="password"
-              placeholder={i18next.t("general:Password")}
+              placeholder={i18next.t("login:Password")}
               disabled={!application.enablePassword}
             />
           </Form.Item>
@@ -766,10 +776,10 @@ class LoginPage extends React.Component {
   renderMethodChoiceBox() {
     const application = this.getApplicationObj();
     const items = [
-      {label: i18next.t("general:Password"), key: "password"},
+      {label: i18next.t("login:Password"), key: "password"},
     ];
     application.enableCodeSignin ? items.push({
-      label: i18next.t("login:Verification code"),
+      label: i18next.t("login:Verification Code"),
       key: "verificationCode",
     }) : null;
     application.enableWebAuthn ? items.push({label: i18next.t("login:WebAuthn"), key: "webAuthn"}) : null;
@@ -788,9 +798,6 @@ class LoginPage extends React.Component {
 
   render() {
     const application = this.getApplicationObj();
-    if (application === undefined) {
-      return null;
-    }
     if (application === null) {
       return Util.renderMessageLarge(this, this.state.msg);
     }
@@ -833,6 +840,9 @@ class LoginPage extends React.Component {
                   {
                     Setting.renderLogo(application)
                   }
+                  {/* {*/}
+                  {/*  this.state.clientId !== null ? "Redirect" : null*/}
+                  {/* }*/}
                   <SelectLanguageBox languages={application.organizationObj.languages} style={{top: "55px", right: "5px", position: "absolute"}} />
                   {
                     this.renderSignedInBox()

web/src/auth/Provider.js

@@ -237,7 +237,7 @@ const authInfo = {
     scope: "identity",
     endpoint: "https://www.patreon.com/oauth2/authorize",
   },
-  PayPal: {
+  Paypal: {
     scope: "openid%20profile%20email",
     endpoint: "https://www.sandbox.paypal.com/connect",
   },
@@ -378,12 +378,6 @@ export function getAuthUrl(application, provider, method) {
   const state = Util.getStateFromQueryParams(application.name, provider.name, method, isShortState);
   const codeChallenge = "P3S-a7dr8bgM4bF6vOyiKkKETDl16rcAzao9F8UIL1Y"; // SHA256(Base64-URL-encode("casdoor-verifier"))
 
-  if (provider.type === "AzureAD") {
-    if (provider.domain !== "") {
-      endpoint = endpoint.replace("common", provider.domain);
-    }
-  }
-
   if (provider.type === "Google" || provider.type === "GitHub" || provider.type === "QQ" || provider.type === "Facebook"
     || provider.type === "Weibo" || provider.type === "Gitee" || provider.type === "LinkedIn" || provider.type === "GitLab" || provider.type === "AzureAD"
     || provider.type === "Slack" || provider.type === "Line" || provider.type === "Amazon" || provider.type === "Auth0" || provider.type === "BattleNet"

web/src/auth/ProviderButton.js

@@ -101,13 +101,12 @@ function getSigninButton(type) {
 
 function getSamlUrl(provider, location) {
   const params = new URLSearchParams(location.search);
-  const clientId = params.get("client_id") ?? "";
-  const state = params.get("state");
+  const clientId = params.get("client_id");
+  const application = params.get("state");
   const realRedirectUri = params.get("redirect_uri");
   const redirectUri = `${window.location.origin}/callback/saml`;
   const providerName = provider.name;
-
-  const relayState = `${clientId}&${state}&${providerName}&${realRedirectUri}&${redirectUri}`;
+  const relayState = `${clientId}&${application}&${providerName}&${realRedirectUri}&${redirectUri}`;
   AuthBackend.getSamlLogin(`${provider.owner}/${providerName}`, btoa(relayState)).then((res) => {
     if (res.data2 === "POST") {
       document.write(res.data);

web/src/auth/SamlCallback.js

@@ -49,21 +49,18 @@ class SamlCallback extends React.Component {
     const params = new URLSearchParams(this.props.location.search);
     const relayState = params.get("relayState");
     const samlResponse = params.get("samlResponse");
-
     const messages = atob(relayState).split("&");
-    const clientId = messages[0] === "" ? "" : messages[0];
-    const application = messages[0] === "" ? "app-built-in" : "";
-    const state = messages[1];
+    const clientId = messages[0];
+    const applicationName = (messages[1] === "null" || messages[1] === "undefined") ? "app-built-in" : messages[1];
     const providerName = messages[2];
     const redirectUri = messages[3];
     const responseType = this.getResponseType(redirectUri);
 
     const body = {
       type: responseType,
-      clientId: clientId,
+      application: applicationName,
       provider: providerName,
-      state: state,
-      application: application,
+      state: applicationName,
       redirectUri: `${window.location.origin}/callback`,
       method: "signup",
       relayState: relayState,
@@ -74,7 +71,7 @@ class SamlCallback extends React.Component {
     if (clientId === null || clientId === "") {
       param = "";
     } else {
-      param = `?clientId=${clientId}&responseType=${responseType}&redirectUri=${redirectUri}&scope=read&state=${state}`;
+      param = `?clientId=${clientId}&responseType=${responseType}&redirectUri=${redirectUri}&scope=read&state=${applicationName}`;
     }
 
     AuthBackend.loginWithSaml(body, param)
@@ -86,7 +83,7 @@ class SamlCallback extends React.Component {
             Setting.goToLink("/");
           } else if (responseType === "code") {
             const code = res.data;
-            Setting.goToLink(`${redirectUri}?code=${code}&state=${state}`);
+            Setting.goToLink(`${redirectUri}?code=${code}&state=${applicationName}`);
           }
         } else {
           this.setState({

web/src/auth/SelfLoginButton.js

@@ -40,7 +40,7 @@ class SelfLoginButton extends React.Component {
     };
 
     const SelfLoginButton = createButton(config);
-    return <SelfLoginButton text={this.getAccountShowName()} onClick={this.props.onClick} align={"center"} />;
+    return <SelfLoginButton text={this.getAccountShowName()} onClick={() => this.props.onClick()} align={"center"} />;
   }
 }
 

web/src/auth/SignupPage.js

@@ -65,7 +65,8 @@ class SignupPage extends React.Component {
     super(props);
     this.state = {
       classes: props,
-      applicationName: props.match?.params?.applicationName ?? authConfig.appName,
+      applicationName: props.match.params?.applicationName ?? authConfig.appName,
+      application: null,
       email: "",
       phone: "",
       countryCode: "",
@@ -82,17 +83,20 @@ class SignupPage extends React.Component {
   }
 
   componentDidMount() {
+    let applicationName = this.state.applicationName;
     const oAuthParams = Util.getOAuthGetParameters();
     if (oAuthParams !== null) {
+      applicationName = oAuthParams.state;
+      this.setState({applicationName: oAuthParams.state});
       const signinUrl = window.location.href.replace("/signup/oauth/authorize", "/login/oauth/authorize");
       sessionStorage.setItem("signinUrl", signinUrl);
     }
 
-    if (this.getApplicationObj() === undefined) {
-      if (this.state.applicationName !== null) {
-        this.getApplication(this.state.applicationName);
+    if (this.getApplicationObj() === null) {
+      if (applicationName !== undefined) {
+        this.getApplication(applicationName);
       } else {
-        Setting.showMessage("error", `Unknown application name: ${this.state.applicationName}`);
+        Setting.showMessage("error", `Unknown application name: ${applicationName}`);
       }
     }
   }
@@ -105,6 +109,9 @@ class SignupPage extends React.Component {
     ApplicationBackend.getApplication("admin", applicationName)
       .then((application) => {
         this.onUpdateApplication(application);
+        this.setState({
+          application: application,
+        });
 
         if (application !== null && application !== undefined) {
           Setting.getTermsOfUseContent(application.termsOfUse, res => {
@@ -127,7 +134,7 @@ class SignupPage extends React.Component {
   }
 
   getApplicationObj() {
-    return this.props.application;
+    return this.props.application ?? this.state.application;
   }
 
   onUpdateAccount(account) {
@@ -166,7 +173,7 @@ class SignupPage extends React.Component {
                   this.onUpdateAccount(account);
                   Setting.goToLinkSoft(this, this.getResultPath(application));
                 } else {
-                  Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`);
+                  Setting.showMessage("error", `Failed to sign in: ${res.msg}`);
                 }
               });
           } else {
@@ -589,7 +596,7 @@ class SignupPage extends React.Component {
 
   render() {
     const application = this.getApplicationObj();
-    if (application === undefined || application === null) {
+    if (application === null) {
       return null;
     }
 

web/src/auth/Util.js

@@ -43,20 +43,27 @@ export function renderMessage(msg) {
 export function renderMessageLarge(ths, msg) {
   if (msg !== null) {
     return (
-      <Result
-        style={{margin: "0px auto"}}
-        status="error"
-        title="There was a problem signing you in.."
-        subTitle={msg}
-        extra={[
-          <Button type="primary" key="back" onClick={() => {
-            window.history.go(-2);
-          }}>
+      <div style={{display: "inline"}}>
+        <Result
+          status="error"
+          title="There was a problem signing you in.."
+          subTitle={msg}
+          extra={[
+            <Button type="primary" key="back" onClick={() => {
+              window.history.go(-2);
+            }}>
               Back
-          </Button>,
-        ]}
-      >
-      </Result>
+            </Button>,
+            // <Button key="home" onClick={() => Setting.goToLinkSoft(ths, "/")}>
+            //   Home
+            // </Button>,
+            // <Button type="primary" key="signup" onClick={() => Setting.goToLinkSoft(ths, "/signup")}>
+            //   Sign Up
+            // </Button>,
+          ]}
+        >
+        </Result>
+      </div>
     );
   } else {
     return null;
@@ -64,7 +71,7 @@ export function renderMessageLarge(ths, msg) {
 }
 
 function getRefinedValue(value) {
-  return value ?? "";
+  return (value === null) ? "" : value;
 }
 
 export function getCasParameters(params) {
@@ -93,7 +100,7 @@ export function getOAuthGetParameters(params) {
   const relayState = getRefinedValue(queries.get("RelayState"));
   const noRedirect = getRefinedValue(queries.get("noRedirect"));
 
-  if (clientId === "" && samlRequest === "") {
+  if ((clientId === undefined || clientId === null || clientId === "") && (samlRequest === "" || samlRequest === undefined)) {
     // login
     return null;
   } else {

web/src/backend/FetchFilter.js

@@ -28,7 +28,7 @@ const demoModeCallback = (res) => {
         title: i18next.t("general:This is a read-only demo site!"),
         icon: <ExclamationCircleFilled />,
         content: i18next.t("general:Go to writable demo site?"),
-        okText: i18next.t("general:OK"),
+        okText: i18next.t("user:OK"),
         cancelText: i18next.t("general:Cancel"),
         onOk() {
           Setting.openLink(`https://demo.casdoor.com${location.pathname}${location.search}?username=built-in/admin&password=123`);

web/src/backend/UserBackend.js

@@ -129,7 +129,7 @@ export function sendCode(checkType, captchaToken, clientSecret, method, countryC
     },
   }).then(res => res.json()).then(res => {
     if (res.status === "ok") {
-      Setting.showMessage("success", i18next.t("user:Verification code sent"));
+      Setting.showMessage("success", i18next.t("user:Code Sent"));
       return true;
     } else {
       Setting.showMessage("error", i18next.t("user:" + res.msg));

web/src/common/AffiliationSelect.js

@@ -105,7 +105,7 @@ class AffiliationSelect extends React.Component {
                     this.updateUserField("affiliation", name);
                     this.updateUserField("score", id);
                   })}
-                  options={[Setting.getOption(`(${i18next.t("general:empty")})`, "")].concat(this.state.affiliationOptions.map((affiliationOption) => Setting.getOption(affiliationOption.name, affiliationOption.name))
+                  options={[Setting.getOption("(empty)", "")].concat(this.state.affiliationOptions.map((affiliationOption) => Setting.getOption(affiliationOption.name, affiliationOption.name))
                   )} />
               )
             }

web/src/common/CaptchaModal.js

@@ -143,8 +143,8 @@ export const CaptchaModal = (props) => {
     }
 
     return [
-      <Button key="cancel" onClick={handleCancel}>{i18next.t("general:Cancel")}</Button>,
-      <Button key="ok" disabled={isOkDisabled} type="primary" onClick={handleOk}>{i18next.t("general:OK")}</Button>,
+      <Button key="cancel" onClick={handleCancel}>{i18next.t("user:Cancel")}</Button>,
+      <Button key="ok" disabled={isOkDisabled} type="primary" onClick={handleOk}>{i18next.t("user:OK")}</Button>,
     ];
   };
 
@@ -155,8 +155,8 @@ export const CaptchaModal = (props) => {
       destroyOnClose={true}
       title={i18next.t("general:Captcha")}
       open={open}
-      okText={i18next.t("general:OK")}
-      cancelText={i18next.t("general:Cancel")}
+      okText={i18next.t("user:OK")}
+      cancelText={i18next.t("user:Cancel")}
       width={350}
       footer={renderFooter()}
       onCancel={handleCancel}

web/src/common/OAuthWidget.js

@@ -133,11 +133,6 @@ class OAuthWidget extends React.Component {
       }
     }
 
-    let linkButtonWidth = "110px";
-    if (Setting.getLanguage() === "id") {
-      linkButtonWidth = "160px";
-    }
-
     return (
       <Row key={provider.name} style={{marginTop: "20px"}} >
         <Col style={{marginTop: "5px"}} span={this.props.labelSpan}>
@@ -155,7 +150,7 @@ class OAuthWidget extends React.Component {
           <span style={{width: this.props.labelSpan === 3 ? "300px" : "200px", display: (Setting.isMobile()) ? "inline" : "inline-block"}}>
             {
               linkedValue === "" ? (
-                `(${i18next.t("general:empty")})`
+                "(empty)"
               ) : (
                 profileUrl === "" ? name : (
                   <a target="_blank" rel="noreferrer" href={profileUrl}>
@@ -170,10 +165,10 @@ class OAuthWidget extends React.Component {
           {
             linkedValue === "" ? (
               <a key={provider.displayName} href={user.id !== account.id ? null : Provider.getAuthUrl(application, provider, "link")}>
-                <Button style={{marginLeft: "20px", width: linkButtonWidth}} type="primary" disabled={user.id !== account.id}>{i18next.t("user:Link")}</Button>
+                <Button style={{marginLeft: "20px", width: "80px"}} type="primary" disabled={user.id !== account.id}>{i18next.t("user:Link")}</Button>
               </a>
             ) : (
-              <Button disabled={!providerItem.canUnlink && !account.isGlobalAdmin} style={{marginLeft: "20px", width: linkButtonWidth}} onClick={() => this.unlinkUser(provider.type)}>{i18next.t("user:Unlink")}</Button>
+              <Button disabled={!providerItem.canUnlink && !account.isGlobalAdmin} style={{marginLeft: "20px", width: "80px"}} onClick={() => this.unlinkUser(provider.type)}>{i18next.t("user:Unlink")}</Button>
             )
           }
         </Col>

web/src/common/PoliciyTable.js

@@ -139,8 +139,7 @@ class PolicyTable extends React.Component {
       if (res.status === "ok") {
         this.setState({editingIndex: "", oldPolicy: "", add: false});
         if (res.data !== "Affected") {
-          res.msg = i18next.t("adapter:Duplicated policy rules");
-          Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
+          Setting.showMessage("info", i18next.t("adapter:Repeated policy rules"));
         } else {
           Setting.showMessage("success", i18next.t("general:Successfully added"));
         }
@@ -322,7 +321,7 @@ class PolicyTable extends React.Component {
     return (
       <React.Fragment>
         <Button type="primary" disabled={this.state.editingIndex !== ""} onClick={() => {this.synPolicies();}}>
-          {i18next.t("general:Sync")}
+          {i18next.t("adapter:Sync")}
         </Button>
         {
           this.renderTable(this.state.policyLists)

web/src/i18n.js

@@ -18,7 +18,6 @@ import zh from "./locales/zh/data.json";
 import es from "./locales/es/data.json";
 import fr from "./locales/fr/data.json";
 import de from "./locales/de/data.json";
-import id from "./locales/id/data.json";
 import ja from "./locales/ja/data.json";
 import ko from "./locales/ko/data.json";
 import ru from "./locales/ru/data.json";
@@ -32,7 +31,6 @@ const resources = {
   es: es,
   fr: fr,
   de: de,
-  id: id,
   ja: ja,
   ko: ko,
   ru: ru,
@@ -68,9 +66,6 @@ function initLanguage() {
       case "de":
         language = "de";
         break;
-      case "id":
-        language = "id";
-        break;
       case "ja":
         language = "ja";
         break;

web/src/locales/en/data.json

@@ -5,12 +5,13 @@
     "Sign Up": "Sign Up"
   },
   "adapter": {
-    "Duplicated policy rules": "Duplicated policy rules",
     "Edit Adapter": "Edit Adapter",
     "Failed to sync policies": "Failed to sync policies",
     "New Adapter": "New Adapter",
     "Policies": "Policies",
-    "Policies - Tooltip": "Casbin policy rules",
+    "Policies - Tooltip": "CURD to the policy rules",
+    "Repeated policy rules": "Repeated policy rules",
+    "Sync": "Sync",
     "Sync policies successfully": "Sync policies successfully"
   },
   "application": {
@@ -18,42 +19,43 @@
     "Auto signin": "Auto signin",
     "Auto signin - Tooltip": "When a logged-in session exists in Casdoor, it is automatically used for application-side login",
     "Background URL": "Background URL",
-    "Background URL - Tooltip": "URL of the background image used in the login page",
+    "Background URL - Tooltip": "Link to the background image of the login page",
     "Center": "Center",
     "Copy SAML metadata URL": "Copy SAML metadata URL",
     "Copy prompt page URL": "Copy prompt page URL",
     "Copy signin page URL": "Copy signin page URL",
     "Copy signup page URL": "Copy signup page URL",
     "Edit Application": "Edit Application",
-    "Enable Email linking": "Enable Email linking",
-    "Enable Email linking - Tooltip": "When using 3rd-party providers to log in, if there is a user in the organization with the same Email, the 3rd-party login method will be automatically associated with that user",
-    "Enable SAML compression": "Enable SAML compression",
-    "Enable SAML compression - Tooltip": "Whether to compress SAML response messages when Casdoor is used as SAML idp",
+    "Enable SAML compress": "Enable SAML compress",
+    "Enable SAML compress - Tooltip": "Whether to compress SAML response messages when Casdoor is used as SAML idp",
     "Enable WebAuthn signin": "Enable WebAuthn signin",
-    "Enable WebAuthn signin - Tooltip": "Whether to allow users to login with WebAuthn",
+    "Enable WebAuthn signin - Tooltip": "Whether to allow login with cell phone or email verification code",
     "Enable code signin": "Enable code signin",
-    "Enable code signin - Tooltip": "Whether to allow users to login with phone or Email verification code",
-    "Enable password": "Enable password",
-    "Enable password - Tooltip": "Whether to allow users to login with password",
+    "Enable code signin - Tooltip": "Whether to allow login with cell phone or email verification code",
+    "Enable link accounts that with the same email": "Enable link accounts that with the same email",
+    "Enable link accounts that with the same email - Tooltip": "Enable link accounts that with the same email",
     "Enable side panel": "Enable side panel",
-    "Enable signin session - Tooltip": "Whether Casdoor maintains a session after logging into Casdoor from the application",
+    "Enable signin session - Tooltip": "Whether Casdoor maintains a session after logging into Casdoor from the app",
     "Enable signup": "Enable signup",
-    "Enable signup - Tooltip": "Whether to allow users to register a new account",
+    "Enable signup - Tooltip": "Whether to allow users to register",
+    "Failed to log in": "Failed to log in",
     "Failed to sign in": "Failed to sign in",
     "File uploaded successfully": "File uploaded successfully",
     "Follow organization theme": "Follow organization theme",
     "Form CSS": "Form CSS",
     "Form CSS - Edit": "Form CSS - Edit",
-    "Form CSS - Tooltip": "CSS styling of the signup, signin and forget password forms (e.g. adding borders and shadows)",
+    "Form CSS - Tooltip": "CSS styling of forms (e.g. adding borders and shadows)",
     "Form position": "Form position",
-    "Form position - Tooltip": "Location of the signup, signin and forget password forms",
+    "Form position - Tooltip": "Location of forms for registration, login, forgotten password, etc.",
     "Grant types": "Grant types",
-    "Grant types - Tooltip": "Select which grant types are allowed in the OAuth protocol",
+    "Grant types - Tooltip": "Select which Grant types are allowed in the OAuth protocol",
     "Left": "Left",
     "Logged in successfully": "Logged in successfully",
     "Logged out successfully": "Logged out successfully",
     "New Application": "New Application",
     "None": "None",
+    "Password ON": "Password ON",
+    "Password ON - Tooltip": "Whether to allow password login",
     "Please input your application!": "Please input your application!",
     "Please input your organization!": "Please input your organization!",
     "Please select a HTML file": "Please select a HTML file",
@@ -61,57 +63,59 @@
     "Redirect URL": "Redirect URL",
     "Redirect URL (Assertion Consumer Service POST Binding URL) - Tooltip": "Redirect URL (Assertion Consumer Service POST Binding URL)",
     "Redirect URLs": "Redirect URLs",
-    "Redirect URLs - Tooltip": "Allowed redirect URL list, supporting regular expression matching; URLs not in the list will fail to redirect",
+    "Redirect URLs - Tooltip": "List of redirected addresses after successful login",
     "Refresh token expire": "Refresh token expire",
     "Refresh token expire - Tooltip": "Refresh token expiration time",
     "Right": "Right",
     "Rule": "Rule",
+    "SAML Reply URL": "SAML Reply URL",
     "SAML metadata": "SAML metadata",
-    "SAML metadata - Tooltip": "The metadata of SAML protocol",
+    "SAML metadata - Tooltip": "Metadata information of SAML protocol",
     "SAML metadata URL copied to clipboard successfully": "SAML metadata URL copied to clipboard successfully",
-    "SAML reply URL": "SAML reply URL",
     "Side panel HTML": "Side panel HTML",
     "Side panel HTML - Edit": "Side panel HTML - Edit",
-    "Side panel HTML - Tooltip": "Customize the HTML code for the side panel of the login page",
+    "Side panel HTML - Tooltip": "Side panel HTML",
     "Sign Up Error": "Sign Up Error",
     "Signin page URL copied to clipboard successfully, please paste it into the incognito window or another browser": "Signin page URL copied to clipboard successfully, please paste it into the incognito window or another browser",
     "Signin session": "Signin session",
     "Signup items": "Signup items",
-    "Signup items - Tooltip": "Items for users to fill in when registering new accounts",
+    "Signup items - Tooltip": "Items to be filled in when registering users",
     "Signup page URL copied to clipboard successfully, please paste it into the incognito window or another browser": "Signup page URL copied to clipboard successfully, please paste it into the incognito window or another browser",
     "The application does not allow to sign up new account": "The application does not allow to sign up new account",
     "Token expire": "Token expire",
     "Token expire - Tooltip": "Access token expiration time",
     "Token format": "Token format",
-    "Token format - Tooltip": "The format of access token",
+    "Token format - Tooltip": "Select access token format",
     "You are unexpected to see this prompt page": "You are unexpected to see this prompt page"
   },
   "cert": {
     "Bit size": "Bit size",
     "Bit size - Tooltip": "Secret key length",
     "Certificate": "Certificate",
-    "Certificate - Tooltip": "Public key certificate, used for decrypting the JWT signature of the Access Token. This certificate usually needs to be deployed on the Casdoor SDK side (i.e., the application) to parse the JWT",
+    "Certificate - Tooltip": "The public key, configured on your server, is used to decrypt the signature",
     "Certificate copied to clipboard successfully": "Certificate copied to clipboard successfully",
     "Copy certificate": "Copy certificate",
     "Copy private key": "Copy private key",
     "Crypto algorithm": "Crypto algorithm",
-    "Crypto algorithm - Tooltip": "Encryption algorithm used by the certificate",
+    "Crypto algorithm - Tooltip": "Encryption algorithm of the certificate",
     "Download certificate": "Download certificate",
     "Download private key": "Download private key",
     "Edit Cert": "Edit Cert",
     "Expire in years": "Expire in years",
-    "Expire in years - Tooltip": "Validity period of the certificate, in years",
+    "Expire in years - Tooltip": "Expire in years",
     "New Cert": "New Cert",
     "Private key": "Private key",
-    "Private key - Tooltip": "Private key corresponding to the public key certificate",
+    "Private key - Tooltip": "Private key for signature generation",
     "Private key copied to clipboard successfully": "Private key copied to clipboard successfully",
-    "Scope - Tooltip": "Usage scenarios of the certificate",
+    "Scope": "Scope",
+    "Scope - Tooltip": "Scope of the certificate",
+    "Type": "Type",
     "Type - Tooltip": "Type of certificate"
   },
   "code": {
-    "Code you received": "Code you received",
+    "Code You Received": "Code You Received",
     "Email code": "Email code",
-    "Empty code": "Empty code",
+    "Empty Code": "Empty Code",
     "Enter your code": "Enter your code",
     "Phone code": "Phone code",
     "Please input your phone verification code!": "Please input your phone verification code!",
@@ -124,11 +128,13 @@
     "Account": "Account",
     "Change Password": "Change Password",
     "Choose email or phone": "Choose email or phone",
+    "Confirm": "Confirm",
     "Next Step": "Next Step",
+    "Password": "Password",
     "Please input your username!": "Please input your username!",
     "Reset": "Reset",
     "Retrieve password": "Retrieve password",
-    "Unknown forget type": "Unknown forget type",
+    "Unknown forget type: ": "Unknown forget type: ",
     "Verify": "Verify"
   },
   "general": {
@@ -138,12 +144,12 @@
     "Adapters": "Adapters",
     "Add": "Add",
     "Affiliation URL": "Affiliation URL",
-    "Affiliation URL - Tooltip": "The homepage URL for the affiliation",
+    "Affiliation URL - Tooltip": "Affiliation URL",
     "Application": "Application",
     "Applications": "Applications",
     "Applications that require authentication": "Applications that require authentication",
     "Avatar": "Avatar",
-    "Avatar - Tooltip": "Public avatar image for the user",
+    "Avatar - Tooltip": "Avatar to show to others",
     "Back Home": "Back Home",
     "Cancel": "Cancel",
     "Captcha": "Captcha",
@@ -155,27 +161,27 @@
     "Close": "Close",
     "Created time": "Created time",
     "Default application": "Default application",
-    "Default application - Tooltip": "Default application for users registered directly from the organization page",
+    "Default application - Tooltip": "Default application",
     "Default avatar": "Default avatar",
-    "Default avatar - Tooltip": "Default avatar used when newly registered users do not set an avatar image",
+    "Default avatar - Tooltip": "Default avatar",
     "Delete": "Delete",
     "Description": "Description",
-    "Description - Tooltip": "Detailed description information for reference, Casdoor itself will not use it",
+    "Description - Tooltip": "Descriptive information related to this",
     "Display name": "Display name",
-    "Display name - Tooltip": "A user-friendly, easily readable name displayed publicly in the UI",
+    "Display name - Tooltip": "The name displayed, it can be repeated",
     "Down": "Down",
     "Edit": "Edit",
     "Email": "Email",
-    "Email - Tooltip": "Valid email address",
+    "Email - Tooltip": "Email address",
     "Failed to add": "Failed to add",
     "Failed to connect to server": "Failed to connect to server",
     "Failed to delete": "Failed to delete",
     "Failed to save": "Failed to save",
     "Favicon": "Favicon",
-    "Favicon - Tooltip": "Favicon icon URL used in all Casdoor pages of the organization",
+    "Favicon - Tooltip": "Favicon icons for the website",
     "First name": "First name",
     "Forget URL": "Forget URL",
-    "Forget URL - Tooltip": "Custom URL for the \"Forget password\" page. If not set, the default Casdoor \"Forget password\" page will be used. When set, the \"Forget password\" link on the login page will redirect to this URL",
+    "Forget URL - Tooltip": "Forgot password URL",
     "Found some texts still not translated? Please help us translate at": "Found some texts still not translated? Please help us translate at",
     "Go to writable demo site?": "Go to writable demo site?",
     "Home": "Home",
@@ -192,53 +198,52 @@
     "Logo": "Logo",
     "Logo - Tooltip": "Icons that the application presents to the outside world",
     "Master password": "Master password",
-    "Master password - Tooltip": "Can be used to log in to all users under this organization, making it convenient for administrators to log in as this user to solve technical issues",
+    "Master password - Tooltip": "Can be used to log in to all users under the organization and facilitate administrators to log in as that user to solve technical problems",
     "Menu": "Menu",
     "Method": "Method",
     "Model": "Model",
-    "Model - Tooltip": "Casbin access control model",
+    "Model - Tooltip": "Select one model belonging to the organization",
     "Models": "Models",
     "Name": "Name",
     "Name - Tooltip": "Unique, string-based ID",
     "OAuth providers": "OAuth providers",
-    "OK": "OK",
     "Organization": "Organization",
-    "Organization - Tooltip": "Similar to concepts such as tenants or user pools, each user and application belongs to an organization",
+    "Organization - Tooltip": "Select one from the organizations",
     "Organizations": "Organizations",
     "Password": "Password",
     "Password - Tooltip": "Make sure the password is correct",
     "Password salt": "Password salt",
-    "Password salt - Tooltip": "Random parameter used for password encryption",
+    "Password salt - Tooltip": "Random parameters for password encryption",
     "Password type": "Password type",
-    "Password type - Tooltip": "Storage format of passwords in the database",
+    "Password type - Tooltip": "Form of password storage in the database",
     "Payments": "Payments",
     "Permissions": "Permissions",
-    "Permissions - Tooltip": "Permissions owned by this user",
+    "Permissions - Tooltip": "Permissions owned",
     "Phone": "Phone",
     "Phone - Tooltip": "Phone number",
     "Preview": "Preview",
-    "Preview - Tooltip": "Preview the configured effects",
+    "Preview - Tooltip": "Preview screen",
     "Products": "Products",
     "Provider": "Provider",
-    "Provider - Tooltip": "Payment providers to be configured, including PayPal, Alipay, WeChat Pay, etc.",
+    "Provider - Tooltip": "Payment providers, such as paypel",
     "Providers": "Providers",
-    "Providers - Tooltip": "Providers to be configured, including 3rd-party login, object storage, verification code, etc.",
+    "Providers - Tooltip": "Configuration providers such as OAuth, SMS, storage",
     "Real name": "Real name",
     "Records": "Records",
     "Request URI": "Request URI",
     "Resources": "Resources",
     "Roles": "Roles",
-    "Roles - Tooltip": "Roles that the user belongs to",
+    "Roles - Tooltip": "Roles owned",
     "Save": "Save",
     "Save & Exit": "Save & Exit",
     "Session ID": "Session ID",
     "Sessions": "Sessions",
     "Signin URL": "Signin URL",
-    "Signin URL - Tooltip": "Custom URL for the login page. If not set, the default Casdoor login page will be used. When set, the login links on various Casdoor pages will redirect to this URL",
+    "Signin URL - Tooltip": "User's login address",
     "Signup URL": "Signup URL",
-    "Signup URL - Tooltip": "Custom URL for the registration page. If not set, the default Casdoor registration page will be used. When set, the registration links on various Casdoor pages will redirect to this URL",
+    "Signup URL - Tooltip": "Registration address displayed to users",
     "Signup application": "Signup application",
-    "Signup application - Tooltip": "Which application the user registered through when they signed up",
+    "Signup application - Tooltip": "Which application the user registered through when registering",
     "Sorry, the page you visited does not exist.": "Sorry, the page you visited does not exist.",
     "Sorry, the user you visited does not exist or you are not authorized to access this user.": "Sorry, the user you visited does not exist or you are not authorized to access this user.",
     "Sorry, you do not have permission to access this page or logged in status invalid.": "Sorry, you do not have permission to access this page or logged in status invalid.",
@@ -248,30 +253,30 @@
     "Successfully deleted": "Successfully deleted",
     "Successfully saved": "Successfully saved",
     "Supported country codes": "Supported country codes",
-    "Supported country codes - Tooltip": "Country codes supported by the organization. These codes can be selected as a prefix when sending SMS verification codes",
+    "Supported country codes - Tooltip": "Cell phone number prefix, used to distinguish between countries or regions",
     "Sure to delete": "Sure to delete",
     "Swagger": "Swagger",
     "Sync": "Sync",
     "Syncers": "Syncers",
-    "System Info": "System Info",
+    "SysInfo": "SysInfo",
     "This is a read-only demo site!": "This is a read-only demo site!",
     "Timestamp": "Timestamp",
     "Tokens": "Tokens",
     "URL": "URL",
-    "URL - Tooltip": "URL link",
+    "URL - Tooltip": "URL Link",
     "Up": "Up",
     "User": "User",
-    "User - Tooltip": "Make sure the username is correct",
-    "User containers": "User pools",
+    "User - Tooltip": "Make sure the username is spelled correctly",
+    "User containers": "User containers",
     "User type": "User type",
-    "User type - Tooltip": "Tags that the user belongs to, defaulting to \"normal-user\"",
+    "User type - Tooltip": "User roles with different privileges",
     "Users": "Users",
     "Users under all organizations": "Users under all organizations",
     "Webhooks": "Webhooks",
-    "empty": "empty",
     "{total} in total": "{total} in total"
   },
   "ldap": {
+    "Address": "Address",
     "Admin": "Admin",
     "Admin - Tooltip": "CN or ID of the LDAP server administrator",
     "Admin Password": "Admin Password",
@@ -282,17 +287,21 @@
     "Base DN - Tooltip": "Base DN during LDAP search",
     "CN": "CN",
     "Edit LDAP": "Edit LDAP",
+    "Email": "Email",
     "Enable SSL": "Enable SSL",
-    "Enable SSL - Tooltip": "Whether to enable SSL",
-    "Group ID": "Group ID",
+    "Enable SSL - Tooltip": "Enable SSL - Tooltip",
+    "Group Id": "Group Id",
+    "ID": "ID",
     "Last Sync": "Last Sync",
+    "Phone": "Phone",
     "Server": "Server",
-    "Server host": "Server host",
-    "Server host - Tooltip": "LDAP server address",
-    "Server name": "Server name",
-    "Server name - Tooltip": "LDAP server configuration display name",
-    "Server port": "Server port",
-    "Server port - Tooltip": "LDAP server port",
+    "Server Host": "Server Host",
+    "Server Host - Tooltip": "LDAP server address",
+    "Server Name": "Server Name",
+    "Server Name - Tooltip": "LDAP server configuration display name",
+    "Server Port": "Server Port",
+    "Server Port - Tooltip": "LDAP server port",
+    "Sync": "Sync",
     "The Auto Sync option will sync all users to specify organization": "The Auto Sync option will sync all users to specify organization",
     "UidNumber / Uid": "UidNumber / Uid"
   },
@@ -305,6 +314,8 @@
     "Logging out...": "Logging out...",
     "No account?": "No account?",
     "Or sign in with another account": "Or sign in with another account",
+    "Password": "Password",
+    "Password - Tooltip": "Make sure the password is correct",
     "Please input your Email or Phone!": "Please input your Email or Phone!",
     "Please input your code!": "Please input your code!",
     "Please input your password!": "Please input your password!",
@@ -314,10 +325,10 @@
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
-    "Successfully logged in with WebAuthn credentials": "Successfully logged in with WebAuthn credentials",
-    "The input is not valid Email or phone number!": "The input is not valid Email or phone number!",
+    "Successfully logged in with webauthn credentials": "Successfully logged in with webauthn credentials",
+    "The input is not valid Email or Phone!": "The input is not valid Email or Phone!",
     "To access": "To access",
-    "Verification code": "Verification code",
+    "Verification Code": "Verification Code",
     "WebAuthn": "WebAuthn",
     "sign up now": "sign up now",
     "username, Email or phone": "username, Email or phone"
@@ -325,85 +336,93 @@
   "model": {
     "Edit Model": "Edit Model",
     "Model text": "Model text",
-    "Model text - Tooltip": "Casbin access control model, including built-in models like ACL, RBAC, ABAC, RESTful, etc. You can also create custom models. For more information, please visit the Casbin website",
+    "Model text - Tooltip": "Casbin Access Control Model",
     "New Model": "New Model"
   },
   "organization": {
     "Account items": "Account items",
     "Account items - Tooltip": "Items in the Personal settings page",
+    "Default avatar": "Default avatar",
     "Edit Organization": "Edit Organization",
+    "Favicon": "Favicon",
     "Follow global theme": "Follow global theme",
-    "Init score": "Init score",
-    "Init score - Tooltip": "Initial score points awarded to users upon registration",
+    "InitScore": "InitScore",
     "Is profile public": "Is profile public",
-    "Is profile public - Tooltip": "After being closed, only global administrators or users in the same organization can access the user's profile page",
+    "Is profile public - Tooltip": "When closed, only global administrators or users from the same organization can access the user home page",
     "Modify rule": "Modify rule",
     "New Organization": "New Organization",
     "Soft deletion": "Soft deletion",
-    "Soft deletion - Tooltip": "When enabled, deleting users will not completely remove them from the database. Instead, they will be marked as deleted",
+    "Soft deletion - Tooltip": "When enabled, deletion of user information will not be completely cleared in the database, but will be marked as deleted",
     "Tags": "Tags",
-    "Tags - Tooltip": "Collection of tags available for users to choose from",
+    "Tags - Tooltip": "Collection of user-selectable tags",
+    "The user's initScore - Tooltip": "User's initial points",
     "View rule": "View rule",
     "Visible": "Visible",
     "Website URL": "Website URL",
-    "Website URL - Tooltip": "The homepage URL of the organization. This field is not used in Casdoor"
+    "Website URL - Tooltip": "Website URL"
   },
   "payment": {
     "Confirm your invoice information": "Confirm your invoice information",
     "Currency": "Currency",
-    "Currency - Tooltip": "Like USD, CNY, etc.",
+    "Currency - Tooltip": "Payment Currency",
     "Download Invoice": "Download Invoice",
     "Edit Payment": "Edit Payment",
     "Individual": "Individual",
     "Invoice URL": "Invoice URL",
     "Invoice URL - Tooltip": "URL for downloading the invoice",
     "Invoice actions": "Invoice actions",
-    "Invoice actions - Tooltip": "Operations include issuing invoices and downloading invoices",
+    "Invoice actions - Tooltip": "Operation includes both invoicing and downloading invoices",
     "Invoice remark": "Invoice remark",
-    "Invoice remark - Tooltip": "The remark should not exceed 50 characters",
+    "Invoice remark - Tooltip": "Remarks no more than 50 words",
     "Invoice tax ID": "Invoice tax ID",
-    "Invoice tax ID - Tooltip": "When the invoice type is for an organization, the organization taxpayer identification number must be entered; when the invoice type is for an individual, it is not necessary to fill in this information",
+    "Invoice tax ID - Tooltip": "When the invoicing type is unit, the unit taxpayer identification number must be entered; when the invoicing type is individual, it is not necessary to fill in",
     "Invoice title": "Invoice title",
-    "Invoice title - Tooltip": "When the invoice type is for an organization, the invoice title can be entered as the organization name; when the invoice type is for an individual, the system will automatically fill in the payer's name",
+    "Invoice title - Tooltip": "When the invoicing type is unit, the name of the unit can be entered in the invoice payable; when the invoicing type is individual, the system automatically fills in the name of the contributor",
     "Invoice type": "Invoice type",
-    "Invoice type - Tooltip": "The invoice type can be for an individual or an organization",
+    "Invoice type - Tooltip": "Invoicing type can be personal or unit",
     "Issue Invoice": "Issue Invoice",
     "Message": "Message",
     "Message - Tooltip": "Payment processing result message",
     "New Payment": "New Payment",
+    "Organization": "Organization",
     "Person Email": "Person Email",
-    "Person Email - Tooltip": "Email of the payer",
+    "Person Email - Tooltip": "Person Email",
     "Person ID card": "Person ID card",
-    "Person ID card - Tooltip": "ID card number of the payer",
+    "Person ID card - Tooltip": "ID number of the payer",
     "Person name": "Person name",
-    "Person name - Tooltip": "Real name of the payer",
+    "Person name - Tooltip": "Name of the payer",
     "Person phone": "Person phone",
-    "Person phone - Tooltip": "The phone number of the payer",
+    "Person phone - Tooltip": "The cell phone number of the payer",
     "Please carefully check your invoice information. Once the invoice is issued, it cannot be withdrawn or modified.": "Please carefully check your invoice information. Once the invoice is issued, it cannot be withdrawn or modified.",
     "Please click the below button to return to the original website": "Please click the below button to return to the original website",
     "Please pay the order first!": "Please pay the order first!",
+    "Price": "Price",
+    "Price - Tooltip": "Price of payment",
     "Processing...": "Processing...",
     "Product": "Product",
     "Product - Tooltip": "Product Name",
     "Result": "Result",
     "Return to Website": "Return to Website",
+    "State": "State",
+    "State - Tooltip": "Payment Status",
     "The payment has failed": "The payment has failed",
     "The payment is still under processing": "The payment is still under processing",
-    "Type - Tooltip": "Payment method used when purchasing the product",
+    "Type": "Type",
+    "Type - Tooltip": "Payment method when purchasing product",
     "You have successfully completed the payment": "You have successfully completed the payment",
     "please wait for a few seconds...": "please wait for a few seconds...",
     "the current state is": "the current state is"
   },
   "permission": {
     "Actions": "Actions",
-    "Actions - Tooltip": "Allowed actions",
+    "Actions - Tooltip": "Authorized actions",
     "Admin": "Admin",
     "Allow": "Allow",
     "Approve time": "Approve time",
-    "Approve time - Tooltip": "The time of approval for this permission",
+    "Approve time - Tooltip": "The time when the authorization was approved",
     "Approved": "Approved",
     "Approver": "Approver",
-    "Approver - Tooltip": "The person who approved the permission",
+    "Approver - Tooltip": "The person who approved the authorization",
     "Deny": "Deny",
     "Edit Permission": "Edit Permission",
     "Effect": "Effect",
@@ -412,10 +431,13 @@
     "Pending": "Pending",
     "Read": "Read",
     "Resource type": "Resource type",
-    "Resource type - Tooltip": "Type of resource",
+    "Resource type - Tooltip": "Type of authorized resources",
+    "Resources": "Resources",
     "Resources - Tooltip": "Authorized resources",
+    "State": "State",
+    "State - Tooltip": "The current statue of the authorization",
     "Submitter": "Submitter",
-    "Submitter - Tooltip": "The person applying for this permission",
+    "Submitter - Tooltip": "The person applying for this authorization",
     "TreeNode": "TreeNode",
     "Write": "Write"
   },
@@ -424,30 +446,35 @@
     "Buy": "Buy",
     "Buy Product": "Buy Product",
     "CNY": "CNY",
+    "Currency": "Currency",
+    "Currency - Tooltip": "Currency accepted for the product",
+    "Description": "Description",
+    "Description - Tooltip": "Product Description",
     "Detail": "Detail",
-    "Detail - Tooltip": "Detail of product",
+    "Detail - Tooltip": "Product Details",
     "Edit Product": "Edit Product",
     "I have completed the payment": "I have completed the payment",
     "Image": "Image",
-    "Image - Tooltip": "Image of product",
+    "Image - Tooltip": "Product Image",
     "New Product": "New Product",
     "Pay": "Pay",
-    "PayPal": "PayPal",
     "Payment providers": "Payment providers",
     "Payment providers - Tooltip": "Providers of payment services",
+    "Paypal": "Paypal",
     "Placing order...": "Placing order...",
     "Please provide your username in the remark": "Please provide your username in the remark",
     "Please scan the QR code to pay": "Please scan the QR code to pay",
     "Price": "Price",
-    "Price - Tooltip": "Price of product",
+    "Price - Tooltip": "Price of the product",
     "Quantity": "Quantity",
-    "Quantity - Tooltip": "Quantity of product",
+    "Quantity - Tooltip": "Quantity of the product",
     "Return URL": "Return URL",
-    "Return URL - Tooltip": "URL to return to after successful purchase",
+    "Return URL - Tooltip": "The link that jumps after payment is complete",
     "SKU": "SKU",
     "Sold": "Sold",
-    "Sold - Tooltip": "Quantity sold",
-    "Tag - Tooltip": "Tag of product",
+    "Sold - Tooltip": "Number of this product sold",
+    "Tag": "Tag",
+    "Tag - Tooltip": "Tag of the product",
     "Test buy page..": "Test buy page..",
     "There is no payment channel for this product.": "There is no payment channel for this product.",
     "This product is currently not in sale.": "This product is currently not in sale.",
@@ -464,12 +491,12 @@
     "App key": "App key",
     "App key - Tooltip": "App key",
     "App secret": "App secret",
-    "AppSecret - Tooltip": "App secret",
+    "AppSecret - Tooltip": "AppSecret",
     "Auth URL": "Auth URL",
     "Auth URL - Tooltip": "Auth URL",
     "Bucket": "Bucket",
-    "Bucket - Tooltip": "Name of bucket",
-    "Can not parse metadata": "Can not parse metadata",
+    "Bucket - Tooltip": "Name of Bucket",
+    "Can not parse Metadata": "Can not parse Metadata",
     "Can signin": "Can signin",
     "Can signup": "Can signup",
     "Can unlink": "Can unlink",
@@ -487,42 +514,43 @@
     "Client secret 2 - Tooltip": "The second client secret key",
     "Copy": "Copy",
     "Disable SSL": "Disable SSL",
-    "Disable SSL - Tooltip": "Whether to disable SSL protocol when communicating with STMP server",
+    "Disable SSL - Tooltip": "Whether to disable SSL security protocol when communicating with STMP server",
     "Domain": "Domain",
-    "Domain - Tooltip": "Custom domain for object storage",
+    "Domain - Tooltip": "Storage node custom domain name",
     "Edit Provider": "Edit Provider",
     "Email content": "Email content",
-    "Email content - Tooltip": "Content of the Email",
+    "Email content - Tooltip": "Content of the email",
     "Email sent successfully": "Email sent successfully",
     "Email title": "Email title",
     "Email title - Tooltip": "Title of the email",
     "Enable QR code": "Enable QR code",
-    "Enable QR code - Tooltip": "Whether to allow scanning QR code to login",
+    "Enable QR code - Tooltip": "Enable scan code to login",
     "Endpoint": "Endpoint",
     "Endpoint (Intranet)": "Endpoint (Intranet)",
     "Host": "Host",
-    "Host - Tooltip": "Name of host",
+    "Host - Tooltip": "Fill in the host address and make sure you can connect",
     "IdP": "IdP",
     "IdP certificate": "IdP certificate",
     "Issuer URL": "Issuer URL",
     "Issuer URL - Tooltip": "Issuer URL",
     "Link copied to clipboard successfully": "Link copied to clipboard successfully",
     "Metadata": "Metadata",
-    "Metadata - Tooltip": "SAML metadata",
-    "Method - Tooltip": "Login method, QR code or silent login",
+    "Metadata - Tooltip": "Metadata",
+    "Method": "Method",
+    "Method - Tooltip": "Login behavior, QR code or silent authorization login",
+    "Name": "Name",
     "New Provider": "New Provider",
     "Parse": "Parse",
-    "Parse metadata successfully": "Parse metadata successfully",
+    "Parse Metadata successfully": "Parse Metadata successfully",
     "Path prefix": "Path prefix",
-    "Path prefix - Tooltip": "Bucket path prefix for object storage",
     "Please use WeChat and scan the QR code to sign in": "Please use WeChat and scan the QR code to sign in",
     "Port": "Port",
     "Port - Tooltip": "Make sure the port is open",
     "Prompted": "Prompted",
     "Provider URL": "Provider URL",
-    "Provider URL - Tooltip": "URL for configuring the service provider, this field is only used for reference and is not used in Casdoor",
+    "Provider URL - Tooltip": "Provider URL",
     "Region ID": "Region ID",
-    "Region ID - Tooltip": "Region ID for the service provider",
+    "Region ID - Tooltip": "Region ID - Tooltip",
     "Region endpoint for Internet": "Region endpoint for Internet",
     "Region endpoint for Intranet": "Region endpoint for Intranet",
     "Required": "Required",
@@ -540,9 +568,9 @@
     "Scope": "Scope",
     "Scope - Tooltip": "Scope",
     "Secret access key": "Secret access key",
-    "Secret access key - Tooltip": "Secret access key",
     "Secret key": "Secret key",
     "Secret key - Tooltip": "Used by the server to call the verification code provider API for verification",
+    "SecretAccessKey - Tooltip": "SecretAccessKey",
     "Send Testing Email": "Send Testing Email",
     "Send Testing SMS": "Send Testing SMS",
     "Sign Name": "Sign Name",
@@ -551,47 +579,57 @@
     "Sign request - Tooltip": "Whether the request requires a signature",
     "Signin HTML": "Signin HTML",
     "Signin HTML - Edit": "Signin HTML - Edit",
-    "Signin HTML - Tooltip": "Custom HTML for replacing the default signin page style",
+    "Signin HTML - Tooltip": "Custom HTML for replacing the default login page style",
     "Signup HTML": "Signup HTML",
     "Signup HTML - Edit": "Signup HTML - Edit",
-    "Signup HTML - Tooltip": "Custom HTML for replacing the default signup page style",
+    "Signup HTML - Tooltip": "Custom HTML for replacing the default registration page style",
     "Site key": "Site key",
-    "Site key - Tooltip": "Site key",
+    "Site key - Tooltip": "For front-end embedded pages",
     "Sub type": "Sub type",
     "Sub type - Tooltip": "Sub type",
-    "Template code": "Template code",
-    "Template code - Tooltip": "Template code",
+    "Template Code": "Template Code",
+    "Template Code - Tooltip": "The code of the template used",
+    "Terms of Use": "Terms of Use",
+    "Terms of Use - Tooltip": "Terms of use to be followed by users",
+    "Test Connection": "Test Connection",
     "Test Email": "Test Email",
-    "Test Email - Tooltip": "Email address to receive test mails",
-    "Test SMTP Connection": "Test SMTP Connection",
+    "Test Email - Tooltip": "Address to accept test emails",
+    "The prefix path of the file - Tooltip": "The prefix path of the file",
     "Token URL": "Token URL",
     "Token URL - Tooltip": "Token URL",
     "Type": "Type",
     "Type - Tooltip": "Select a type",
     "UserInfo URL": "UserInfo URL",
     "UserInfo URL - Tooltip": "UserInfo URL",
-    "admin (Shared)": "admin (Shared)"
+    "Visible": "Visible",
+    "admin (share)": "admin (share)",
+    "alertType": "alertType"
   },
   "record": {
-    "Is triggered": "Is triggered"
+    "Is Triggered": "Is Triggered"
   },
   "resource": {
+    "Application": "Application",
     "Copy Link": "Copy Link",
     "File name": "File name",
     "File size": "File size",
     "Format": "Format",
+    "Link copied to clipboard successfully": "Link copied to clipboard successfully",
     "Parent": "Parent",
-    "Upload a file...": "Upload a file..."
+    "Tag": "Tag",
+    "Type": "Type",
+    "Upload a file...": "Upload a file...",
+    "User": "User"
   },
   "role": {
     "Edit Role": "Edit Role",
     "New Role": "New Role",
     "Sub domains": "Sub domains",
-    "Sub domains - Tooltip": "Domains included in the current role",
+    "Sub domains - Tooltip": "Sub domains included in the current role",
     "Sub roles": "Sub roles",
-    "Sub roles - Tooltip": "Roles included in the current role",
+    "Sub roles - Tooltip": "Sub-roles contained in the current role",
     "Sub users": "Sub users",
-    "Sub users - Tooltip": "Users included in the current role"
+    "Sub users - Tooltip": "Select the sub-users under the role"
   },
   "signup": {
     "Accept": "Accept",
@@ -615,12 +653,12 @@
     "Please select your country code!": "Please select your country code!",
     "Please select your country/region!": "Please select your country/region!",
     "Terms of Use": "Terms of Use",
-    "Terms of Use - Tooltip": "Terms of use that users need to read and agree to during registration",
     "The input is not invoice Tax ID!": "The input is not invoice Tax ID!",
     "The input is not invoice title!": "The input is not invoice title!",
     "The input is not valid Email!": "The input is not valid Email!",
     "The input is not valid Phone!": "The input is not valid Phone!",
     "Username": "Username",
+    "Username - Tooltip": "Allowed characters include letters, numbers, underscores, and may not begin with a number",
     "Your account has been created!": "Your account has been created!",
     "Your confirmed password is inconsistent with the password!": "Your confirmed password is inconsistent with the password!",
     "sign in now": "sign in now"
@@ -629,25 +667,25 @@
     "Affiliation table": "Affiliation table",
     "Affiliation table - Tooltip": "Database table name of the work unit",
     "Avatar base URL": "Avatar base URL",
-    "Avatar base URL - Tooltip": "URL prefix for the avatar images",
+    "Avatar base URL - Tooltip": "Prefix of the avatar URL",
     "Casdoor column": "Casdoor column",
     "Column name": "Column name",
     "Column type": "Column type",
     "Database": "Database",
     "Database - Tooltip": "The original database name",
     "Database type": "Database type",
-    "Database type - Tooltip": "Database type, supporting all databases supported by XORM, such as MySQL, PostgreSQL, SQL Server, Oracle, SQLite, etc.",
+    "Database type - Tooltip": "Database type, now support MySQL, PostgreSQL, SQL server, Oracle, SQLite 3",
     "Edit Syncer": "Edit Syncer",
     "Error text": "Error text",
-    "Error text - Tooltip": "Error text",
+    "Error text - Tooltip": "Error when synchronizer connects to database",
     "Is hashed": "Is hashed",
     "New Syncer": "New Syncer",
     "Sync interval": "Sync interval",
     "Sync interval - Tooltip": "Unit in seconds",
     "Table": "Table",
-    "Table - Tooltip": "Name of database table",
+    "Table - Tooltip": "Name of table",
     "Table columns": "Table columns",
-    "Table columns - Tooltip": "Columns in the table involved in data synchronization. Columns that are not involved in synchronization do not need to be added",
+    "Table columns - Tooltip": "Columns of the table that participate in data synchronization, columns that do not participate in synchronization do not need to be added",
     "Table primary key": "Table primary key",
     "Table primary key - Tooltip": "Table primary key, such as id"
   },
@@ -656,11 +694,11 @@
     "An Identity and Access Management (IAM) / Single-Sign-On (SSO) platform with web UI supporting OAuth 2.0, OIDC, SAML and CAS": "An Identity and Access Management (IAM) / Single-Sign-On (SSO) platform with web UI supporting OAuth 2.0, OIDC, SAML and CAS",
     "CPU Usage": "CPU Usage",
     "Community": "Community",
-    "Failed to get CPU usage": "Failed to get CPU usage",
-    "Failed to get memory usage": "Failed to get memory usage",
+    "Get CPU Usage Failed": "Get CPU Usage Failed",
+    "Get Memory Usage Failed": "Get Memory Usage Failed",
     "Memory Usage": "Memory Usage",
-    "Official website": "Official website",
-    "Unknown version": "Unknown version",
+    "Official Website": "Official Website",
+    "Unknown Version": "Unknown Version",
     "Version": "Version"
   },
   "theme": {
@@ -674,7 +712,7 @@
     "Is compact": "Is compact",
     "Primary color": "Primary color",
     "Theme": "Theme",
-    "Theme - Tooltip": "Style theme of the application"
+    "Theme - Tooltip": "Select a theme for your application"
   },
   "token": {
     "Access token": "Access token",
@@ -682,39 +720,42 @@
     "Edit Token": "Edit Token",
     "Expires in": "Expires in",
     "New Token": "New Token",
+    "Scope": "Scope",
     "Token type": "Token type"
   },
   "user": {
+    "\" + destType + \" reset": "\" + destType + \" reset",
     "3rd-party logins": "3rd-party logins",
-    "3rd-party logins - Tooltip": "Social logins linked by the user",
+    "3rd-party logins - Tooltip": "Login using a third-party application",
     "Address": "Address",
-    "Address - Tooltip": "Residential address",
+    "Address - Tooltip": "Usual residence address",
     "Affiliation": "Affiliation",
-    "Affiliation - Tooltip": "Employer, such as company name or organization name",
+    "Affiliation - Tooltip": "Workplace, such as company name",
     "Bio": "Bio",
-    "Bio - Tooltip": "Self introduction of the user",
+    "Bio - Tooltip": "Self Introduction",
+    "Cancel": "Cancel",
     "Captcha Verify Failed": "Captcha Verify Failed",
     "Captcha Verify Success": "Captcha Verify Success",
+    "Code Sent": "Code Sent",
     "Country code": "Country code",
     "Country/Region": "Country/Region",
-    "Country/Region - Tooltip": "Country or region",
+    "Country/Region - Tooltip": "Select Country/Region",
     "Edit User": "Edit User",
     "Email cannot be empty": "Email cannot be empty",
-    "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Homepage": "Homepage",
-    "Homepage - Tooltip": "Homepage URL of the user",
+    "Homepage - Tooltip": "Link to personal homepage",
     "ID card": "ID card",
     "Input your email": "Input your email",
     "Input your phone number": "Input your phone number",
     "Is admin": "Is admin",
-    "Is admin - Tooltip": "Is an administrator of the organization the user belongs to",
+    "Is admin - Tooltip": "Is the application admin",
     "Is deleted": "Is deleted",
-    "Is deleted - Tooltip": "Soft-deleted users only retain database records and cannot perform any operations",
+    "Is deleted - Tooltip": "Is the account deleted",
     "Is forbidden": "Is forbidden",
-    "Is forbidden - Tooltip": "Forbidden users cannot log in any more",
+    "Is forbidden - Tooltip": "Is the account disabled",
     "Is global admin": "Is global admin",
-    "Is global admin - Tooltip": "Is an administrator of Casdoor",
+    "Is global admin - Tooltip": "Is the global application",
     "Keys": "Keys",
     "Link": "Link",
     "Location": "Location",
@@ -725,12 +766,14 @@
     "New Password": "New Password",
     "New User": "New User",
     "New phone": "New phone",
+    "OK": "OK",
     "Old Password": "Old Password",
-    "Password set successfully": "Password set successfully",
+    "Password": "Password",
+    "Password Set": "Password Set",
     "Phone cannot be empty": "Phone cannot be empty",
     "Please select avatar from resources": "Please select avatar from resources",
     "Properties": "Properties",
-    "Properties - Tooltip": "Properties of the user",
+    "Properties - Tooltip": "Properties - Tooltip",
     "Re-enter New": "Re-enter New",
     "Reset Email...": "Reset Email...",
     "Reset Phone...": "Reset Phone...",
@@ -739,15 +782,14 @@
     "Set new profile picture": "Set new profile picture",
     "Set password...": "Set password...",
     "Tag": "Tag",
-    "Tag - Tooltip": "Tag of the user",
+    "Tag - Tooltip": "User's Tags",
     "Title": "Title",
-    "Title - Tooltip": "Position in the affiliation",
+    "Title - Tooltip": "Position in the unit/company",
     "Two passwords you typed do not match.": "Two passwords you typed do not match.",
     "Unlink": "Unlink",
     "Upload (.xlsx)": "Upload (.xlsx)",
     "Upload a photo": "Upload a photo",
     "Values": "Values",
-    "Verification code sent": "Verification code sent",
     "WebAuthn credentials": "WebAuthn credentials",
     "input password": "input password"
   },
@@ -758,11 +800,15 @@
     "Events": "Events",
     "Events - Tooltip": "Events",
     "Headers": "Headers",
-    "Headers - Tooltip": "HTTP headers (key-value pairs)",
+    "Headers - Tooltip": "HTTP protocol headers (key-value pairs)",
     "Is user extended": "Is user extended",
-    "Is user extended - Tooltip": "Whether to include the user's extended fields in the JSON",
-    "Method - Tooltip": "HTTP method",
+    "Is user extended - Tooltip": "Add extendedUser to JSON to extend the user field",
+    "Method": "Method",
+    "Method - Tooltip": "Http method",
+    "Name": "Name",
     "New Webhook": "New Webhook",
+    "URL": "URL",
+    "URL - Tooltip": "URL",
     "Value": "Value"
   }
 }

web/src/locales/id/data.json

@@ -1,768 +0,0 @@
-{
-  "account": {
-    "Logout": "Keluar",
-    "My Account": "Akun Saya",
-    "Sign Up": "Mendaftar"
-  },
-  "adapter": {
-    "Duplicated policy rules": "Aturan kebijakan yang diduplikasi",
-    "Edit Adapter": "Mengedit adapter",
-    "Failed to sync policies": "Gagal melakukan sinkronisasi kebijakan",
-    "New Adapter": "Adapter Baru",
-    "Policies": "Kebijakan",
-    "Policies - Tooltip": "Kebijakan aturan Casbin",
-    "Sync policies successfully": "Sinkronisasi kebijakan berhasil dilakukan"
-  },
-  "application": {
-    "Always": "Selalu",
-    "Auto signin": "Masuk otomatis",
-    "Auto signin - Tooltip": "Ketika sesi masuk yang terdaftar ada di Casdoor, secara otomatis digunakan untuk masuk ke sisi aplikasi",
-    "Background URL": "URL latar belakang",
-    "Background URL - Tooltip": "URL dari gambar latar belakang yang digunakan di halaman login",
-    "Center": "pusat",
-    "Copy SAML metadata URL": "Salin URL metadata SAML",
-    "Copy prompt page URL": "Salin URL halaman prompt",
-    "Copy signin page URL": "Salin URL halaman masuk",
-    "Copy signup page URL": "Salin URL halaman pendaftaran",
-    "Edit Application": "Mengedit aplikasi",
-    "Enable Email linking": "Aktifkan pengaitan email",
-    "Enable Email linking - Tooltip": "Ketika menggunakan penyedia layanan pihak ketiga untuk masuk, jika ada pengguna di organisasi dengan email yang sama, metode login pihak ketiga akan secara otomatis terhubung dengan pengguna tersebut",
-    "Enable SAML compression": "Aktifkan kompresi SAML",
-    "Enable SAML compression - Tooltip": "Apakah pesan respons SAML harus dikompres saat Casdoor digunakan sebagai SAML idp?",
-    "Enable WebAuthn signin": "Aktifkan masuk WebAuthn",
-    "Enable WebAuthn signin - Tooltip": "Apakah mengizinkan pengguna untuk masuk dengan WebAuthn",
-    "Enable code signin": "Aktifkan tanda tangan kode",
-    "Enable code signin - Tooltip": "Apakah mengizinkan pengguna untuk login dengan kode verifikasi telepon atau email",
-    "Enable password": "Aktifkan kata sandi",
-    "Enable password - Tooltip": "Apakah harus memperbolehkan pengguna untuk masuk dengan kata sandi",
-    "Enable side panel": "Aktifkan panel samping",
-    "Enable signin session - Tooltip": "Apakah Casdoor mempertahankan sesi setelah login ke Casdoor dari aplikasi",
-    "Enable signup": "Aktifkan pendaftaran",
-    "Enable signup - Tooltip": "Apakah akan mengizinkan pengguna untuk mendaftar akun baru",
-    "Failed to sign in": "Gagal masuk",
-    "File uploaded successfully": "Berkas telah diunggah dengan sukses",
-    "Follow organization theme": "Ikuti tema organisasi",
-    "Form CSS": "Formulir CSS",
-    "Form CSS - Edit": "Formulir CSS - Edit",
-    "Form CSS - Tooltip": "Pengaturan CSS dari formulir pendaftaran, masuk, dan lupa kata sandi (misalnya menambahkan batas dan bayangan)",
-    "Form position": "Posisi formulir",
-    "Form position - Tooltip": "Tempat pendaftaran, masuk, dan lupa kata sandi",
-    "Grant types": "Jenis-jenis hibah",
-    "Grant types - Tooltip": "Pilih jenis hibah apa yang diperbolehkan dalam protokol OAuth",
-    "Left": "Kiri",
-    "Logged in successfully": "Berhasil masuk",
-    "Logged out successfully": "Berhasil keluar dari sistem",
-    "New Application": "Aplikasi Baru",
-    "None": "Tidak ada",
-    "Please input your application!": "Silakan masukkan aplikasi Anda!",
-    "Please input your organization!": "Silakan masukkan organisasi Anda!",
-    "Please select a HTML file": "Silahkan pilih file HTML",
-    "Prompt page URL copied to clipboard successfully, please paste it into the incognito window or another browser": "Tautan halaman Prompt berhasil disalin ke papan klip, silakan tempelkan ke jendela penyamaran atau browser lainnya",
-    "Redirect URL": "Mengalihkan URL",
-    "Redirect URL (Assertion Consumer Service POST Binding URL) - Tooltip": "URL pengalihan (Penyanggah Konsumen Layanan Ikatan POST URL)",
-    "Redirect URLs": "Mengarahkan URL",
-    "Redirect URLs - Tooltip": "Daftar URL redirect yang diizinkan, mendukung pencocokan ekspresi reguler; URL yang tidak ada dalam daftar akan gagal dialihkan",
-    "Refresh token expire": "Token segar kedaluwarsa",
-    "Refresh token expire - Tooltip": "Waktu kedaluwarsa token penyegaran",
-    "Right": "Benar",
-    "Rule": "Aturan",
-    "SAML metadata": "Metadata SAML",
-    "SAML metadata - Tooltip": "Metadata dari protokol SAML",
-    "SAML metadata URL copied to clipboard successfully": "URL metadata SAML berhasil disalin ke clipboard",
-    "SAML reply URL": "Alamat URL Balasan SAML",
-    "Side panel HTML": "Panel samping HTML",
-    "Side panel HTML - Edit": "Panel sisi HTML - Sunting",
-    "Side panel HTML - Tooltip": "Menyesuaikan kode HTML untuk panel samping halaman login",
-    "Sign Up Error": "Kesalahan Pendaftaran",
-    "Signin page URL copied to clipboard successfully, please paste it into the incognito window or another browser": "URL halaman masuk berhasil disalin ke clipboard, silakan tempelkan di jendela penyamaran atau browser lainnya",
-    "Signin session": "Sesi masuk",
-    "Signup items": "Item pendaftaran",
-    "Signup items - Tooltip": "Item-item yang harus diisi pengguna saat mendaftar untuk akun baru",
-    "Signup page URL copied to clipboard successfully, please paste it into the incognito window or another browser": "Tautan halaman pendaftaran URL berhasil disalin ke papan klip, silakan tempelkan ke dalam jendela incognito atau browser lain",
-    "The application does not allow to sign up new account": "Aplikasi tidak memperbolehkan untuk mendaftar akun baru",
-    "Token expire": "Token kadaluarsa",
-    "Token expire - Tooltip": "Waktu kadaluwarsa token akses",
-    "Token format": "Format token",
-    "Token format - Tooltip": "Format dari token akses",
-    "You are unexpected to see this prompt page": "Anda tidak mengharapkan untuk melihat halaman prompt ini"
-  },
-  "cert": {
-    "Bit size": "Ukuran bit",
-    "Bit size - Tooltip": "Panjang kunci rahasia",
-    "Certificate": "Sertifikat",
-    "Certificate - Tooltip": "Sertifikat kunci publik, digunakan untuk mendekripsi tanda tangan JWT pada Access Token. Sertifikat ini biasanya perlu diimplementasikan pada sisi SDK Casdoor (yaitu aplikasi) untuk memecahkan JWT",
-    "Certificate copied to clipboard successfully": "Sertifikat berhasil disalin ke clipboard",
-    "Copy certificate": "Salin sertifikat",
-    "Copy private key": "Salin kunci pribadi",
-    "Crypto algorithm": "Algoritma kriptografi",
-    "Crypto algorithm - Tooltip": "Algoritma enkripsi yang digunakan oleh sertifikat",
-    "Download certificate": "Unduh sertifikat",
-    "Download private key": "Unduh kunci pribadi",
-    "Edit Cert": "Mengedit Sertifikat",
-    "Expire in years": "Kedaluwarsa dalam tahun-tahun",
-    "Expire in years - Tooltip": "Masa berlaku sertifikat, dalam tahun",
-    "New Cert": "Sertifikat Baru",
-    "Private key": "Kunci pribadi",
-    "Private key - Tooltip": "Kunci pribadi yang sesuai dengan sertifikat kunci publik",
-    "Private key copied to clipboard successfully": "Kunci pribadi berhasil disalin ke clipboard",
-    "Scope - Tooltip": "Skema penggunaan sertifikat:",
-    "Type - Tooltip": "Jenis sertifikat"
-  },
-  "code": {
-    "Code you received": "Kode yang kamu terima",
-    "Email code": "Kode email",
-    "Empty code": "Kode kosong",
-    "Enter your code": "Masukkan kode Anda",
-    "Phone code": "Kode telepon",
-    "Please input your phone verification code!": "Silakan masukkan kode verifikasi telepon Anda!",
-    "Please input your verification code!": "Harap masukkan kode verifikasi Anda!",
-    "Send Code": "Kirimkan Kode",
-    "Sending": "Mengirimkan",
-    "Submit and complete": "Kirim dan selesaikan"
-  },
-  "forget": {
-    "Account": "Akun",
-    "Change Password": "Ubah Kata Sandi",
-    "Choose email or phone": "Pilih email atau telepon",
-    "Next Step": "Langkah selanjutnya",
-    "Please input your username!": "Silakan masukkan nama pengguna Anda!",
-    "Reset": "Menyetel-ulang",
-    "Retrieve password": "Mengambil password",
-    "Unknown forget type": "Tipe yang tidak diketahui terlupakan",
-    "Verify": "Memverifikasi"
-  },
-  "general": {
-    "Action": "Aksi",
-    "Adapter": "Adapter",
-    "Adapter - Tooltip": "Nama tabel dari penyimpanan kebijakan",
-    "Adapters": "Adaptor",
-    "Add": "Tambahkan",
-    "Affiliation URL": "URL Afiliasi",
-    "Affiliation URL - Tooltip": "URL halaman depan untuk afiliasi",
-    "Application": "Aplikasi",
-    "Applications": "Aplikasi",
-    "Applications that require authentication": "Aplikasi yang memerlukan autentikasi",
-    "Avatar": "Avatar",
-    "Avatar - Tooltip": "Gambar avatar publik untuk pengguna",
-    "Back Home": "Kembali ke Rumah",
-    "Cancel": "Membatalkan",
-    "Captcha": "Captcha",
-    "Cert": "Sertifikat",
-    "Cert - Tooltip": "Sertifikat kunci publik yang perlu diverifikasi oleh SDK klien yang sesuai dengan aplikasi ini",
-    "Certs": "Sertifikat",
-    "Click to Upload": "Klik untuk Mengunggah",
-    "Client IP": "IP klien",
-    "Close": "Tutup",
-    "Created time": "Waktu dibuat",
-    "Default application": "Aplikasi default",
-    "Default application - Tooltip": "Aplikasi default untuk pengguna yang terdaftar langsung dari halaman organisasi",
-    "Default avatar": "Avatar default",
-    "Default avatar - Tooltip": "Avatar default yang digunakan ketika pengguna yang baru terdaftar tidak mengatur gambar avatar",
-    "Delete": "Hapus",
-    "Description": "Deskripsi",
-    "Description - Tooltip": "Informasi deskripsi terperinci untuk referensi, Casdoor itu sendiri tidak akan menggunakannya",
-    "Display name": "Nama tampilan",
-    "Display name - Tooltip": "Sebuah nama yang mudah digunakan dan mudah dibaca yang ditampilkan secara publik di UI",
-    "Down": "Turun",
-    "Edit": "Mengedit",
-    "Email": "Email",
-    "Email - Tooltip": "Alamat email yang valid",
-    "Failed to add": "Gagal menambahkan",
-    "Failed to connect to server": "Gagal terhubung ke server",
-    "Failed to delete": "Gagal menghapus",
-    "Failed to save": "Gagal menyimpan",
-    "Favicon": "Favicon",
-    "Favicon - Tooltip": "URL ikon Favicon yang digunakan di semua halaman Casdoor organisasi",
-    "First name": "Nama depan",
-    "Forget URL": "Lupakan URL",
-    "Forget URL - Tooltip": "URL kustom untuk halaman \"Lupa kata sandi\". Jika tidak diatur, halaman \"Lupa kata sandi\" default Casdoor akan digunakan. Ketika diatur, tautan \"Lupa kata sandi\" pada halaman masuk akan diarahkan ke URL ini",
-    "Found some texts still not translated? Please help us translate at": "Menemukan beberapa teks yang masih belum diterjemahkan? Tolong bantu kami menerjemahkan di",
-    "Go to writable demo site?": "Pergi ke situs demo yang dapat ditulis?",
-    "Home": "Rumah",
-    "Home - Tooltip": "Halaman utama aplikasi",
-    "ID": "ID",
-    "ID - Tooltip": "Karakter acak unik",
-    "Is enabled": "Diaktifkan",
-    "Is enabled - Tooltip": "Atur apakah itu dapat digunakan",
-    "LDAPs": "LDAPs",
-    "LDAPs - Tooltip": "Server LDAP",
-    "Languages": "Bahasa-bahasa",
-    "Languages - Tooltip": "Bahasa yang tersedia",
-    "Last name": "Nama belakang",
-    "Logo": "Logo",
-    "Logo - Tooltip": "Ikon-ikon yang disajikan aplikasi ke dunia luar",
-    "Master password": "Kata sandi utama",
-    "Master password - Tooltip": "Dapat digunakan untuk masuk ke semua pengguna di bawah organisasi ini, sehingga memudahkan administrator untuk masuk sebagai pengguna ini untuk menyelesaikan masalah teknis",
-    "Menu": "Daftar makanan",
-    "Method": "Metode",
-    "Model": "Model",
-    "Model - Tooltip": "Model kontrol akses Casbin",
-    "Models": "Model-model",
-    "Name": "Nama",
-    "Name - Tooltip": "ID unik berbasis string",
-    "OAuth providers": "Penyedia OAuth",
-    "OK": "Baik atau Oke",
-    "Organization": "Organisasi",
-    "Organization - Tooltip": "Sama seperti konsep seperti penyewa atau grup pengguna, setiap pengguna dan aplikasi termasuk ke dalam suatu organisasi",
-    "Organizations": "Organisasi",
-    "Password": "Kata sandi",
-    "Password - Tooltip": "Pastikan kata sandi yang benar",
-    "Password salt": "Garam sandi",
-    "Password salt - Tooltip": "Parameter acak yang digunakan untuk enkripsi kata sandi",
-    "Password type": "Jenis kata sandi",
-    "Password type - Tooltip": "Format penyimpanan kata sandi di database",
-    "Payments": "Pembayaran-pembayaran",
-    "Permissions": "Izin-izin",
-    "Permissions - Tooltip": "Izin dimiliki oleh pengguna ini",
-    "Phone": "Telepon",
-    "Phone - Tooltip": "Nomor telepon",
-    "Preview": "Tinjauan",
-    "Preview - Tooltip": "Mengawali pratinjau efek yang sudah dikonfigurasi",
-    "Products": "Produk",
-    "Provider": "Penyedia",
-    "Provider - Tooltip": "Penyedia pembayaran harus dikonfigurasi, termasuk PayPal, Alipay, WeChat Pay, dan sebagainya.",
-    "Providers": "Penyedia-penyedia",
-    "Providers - Tooltip": "Penyedia harus dikonfigurasi, termasuk login pihak ketiga, penyimpanan objek, kode verifikasi, dan lain-lain.",
-    "Real name": "Nama asli",
-    "Records": "Catatan",
-    "Request URI": "Permintaan URI",
-    "Resources": "Sumber daya",
-    "Roles": "Peran-peran",
-    "Roles - Tooltip": "Peran-peran yang diikuti oleh pengguna",
-    "Save": "Menyimpan",
-    "Save & Exit": "Simpan & Keluar",
-    "Session ID": "ID sesi",
-    "Sessions": "Sesi-sesi",
-    "Signin URL": "URL Masuk",
-    "Signin URL - Tooltip": "URL kustom untuk halaman masuk. Jika tidak diatur, halaman masuk Casdoor default akan digunakan. Ketika diatur, tautan masuk di berbagai halaman Casdoor akan diarahkan ke URL ini",
-    "Signup URL": "URL Pendaftaran",
-    "Signup URL - Tooltip": "URL kustom untuk halaman pendaftaran. Jika tidak diatur, halaman pendaftaran Casdoor default akan digunakan. Ketika diatur, tautan pendaftaran pada berbagai halaman Casdoor akan dialihkan ke URL ini",
-    "Signup application": "Pendaftaran aplikasi",
-    "Signup application - Tooltip": "Melalui aplikasi mana pengguna mendaftar saat mereka mendaftar",
-    "Sorry, the page you visited does not exist.": "Maaf, halaman yang Anda kunjungi tidak ada.",
-    "Sorry, the user you visited does not exist or you are not authorized to access this user.": "Maaf, pengguna yang Anda kunjungi tidak ada atau Anda tidak diizinkan untuk mengakses pengguna ini.",
-    "Sorry, you do not have permission to access this page or logged in status invalid.": "Maaf, Anda tidak memiliki izin untuk mengakses halaman ini atau status masuk tidak valid.",
-    "State": "Negara",
-    "State - Tooltip": "Negara",
-    "Successfully added": "Berhasil ditambahkan",
-    "Successfully deleted": "Berhasil dihapus",
-    "Successfully saved": "Berhasil disimpan",
-    "Supported country codes": "Kode negara yang didukung",
-    "Supported country codes - Tooltip": "Kode negara yang didukung oleh organisasi. Kode-kode ini dapat dipilih sebagai awalan saat mengirim kode verifikasi SMS",
-    "Sure to delete": "Pasti untuk menghapus",
-    "Swagger": "Swagger",
-    "Sync": "Sinkronisasi",
-    "Syncers": "Sinkronisasi",
-    "System Info": "Informasi Sistem",
-    "This is a read-only demo site!": "Ini adalah situs demo hanya untuk dibaca saja!",
-    "Timestamp": "Waktu penanda waktu",
-    "Tokens": "Token-token",
-    "URL": "URL",
-    "URL - Tooltip": "Tautan URL",
-    "Up": "Ke atas",
-    "User": "Pengguna",
-    "User - Tooltip": "Pastikan username-nya benar",
-    "User containers": "User pools",
-    "User type": "Jenis pengguna",
-    "User type - Tooltip": "Tag yang dimiliki oleh pengguna, defaultnya adalah \"normal-user\"",
-    "Users": "Pengguna-pengguna",
-    "Users under all organizations": "Pengguna di bawah semua organisasi",
-    "Webhooks": "Webhooks",
-    "empty": "kosong",
-    "{total} in total": "{total} secara keseluruhan"
-  },
-  "ldap": {
-    "Admin": "Admin",
-    "Admin - Tooltip": "CN atau ID dari administrator server LDAP",
-    "Admin Password": "Kata sandi administrator",
-    "Admin Password - Tooltip": "Kata sandi administrator server LDAP",
-    "Auto Sync": "Auto Sinkronisasi",
-    "Auto Sync - Tooltip": "Konfigurasi auto-sync dimatikan pada 0",
-    "Base DN": "DN dasar",
-    "Base DN - Tooltip": "Base DN selama pencarian LDAP",
-    "CN": "CN",
-    "Edit LDAP": "Mengedit LDAP",
-    "Enable SSL": "Aktifkan SSL",
-    "Enable SSL - Tooltip": "Apakah untuk mengaktifkan SSL?",
-    "Group ID": "ID grup",
-    "Last Sync": "Terakhir Sinkronisasi",
-    "Server": "Server",
-    "Server host": "Hewan Server",
-    "Server host - Tooltip": "Alamat server LDAP",
-    "Server name": "Nama server",
-    "Server name - Tooltip": "Konfigurasi nama tampilan server LDAP",
-    "Server port": "Port server",
-    "Server port - Tooltip": "Port server LDAP",
-    "The Auto Sync option will sync all users to specify organization": "Opsi Auto Sync akan menyinkronkan semua pengguna ke organisasi tertentu",
-    "UidNumber / Uid": "NomorUID / UID"
-  },
-  "login": {
-    "Auto sign in": "Masuk otomatis",
-    "Continue with": "Lanjutkan dengan",
-    "Email or phone": "Email atau telepon",
-    "Forgot password?": "Lupa kata sandi?",
-    "Loading": "Memuat",
-    "Logging out...": "Keluar...",
-    "No account?": "Tidak memiliki akun?",
-    "Or sign in with another account": "Atau masuk dengan akun lain",
-    "Please input your Email or Phone!": "Silahkan masukkan email atau nomor telepon Anda!",
-    "Please input your code!": "Silakan masukkan kode Anda!",
-    "Please input your password!": "Masukkan kata sandi Anda!",
-    "Please input your password, at least 6 characters!": "Silakan masukkan kata sandi Anda, minimal 6 karakter!",
-    "Redirecting, please wait.": "Mengalihkan, harap tunggu.",
-    "Sign In": "Masuk",
-    "Sign in with WebAuthn": "Masuk dengan WebAuthn",
-    "Sign in with {type}": "Masuk dengan {jenis}",
-    "Signing in...": "Masuk...",
-    "Successfully logged in with WebAuthn credentials": "Berhasil masuk dengan kredensial WebAuthn",
-    "The input is not valid Email or phone number!": "Input yang Anda masukkan tidak valid, tidak sesuai dengan Email atau nomor telepon!",
-    "To access": "Untuk mengakses",
-    "Verification code": "Kode verifikasi",
-    "WebAuthn": "WebAuthn",
-    "sign up now": "Daftar sekarang",
-    "username, Email or phone": "nama pengguna, Email atau nomor telepon"
-  },
-  "model": {
-    "Edit Model": "Mengedit Model",
-    "Model text": "Teks Model",
-    "Model text - Tooltip": "Model kontrol akses Casbin, termasuk model bawaan seperti ACL, RBAC, ABAC, RESTful, dll. Anda juga dapat membuat model kustom. Untuk informasi lebih lanjut, silakan kunjungi situs web Casbin",
-    "New Model": "Model baru"
-  },
-  "organization": {
-    "Account items": "Item akun",
-    "Account items - Tooltip": "Item pada halaman pengaturan personal",
-    "Edit Organization": "Edit Organisasi",
-    "Follow global theme": "Ikuti tema global",
-    "Init score": "Skor awal",
-    "Init score - Tooltip": "Poin skor awal diberikan kepada pengguna saat pendaftaran",
-    "Is profile public": "Apakah profilnya publik?",
-    "Is profile public - Tooltip": "Setelah ditutup, hanya administrator global atau pengguna di organisasi yang sama yang dapat mengakses halaman profil pengguna",
-    "Modify rule": "Mengubah aturan",
-    "New Organization": "Organisasi baru",
-    "Soft deletion": "Penghapusan lunak",
-    "Soft deletion - Tooltip": "Ketika diaktifkan, menghapus pengguna tidak akan sepenuhnya menghapus mereka dari database. Sebaliknya, mereka akan ditandai sebagai dihapus",
-    "Tags": "Tag-tag",
-    "Tags - Tooltip": "Kumpulan tag yang tersedia bagi pengguna untuk dipilih",
-    "View rule": "Aturan tampilan",
-    "Visible": "Terlihat",
-    "Website URL": "URL situs web",
-    "Website URL - Tooltip": "URL halaman utama organisasi. Bidang ini tidak digunakan di Casdoor"
-  },
-  "payment": {
-    "Confirm your invoice information": "Konfirmasikan informasi tagihan Anda",
-    "Currency": "Mata uang",
-    "Currency - Tooltip": "Seperti USD, CNY, dll.",
-    "Download Invoice": "Unduh Faktur",
-    "Edit Payment": "Edit Pembayaran",
-    "Individual": "Individu",
-    "Invoice URL": "URL Faktur",
-    "Invoice URL - Tooltip": "URL untuk mengunduh faktur",
-    "Invoice actions": "Tindakan faktur",
-    "Invoice actions - Tooltip": "Operasi mencakup penerbitan faktur dan unduhan faktur",
-    "Invoice remark": "Catatan Faktur",
-    "Invoice remark - Tooltip": "Komentar tidak boleh melebihi 50 karakter",
-    "Invoice tax ID": "Tagihan ID Pajak",
-    "Invoice tax ID - Tooltip": "Ketika jenis faktur untuk organisasi, nomor identifikasi pajak organisasi harus diisi; ketika jenis faktur untuk individu, tidak perlu mengisi informasi ini",
-    "Invoice title": "Judul faktur",
-    "Invoice title - Tooltip": "Ketika tipe faktur berupa organisasi, judul faktur dapat diisi dengan nama organisasi; ketika tipe faktur berupa individu, sistem akan secara otomatis mengisi nama pembayar",
-    "Invoice type": "Jenis faktur",
-    "Invoice type - Tooltip": "Jenis faktur dapat untuk individu atau organisasi",
-    "Issue Invoice": "Masalah Faktur",
-    "Message": "Pesan",
-    "Message - Tooltip": "Pesan hasil pemrosesan pembayaran",
-    "New Payment": "Pembayaran Baru",
-    "Person Email": "Email orang",
-    "Person Email - Tooltip": "Email dari pembayar",
-    "Person ID card": "Kartu identitas personal",
-    "Person ID card - Tooltip": "Nomor kartu identitas pembayar",
-    "Person name": "Nama orang",
-    "Person name - Tooltip": "Nama asli dari pembayar",
-    "Person phone": "Telepon pribadi",
-    "Person phone - Tooltip": "Nomor telepon pembayar",
-    "Please carefully check your invoice information. Once the invoice is issued, it cannot be withdrawn or modified.": "Tolong periksa dengan seksama informasi faktur anda. Setelah faktur dikeluarkan, tidak dapat ditarik atau diubah.",
-    "Please click the below button to return to the original website": "Silakan klik tombol di bawah ini untuk kembali ke situs web asli",
-    "Please pay the order first!": "Silakan bayar pesanan terlebih dahulu!",
-    "Processing...": "Pemrosesan...",
-    "Product": "Produk",
-    "Product - Tooltip": "Nama Produk",
-    "Result": "Hasil",
-    "Return to Website": "Kembali ke Situs Web",
-    "The payment has failed": "Pembayaran gagal",
-    "The payment is still under processing": "Pembayaran masih dalam proses",
-    "Type - Tooltip": "Metode pembayaran yang digunakan saat membeli produk",
-    "You have successfully completed the payment": "Anda telah berhasil menyelesaikan pembayaran",
-    "please wait for a few seconds...": "Mohon tunggu beberapa detik...",
-    "the current state is": "keadaan saat ini adalah"
-  },
-  "permission": {
-    "Actions": "Tindakan",
-    "Actions - Tooltip": "Aksi yang diizinkan",
-    "Admin": "Admin",
-    "Allow": "Mengizinkan",
-    "Approve time": "Menyetujui waktu",
-    "Approve time - Tooltip": "Waktu persetujuan untuk izin ini",
-    "Approved": "Disetujui",
-    "Approver": "Pengesah",
-    "Approver - Tooltip": "Orang yang menyetujui izin",
-    "Deny": "Menyangkal",
-    "Edit Permission": "Izin Edit",
-    "Effect": "Efek",
-    "Effect - Tooltip": "Mengizinkan atau menolak",
-    "New Permission": "Izin baru",
-    "Pending": "Tertunda",
-    "Read": "Membaca",
-    "Resource type": "Jenis sumber daya",
-    "Resource type - Tooltip": "Jenis sumber daya",
-    "Resources - Tooltip": "Sumber daya yang sah",
-    "Submitter": "Pengirim",
-    "Submitter - Tooltip": "Orang yang mengajukan izin ini",
-    "TreeNode": "PohonNode",
-    "Write": "Menulis"
-  },
-  "product": {
-    "Alipay": "Alipay",
-    "Buy": "Beli",
-    "Buy Product": "Beli Produk",
-    "CNY": "CNY",
-    "Detail": "Rincian",
-    "Detail - Tooltip": "Detail produk",
-    "Edit Product": "Edit Produk",
-    "I have completed the payment": "Saya telah menyelesaikan pembayaran",
-    "Image": "Gambar",
-    "Image - Tooltip": "Gambar produk",
-    "New Product": "Produk Baru",
-    "Pay": "Bayar",
-    "PayPal": "Paypal",
-    "Payment providers": "Penyedia pembayaran",
-    "Payment providers - Tooltip": "Penyedia layanan pembayaran",
-    "Placing order...": "Menempatkan pesanan...",
-    "Please provide your username in the remark": "Tolong berikan nama pengguna Anda dalam komentar",
-    "Please scan the QR code to pay": "Silakan pemindaian kode QR untuk pembayaran",
-    "Price": "Harga",
-    "Price - Tooltip": "Harga produk",
-    "Quantity": "Kuantitas",
-    "Quantity - Tooltip": "Kuantitas produk",
-    "Return URL": "URL Kembali",
-    "Return URL - Tooltip": "URL untuk kembali setelah pembelian sukses",
-    "SKU": "SKU",
-    "Sold": "Terjual",
-    "Sold - Tooltip": "Jumlah terjual",
-    "Tag - Tooltip": "Tag produk",
-    "Test buy page..": "Halaman pembelian uji coba.",
-    "There is no payment channel for this product.": "Tidak ada saluran pembayaran untuk produk ini.",
-    "This product is currently not in sale.": "Produk ini saat ini tidak dijual.",
-    "USD": "USD",
-    "WeChat Pay": "WeChat Pay"
-  },
-  "provider": {
-    "Access key": "Kunci akses",
-    "Access key - Tooltip": "Kunci akses",
-    "Agent ID": "ID agen",
-    "Agent ID - Tooltip": "ID Agen",
-    "App ID": "ID Aplikasi",
-    "App ID - Tooltip": "ID Aplikasi",
-    "App key": "Kunci aplikasi",
-    "App key - Tooltip": "Kunci aplikasi",
-    "App secret": "Rahasia aplikasi",
-    "AppSecret - Tooltip": "Rahasia aplikasi",
-    "Auth URL": "URL Otorisasi",
-    "Auth URL - Tooltip": "URL terautentikasi",
-    "Bucket": "Ember",
-    "Bucket - Tooltip": "Nama ember",
-    "Can not parse metadata": "Tidak dapat mengurai metadata",
-    "Can signin": "Bisa masuk",
-    "Can signup": "Bisa mendaftar",
-    "Can unlink": "Bisa melepaskan tautan",
-    "Category": "Kategori",
-    "Category - Tooltip": "Pilih kategori",
-    "Channel No.": "Saluran nomor.",
-    "Channel No. - Tooltip": "Saluran No.",
-    "Client ID": "ID klien",
-    "Client ID - Tooltip": "ID klien",
-    "Client ID 2": "ID klien 2",
-    "Client ID 2 - Tooltip": "ID Pelanggan kedua",
-    "Client secret": "Rahasia klien",
-    "Client secret - Tooltip": "Rahasia klien",
-    "Client secret 2": "Rahasia klien 2",
-    "Client secret 2 - Tooltip": "Kunci rahasia klien kedua",
-    "Copy": "Salin",
-    "Disable SSL": "Menonaktifkan SSL",
-    "Disable SSL - Tooltip": "Apakah perlu menonaktifkan protokol SSL saat berkomunikasi dengan server STMP?",
-    "Domain": "Domain",
-    "Domain - Tooltip": "Domain kustom untuk penyimpanan objek",
-    "Edit Provider": "Ubah Penyedia Layanan",
-    "Email content": "Konten Email",
-    "Email content - Tooltip": "Isi Email",
-    "Email sent successfully": "Email berhasil terkirim",
-    "Email title": "Judul Email",
-    "Email title - Tooltip": "Judul email",
-    "Enable QR code": "Aktifkan kode QR",
-    "Enable QR code - Tooltip": "Apakah diizinkan untuk memindai kode QR untuk masuk?",
-    "Endpoint": "Titik akhir",
-    "Endpoint (Intranet)": "Titik Akhir (Intranet)",
-    "Host": "Tuan rumah",
-    "Host - Tooltip": "Nama tuan rumah",
-    "IdP": "IdP",
-    "IdP certificate": "Sertifikat IdP",
-    "Issuer URL": "URL penerbit",
-    "Issuer URL - Tooltip": "URL Penerbit",
-    "Link copied to clipboard successfully": "Tautan berhasil disalin ke papan klip",
-    "Metadata": "Metadata: data yang menjelaskan atau memberikan informasi tentang data atau informasi digital lainnya, seperti informasi mengenai sumber data, format, waktu pembuatan, penulis, dan informasi lainnya yang dapat membantu dalam pengelolaan dan pemrosesan data",
-    "Metadata - Tooltip": "Metadata SAML",
-    "Method - Tooltip": "Metode login, kode QR atau login tanpa suara",
-    "New Provider": "Penyedia Baru",
-    "Parse": "Parse: Memecah atau mengurai data atau teks menjadi bagian-bagian yang lebih kecil dan lebih mudah dipahami atau dimanipulasi",
-    "Parse metadata successfully": "Berhasil mem-parse metadata",
-    "Path prefix": "Awalan jalur",
-    "Path prefix - Tooltip": "Awalan path ember untuk penyimpanan objek dalam bucket",
-    "Please use WeChat and scan the QR code to sign in": "Silakan gunakan WeChat dan pindai kode QR untuk masuk",
-    "Port": "Pelabuhan",
-    "Port - Tooltip": "Pastikan port terbuka",
-    "Prompted": "Mendorong",
-    "Provider URL": "URL penyedia",
-    "Provider URL - Tooltip": "URL untuk melakukan konfigurasi service provider, kolom ini hanya digunakan sebagai referensi dan tidak digunakan dalam Casdoor",
-    "Region ID": "Daerah ID",
-    "Region ID - Tooltip": "Daerah ID untuk penyedia layanan",
-    "Region endpoint for Internet": "Titik akhir wilayah untuk Internet",
-    "Region endpoint for Intranet": "Titik akhir wilayah untuk Intranet",
-    "Required": "Dibutuhkan",
-    "SAML 2.0 Endpoint (HTTP)": "Titik akhir SAML 2.0 (HTTP)",
-    "SMS Test": "Pengujian SMS",
-    "SMS Test - Tooltip": "Nomor telepon untuk mengirim SMS uji",
-    "SMS account": "akun SMS",
-    "SMS account - Tooltip": "Akun SMS",
-    "SMS sent successfully": "SMS berhasil terkirim",
-    "SP ACS URL": "SP ACS URL",
-    "SP ACS URL - Tooltip": "SP ACS URL",
-    "SP Entity ID": "Identitas Entitas SP",
-    "Scene": "Scena",
-    "Scene - Tooltip": "Latar belakang",
-    "Scope": "Lingkup",
-    "Scope - Tooltip": "Lingkup",
-    "Secret access key": "Kunci akses rahasia",
-    "Secret access key - Tooltip": "Kunci akses rahasia",
-    "Secret key": "Kunci rahasia",
-    "Secret key - Tooltip": "Digunakan oleh server untuk memanggil API penyedia kode verifikasi untuk melakukan verifikasi",
-    "Send Testing Email": "Kirim Email Uji Coba",
-    "Send Testing SMS": "Kirim SMS Uji Coba",
-    "Sign Name": "Tanda Tangan",
-    "Sign Name - Tooltip": "Nama tanda tangan yang akan digunakan",
-    "Sign request": "Permintaan tanda tangan",
-    "Sign request - Tooltip": "Apakah permintaan ini memerlukan tanda tangan?",
-    "Signin HTML": "Login HTML",
-    "Signin HTML - Edit": "Masuk HTML - Edit",
-    "Signin HTML - Tooltip": "HTML kustom untuk mengganti gaya halaman sign-in default",
-    "Signup HTML": "Pendaftaran HTML",
-    "Signup HTML - Edit": "Pendaftaran HTML - Sunting",
-    "Signup HTML - Tooltip": "HTML khusus untuk mengganti gaya halaman pendaftaran bawaan",
-    "Site key": "Kunci situs",
-    "Site key - Tooltip": "Kunci situs atau kunci halaman web",
-    "Sub type": "Sub jenis",
-    "Sub type - Tooltip": "Sub jenis",
-    "Template code": "Kode template",
-    "Template code - Tooltip": "Kode template",
-    "Test Email": "Email Uji Coba",
-    "Test Email - Tooltip": "Alamat email untuk menerima email percobaan",
-    "Test SMTP Connection": "Tes Koneksi SMTP",
-    "Token URL": "Token URL: Tautan Token",
-    "Token URL - Tooltip": "Token URL: URL Token",
-    "Type": "Jenis",
-    "Type - Tooltip": "Pilih tipe",
-    "UserInfo URL": "URL UserInfo",
-    "UserInfo URL - Tooltip": "URL Informasi Pengguna",
-    "admin (Shared)": "Admin (Berbagi)"
-  },
-  "record": {
-    "Is triggered": "Ditimbulkan"
-  },
-  "resource": {
-    "Copy Link": "Salin Tautan",
-    "File name": "Nama file",
-    "File size": "Ukuran file",
-    "Format": "Format",
-    "Parent": "Orangtua",
-    "Upload a file...": "Unggah sebuah file..."
-  },
-  "role": {
-    "Edit Role": "Mengedit Peran",
-    "New Role": "Peran Baru",
-    "Sub domains": "Sub domain-sub domain",
-    "Sub domains - Tooltip": "Domain yang termasuk dalam peran saat ini",
-    "Sub roles": "Peran tambahan",
-    "Sub roles - Tooltip": "Terjemahkan ke bahasa Indonesia: Peran yang termasuk dalam peran saat ini",
-    "Sub users": "Pengguna sub",
-    "Sub users - Tooltip": "Pengguna yang termasuk dalam peran saat ini"
-  },
-  "signup": {
-    "Accept": "Menerima",
-    "Agreement": "Kesepakatan",
-    "Confirm": "Konfirmasi",
-    "Decline": "Menurun",
-    "Have account?": "Punya akun?",
-    "Please accept the agreement!": "Tolong terima perjanjian ini!",
-    "Please click the below button to sign in": "Silakan klik tombol di bawah ini untuk masuk",
-    "Please confirm your password!": "Tolong konfirmasi kata sandi Anda!",
-    "Please input the correct ID card number!": "Mohon masukkan nomor kartu identitas yang benar!",
-    "Please input your Email!": "Silahkan masukkan Email kamu!",
-    "Please input your ID card number!": "Mohon masukkan nomor kartu identitas Anda!",
-    "Please input your address!": "Silakan masukkan alamat Anda!",
-    "Please input your affiliation!": "Silakan masukkan afiliasi Anda!",
-    "Please input your display name!": "Silakan masukkan nama tampilan Anda!",
-    "Please input your first name!": "Silahkan masukkan nama depan Anda!",
-    "Please input your last name!": "Silahkan masukkan nama belakang Anda!",
-    "Please input your phone number!": "Silakan masukkan nomor telepon Anda!",
-    "Please input your real name!": "Silakan masukkan nama asli Anda!",
-    "Please select your country code!": "Tolong pilih kode negara Anda!",
-    "Please select your country/region!": "Silakan pilih negara/region Anda!",
-    "Terms of Use": "Syarat Penggunaan",
-    "Terms of Use - Tooltip": "Syarat penggunaan yang harus dibaca dan disetujui oleh pengguna selama proses registrasi",
-    "The input is not invoice Tax ID!": "Input ini bukan Tax ID faktur!",
-    "The input is not invoice title!": "Masukan bukan judul faktur!",
-    "The input is not valid Email!": "Input yang dimasukkan bukan sesuai dengan format Email yang valid!",
-    "The input is not valid Phone!": "Masukan ponsel tidak valid!",
-    "Username": "Nama pengguna",
-    "Your account has been created!": "Akun Anda telah dibuat!",
-    "Your confirmed password is inconsistent with the password!": "Kata sandi yang dikonfirmasi tidak konsisten dengan kata sandi!",
-    "sign in now": "Masuk sekarang"
-  },
-  "syncer": {
-    "Affiliation table": "Tabel afiliasi",
-    "Affiliation table - Tooltip": "Nama tabel database dari unit kerja",
-    "Avatar base URL": "Avatar base URL: Alamat URL dasar Avatar",
-    "Avatar base URL - Tooltip": "Awalan URL untuk gambar avatar",
-    "Casdoor column": "Kolom Casdoor",
-    "Column name": "Nama kolom",
-    "Column type": "Tipe kolom",
-    "Database": "Database",
-    "Database - Tooltip": "Nama basis data asli",
-    "Database type": "Tipe Basis Data",
-    "Database type - Tooltip": "Jenis database, mendukung semua database yang didukung oleh XORM, seperti MySQL, PostgreSQL, SQL Server, Oracle, SQLite, dan lain-lain.",
-    "Edit Syncer": "Pengedit Sinkronisasi",
-    "Error text": "Teks kesalahan",
-    "Error text - Tooltip": "Teks kesalahan",
-    "Is hashed": "Apakah di-hash?",
-    "New Syncer": "Sinkronisasi Baru",
-    "Sync interval": "Interval sinkronisasi",
-    "Sync interval - Tooltip": "Satuan dalam detik",
-    "Table": "Tabel",
-    "Table - Tooltip": "Nama tabel database",
-    "Table columns": "Kolom tabel",
-    "Table columns - Tooltip": "Kolom pada tabel yang terlibat dalam sinkronisasi data. Kolom yang tidak terlibat dalam sinkronisasi tidak perlu ditambahkan",
-    "Table primary key": "Kunci utama tabel",
-    "Table primary key - Tooltip": "Kunci primer tabel, seperti id"
-  },
-  "system": {
-    "About Casdoor": "Tentang Casdoor",
-    "An Identity and Access Management (IAM) / Single-Sign-On (SSO) platform with web UI supporting OAuth 2.0, OIDC, SAML and CAS": "Platform Identitas dan Akses Manajemen (IAM) / Single-Sign-On (SSO) dengan antarmuka web yang mendukung OAuth 2.0, OIDC, SAML, dan CAS",
-    "CPU Usage": "Penggunaan CPU",
-    "Community": "Komunitas",
-    "Failed to get CPU usage": "Gagal mendapatkan penggunaan CPU",
-    "Failed to get memory usage": "Gagal mendapatkan penggunaan memori",
-    "Memory Usage": "Penggunaan Memori",
-    "Official website": "Situs web resmi",
-    "Unknown version": "Versi tidak diketahui",
-    "Version": "Versi"
-  },
-  "theme": {
-    "Blossom": "Bunga mekar",
-    "Border radius": "Radius batas",
-    "Compact": "Kompak",
-    "Customize theme": "Menyesuaikan tema",
-    "Dark": "Gelap",
-    "Default": "Default",
-    "Document": "Dokumen",
-    "Is compact": "Apakah kompak",
-    "Primary color": "Warna primer",
-    "Theme": "Tema",
-    "Theme - Tooltip": "Tema gaya dari aplikasi"
-  },
-  "token": {
-    "Access token": "Token akses",
-    "Authorization code": "Kode otorisasi",
-    "Edit Token": "Mengedit Token",
-    "Expires in": "Berakhir pada",
-    "New Token": "Token baru",
-    "Token type": "Jenis token"
-  },
-  "user": {
-    "3rd-party logins": "Masuk pihak ketiga",
-    "3rd-party logins - Tooltip": "Masuk sosial yang terhubung oleh pengguna",
-    "Address": "Alamat",
-    "Address - Tooltip": "Alamat tempat tinggal",
-    "Affiliation": "Afiliasi",
-    "Affiliation - Tooltip": "Pemberi Kerja, seperti nama perusahaan atau nama organisasi",
-    "Bio": "Bio: Biografi",
-    "Bio - Tooltip": "Pengenalan diri dari pengguna",
-    "Captcha Verify Failed": "Gagal memverifikasi Captcha",
-    "Captcha Verify Success": "Captcha Verifikasi Berhasil",
-    "Country code": "Kode negara",
-    "Country/Region": "Negara/daerah",
-    "Country/Region - Tooltip": "Negara atau wilayah",
-    "Edit User": "Edit Pengguna",
-    "Email cannot be empty": "Email tidak boleh kosong",
-    "Email/phone reset successfully": "Email/telepon berhasil diatur ulang",
-    "Empty input!": "Masukan kosong!",
-    "Homepage": "Homepage",
-    "Homepage - Tooltip": "URL halaman depan pengguna",
-    "ID card": "Kartu identitas",
-    "Input your email": "Masukkan alamat email Anda",
-    "Input your phone number": "Masukkan nomor telepon Anda",
-    "Is admin": "Apakah admin?",
-    "Is admin - Tooltip": "Apakah seorang administrator dari organisasi yang pengguna menjadi bagian dari?",
-    "Is deleted": "Terhapus",
-    "Is deleted - Tooltip": "Pengguna yang dihapus secara lembut hanya mempertahankan catatan basis data dan tidak dapat melakukan operasi apa pun",
-    "Is forbidden": "Dilarang",
-    "Is forbidden - Tooltip": "User yang dilarang tidak dapat masuk lagi",
-    "Is global admin": "Apakah global admin",
-    "Is global admin - Tooltip": "Adalah seorang administrator Casdoor",
-    "Keys": "Kunci",
-    "Link": "Tautan",
-    "Location": "Lokasi",
-    "Location - Tooltip": "Kota tempat tinggal",
-    "Managed accounts": "Akun yang dikelola",
-    "Modify password...": "Mengubah kata sandi...",
-    "New Email": "Email baru",
-    "New Password": "Kata Sandi Baru",
-    "New User": "Pengguna Baru",
-    "New phone": "Telepon baru",
-    "Old Password": "Kata sandi lama",
-    "Password set successfully": "Kata sandi berhasil diatur",
-    "Phone cannot be empty": "Telepon tidak boleh kosong",
-    "Please select avatar from resources": "Silakan pilih avatar dari sumber daya",
-    "Properties": "Properti",
-    "Properties - Tooltip": "Properti dari pengguna",
-    "Re-enter New": "Masukkan kembali baru",
-    "Reset Email...": "Atur Ulang Email...",
-    "Reset Phone...": "Atur Ulang Telepon...",
-    "Select a photo...": "Pilih foto...",
-    "Set Password": "Atur Kata Sandi",
-    "Set new profile picture": "Mengatur gambar profil baru",
-    "Set password...": "Tetapkan kata sandi...",
-    "Tag": "tanda",
-    "Tag - Tooltip": "Tag pengguna",
-    "Title": "Judul",
-    "Title - Tooltip": "Posisi dalam afiliasi",
-    "Two passwords you typed do not match.": "Dua password yang Anda ketikkan tidak cocok.",
-    "Unlink": "Membatalkan Tautan",
-    "Upload (.xlsx)": "Unggah (.xlsx)",
-    "Upload a photo": "Unggah foto",
-    "Values": "Nilai-nilai",
-    "Verification code sent": "Kode verifikasi telah dikirim",
-    "WebAuthn credentials": "Kredensial WebAuthn",
-    "input password": "masukkan kata sandi"
-  },
-  "webhook": {
-    "Content type": "Jenis konten",
-    "Content type - Tooltip": "Tipe konten",
-    "Edit Webhook": "Mengedit Webhook",
-    "Events": "Acara-acara",
-    "Events - Tooltip": "Acara-acara",
-    "Headers": "Headers",
-    "Headers - Tooltip": "Header HTTP (pasangan kunci-nilai)",
-    "Is user extended": "Apakah pengguna diperpanjang?",
-    "Is user extended - Tooltip": "Apakah akan menyertakan bidang-bidang tambahan pengguna dalam JSON?",
-    "Method - Tooltip": "Metode HTTP",
-    "New Webhook": "Webhook Baru",
-    "Value": "Nilai"
-  }
-}

web/src/locales/zh/data.json

@@ -5,12 +5,13 @@
     "Sign Up": "注册"
   },
   "adapter": {
-    "Duplicated policy rules": "重复的策略",
     "Edit Adapter": "编辑适配器",
     "Failed to sync policies": "同步策略失败",
     "New Adapter": "添加适配器",
     "Policies": "策略",
-    "Policies - Tooltip": "Casbin策略规则",
+    "Policies - Tooltip": "策略",
+    "Repeated policy rules": "重复的策略",
+    "Sync": "同步",
     "Sync policies successfully": "同步策略成功"
   },
   "application": {
@@ -25,35 +26,36 @@
     "Copy signin page URL": "复制登录页面URL",
     "Copy signup page URL": "复制注册页面URL",
     "Edit Application": "编辑应用",
-    "Enable Email linking": "自动关联邮箱相同的账号",
-    "Enable Email linking - Tooltip": "使用第三方授权登录时，如果组织中存在与授权用户邮箱相同的用户，会自动关联该第三方登录方式到该用户",
-    "Enable SAML compression": "压缩SAML响应",
-    "Enable SAML compression - Tooltip": "Casdoor作为SAML IdP时，是否压缩SAML响应信息",
+    "Enable SAML compress": "压缩SAML响应",
+    "Enable SAML compress - Tooltip": "Casdoor作为SAML IdP时，是否压缩SAML响应信息",
     "Enable WebAuthn signin": "启用WebAuthn登录",
     "Enable WebAuthn signin - Tooltip": "是否支持用户在登录页面通过WebAuthn方式登录",
     "Enable code signin": "启用验证码登录",
     "Enable code signin - Tooltip": "是否允许用手机或邮箱验证码登录",
-    "Enable password": "开启密码",
-    "Enable password - Tooltip": "是否允许密码登录",
+    "Enable link accounts that with the same email": "自动关联邮箱相同的账号",
+    "Enable link accounts that with the same email - Tooltip": "使用第三方授权登录时，如果组织中存在与授权用户邮箱相同的用户，会自动关联该第三方登录方式到该用户",
     "Enable side panel": "启用侧面板",
     "Enable signin session - Tooltip": "从应用登录Casdoor后，Casdoor是否保持会话",
     "Enable signup": "启用注册",
     "Enable signup - Tooltip": "是否允许用户注册",
+    "Failed to log in": "登录失败",
     "Failed to sign in": "登录失败",
     "File uploaded successfully": "文件上传成功",
     "Follow organization theme": "使用组织主题",
     "Form CSS": "表单CSS",
     "Form CSS - Edit": "编辑表单CSS",
-    "Form CSS - Tooltip": "注册、登录、忘记密码等表单的CSS样式（如增加边框和阴影）",
+    "Form CSS - Tooltip": "表单的CSS样式（如增加边框和阴影）",
     "Form position": "表单位置",
     "Form position - Tooltip": "注册、登录、忘记密码等表单的位置",
     "Grant types": "OAuth授权类型",
-    "Grant types - Tooltip": "选择允许哪些OAuth协议中的grant types",
+    "Grant types - Tooltip": "选择允许哪些OAuth协议中的Grant types",
     "Left": "居左",
     "Logged in successfully": "登录成功",
     "Logged out successfully": "登出成功",
     "New Application": "添加应用",
     "None": "关闭",
+    "Password ON": "开启密码",
+    "Password ON - Tooltip": "是否允许密码登录",
     "Please input your application!": "请输入你的应用",
     "Please input your organization!": "请输入你的组织",
     "Please select a HTML file": "请选择一个HTML文件",
@@ -61,18 +63,18 @@
     "Redirect URL": "重定向 URL",
     "Redirect URL (Assertion Consumer Service POST Binding URL) - Tooltip": "回复 URL (断言使用者服务 URL, 使用POST请求返回响应) - Tooltip",
     "Redirect URLs": "重定向 URLs",
-    "Redirect URLs - Tooltip": "允许的重定向URL列表，支持正则匹配，不在列表中的URL将会跳转失败",
+    "Redirect URLs - Tooltip": "登录成功后重定向地址列表",
     "Refresh token expire": "Refresh Token过期",
     "Refresh token expire - Tooltip": "Refresh Token过期时间",
     "Right": "居右",
     "Rule": "规则",
+    "SAML Reply URL": "SAML回复 URL",
     "SAML metadata": "SAML元数据",
     "SAML metadata - Tooltip": "SAML协议的元数据（Metadata）信息",
     "SAML metadata URL copied to clipboard successfully": "SAML元数据URL已成功复制到剪贴板",
-    "SAML reply URL": "SAML回复 URL",
-    "Side panel HTML": "侧面板HTML",
-    "Side panel HTML - Edit": "侧面板HTML - 编辑",
-    "Side panel HTML - Tooltip": "自定义登录页面侧面板的HTML代码",
+    "Side panel HTML": "侧面板 HTML",
+    "Side panel HTML - Edit": "侧面板 HTML - 编辑",
+    "Side panel HTML - Tooltip": "侧面板 HTML - Tooltip",
     "Sign Up Error": "注册错误",
     "Signin page URL copied to clipboard successfully, please paste it into the incognito window or another browser": "登录页面URL已成功复制到剪贴板，请粘贴到当前浏览器的隐身模式窗口或另一个浏览器访问",
     "Signin session": "保持登录会话",
@@ -84,34 +86,36 @@
     "Token expire - Tooltip": "Access Token过期时间",
     "Token format": "Access Token格式",
     "Token format - Tooltip": "Access Token格式",
-    "You are unexpected to see this prompt page": "错误：该提醒页面不应出现"
+    "You are unexpected to see this prompt page": "错误跳转至提醒页面"
   },
   "cert": {
     "Bit size": "位大小",
     "Bit size - Tooltip": "秘钥长度",
     "Certificate": "证书",
-    "Certificate - Tooltip": "公钥证书，用于解密Access Token的JWT签名，该证书通常需要部署到Casdoor SDK测（即应用）来解析JWT",
+    "Certificate - Tooltip": "在你的服务器上配置的公钥，用于解密签名",
     "Certificate copied to clipboard successfully": "证书已成功复制到剪贴板",
     "Copy certificate": "复制证书",
     "Copy private key": "复制私钥",
     "Crypto algorithm": "加密算法",
-    "Crypto algorithm - Tooltip": "公钥证书所使用的加密算法",
+    "Crypto algorithm - Tooltip": "加密算法",
     "Download certificate": "下载证书",
     "Download private key": "下载私钥",
     "Edit Cert": "编辑证书",
     "Expire in years": "有效期（年）",
-    "Expire in years - Tooltip": "公钥证书的有效期，以年为单位",
+    "Expire in years - Tooltip": "到期年份",
     "New Cert": "添加证书",
     "Private key": "私钥",
-    "Private key - Tooltip": "公钥证书对应的私钥",
+    "Private key - Tooltip": "私钥用于生成秘钥",
     "Private key copied to clipboard successfully": "私钥已成功复制到剪贴板",
-    "Scope - Tooltip": "公钥证书的使用场景",
-    "Type - Tooltip": "公钥证书的类型"
+    "Scope": "用途",
+    "Scope - Tooltip": "证书作用范围",
+    "Type": "类型",
+    "Type - Tooltip": "证书的类型"
   },
   "code": {
-    "Code you received": "验证码",
+    "Code You Received": "验证码",
     "Email code": "邮箱验证码",
-    "Empty code": "验证码为空",
+    "Empty Code": "验证码为空",
     "Enter your code": "输入你的验证码",
     "Phone code": "手机验证码",
     "Please input your phone verification code!": "请输入您的手机验证码！",
@@ -124,11 +128,13 @@
     "Account": "账号",
     "Change Password": "修改密码",
     "Choose email or phone": "请选择邮箱或手机号验证",
+    "Confirm": "验证密码",
     "Next Step": "下一步",
+    "Password": "密码",
     "Please input your username!": "请输入您的用户名！",
     "Reset": "重置",
     "Retrieve password": "找回密码",
-    "Unknown forget type": "未知的忘记密码类型",
+    "Unknown forget type: ": "未知的忘记密码类型: ",
     "Verify": "验证"
   },
   "general": {
@@ -138,12 +144,12 @@
     "Adapters": "适配器",
     "Add": "添加",
     "Affiliation URL": "工作单位URL",
-    "Affiliation URL - Tooltip": "工作单位的官网URL",
+    "Affiliation URL - Tooltip": "工作单位URL",
     "Application": "应用",
     "Applications": "应用",
-    "Applications that require authentication": "需要认证和鉴权的应用",
+    "Applications that require authentication": "需要鉴权的应用",
     "Avatar": "头像",
-    "Avatar - Tooltip": "公开展示的用户头像",
+    "Avatar - Tooltip": "向其他人展示的头像",
     "Back Home": "返回到首页",
     "Cancel": "取消",
     "Captcha": "人机验证码",
@@ -155,27 +161,27 @@
     "Close": "关闭",
     "Created time": "创建时间",
     "Default application": "默认应用",
-    "Default application - Tooltip": "直接从组织页面注册的用户默认所属的应用",
+    "Default application - Tooltip": "默认应用",
     "Default avatar": "默认头像",
-    "Default avatar - Tooltip": "新注册用户没有设置头像时所采用的默认头像",
+    "Default avatar - Tooltip": "默认头像",
     "Delete": "删除",
     "Description": "描述信息",
-    "Description - Tooltip": "供人参考的详细描述信息，Casdoor平台本身不会使用",
+    "Description - Tooltip": "与此有关的描述信息",
     "Display name": "显示名称",
-    "Display name - Tooltip": "在界面里公开显示的、易读的名称",
+    "Display name - Tooltip": "显示名称",
     "Down": "下移",
     "Edit": "编辑",
     "Email": "电子邮箱",
-    "Email - Tooltip": "合法的电子邮件地址",
+    "Email - Tooltip": "电子邮件：",
     "Failed to add": "添加失败",
     "Failed to connect to server": "连接服务器失败",
     "Failed to delete": "删除失败",
     "Failed to save": "保存失败",
-    "Favicon": "Favicon",
-    "Favicon - Tooltip": "该组织所有Casdoor页面中所使用的Favicon图标URL",
+    "Favicon": "网站图标",
+    "Favicon - Tooltip": "网站的Favicon图标",
     "First name": "名字",
     "Forget URL": "忘记密码URL",
-    "Forget URL - Tooltip": "自定义忘记密码页面的URL，不设置时采用Casdoor默认的忘记密码页面，设置后Casdoor各类页面的忘记密码链接会跳转到该URL",
+    "Forget URL - Tooltip": "忘记密码URL",
     "Found some texts still not translated? Please help us translate at": "发现有些文字尚未翻译？请移步这里帮我们翻译：",
     "Go to writable demo site?": "跳转至可写演示站点？",
     "Home": "首页",
@@ -196,49 +202,48 @@
     "Menu": "目录",
     "Method": "方法",
     "Model": "模型",
-    "Model - Tooltip": "Casbin的访问控制模型",
+    "Model - Tooltip": "Casbin模型",
     "Models": "模型",
     "Name": "名称",
     "Name - Tooltip": "唯一的、字符串式的ID",
     "OAuth providers": "OAuth提供方",
-    "OK": "OK",
     "Organization": "组织",
-    "Organization - Tooltip": "类似于租户、用户池等概念，每个用户和应用都从属于一个组织",
+    "Organization - Tooltip": "组织",
     "Organizations": "组织",
     "Password": "密码",
-    "Password - Tooltip": "请确认密码正确",
+    "Password - Tooltip": "密码",
     "Password salt": "密码Salt值",
     "Password salt - Tooltip": "用于密码加密的随机参数",
     "Password type": "密码类型",
-    "Password type - Tooltip": "密码在数据库中的存储格式",
+    "Password type - Tooltip": "密码在数据库中存储的形式",
     "Payments": "付款",
     "Permissions": "权限",
-    "Permissions - Tooltip": "该用户所拥有的权限",
+    "Permissions - Tooltip": "权限",
     "Phone": "手机号",
     "Phone - Tooltip": "手机号",
     "Preview": "预览",
-    "Preview - Tooltip": "可预览所配置的效果",
+    "Preview - Tooltip": "预览",
     "Products": "商品",
     "Provider": "提供商",
-    "Provider - Tooltip": "需要配置的支付提供商，包括PayPal、支付宝、微信支付等",
+    "Provider - Tooltip": "第三方登录需要配置的提供方",
     "Providers": "提供商",
-    "Providers - Tooltip": "需要配置的提供商，包括第三方登录、对象存储、验证码等",
+    "Providers - Tooltip": "第三方登录需要配置的提供方",
     "Real name": "姓名",
     "Records": "日志",
     "Request URI": "请求URI",
     "Resources": "资源",
     "Roles": "角色",
-    "Roles - Tooltip": "用户所属的角色",
+    "Roles - Tooltip": "角色",
     "Save": "保存",
     "Save & Exit": "保存 & 退出",
-    "Session ID": "会话ID",
+    "Session ID": "会话 ID",
     "Sessions": "会话",
     "Signin URL": "登录URL",
-    "Signin URL - Tooltip": "自定义登录页面的URL，不设置时采用Casdoor默认的登录页面，设置后Casdoor各类页面的登录链接会跳转到该URL",
+    "Signin URL - Tooltip": "用户的登录地址",
     "Signup URL": "注册URL",
-    "Signup URL - Tooltip": "自定义注册页面的URL，不设置时采用Casdoor默认的注册页面，设置后Casdoor各类页面的注册链接会跳转到该URL",
+    "Signup URL - Tooltip": "展示给用户的注册地址",
     "Signup application": "注册应用",
-    "Signup application - Tooltip": "用户注册时通过哪个应用注册的",
+    "Signup application - Tooltip": "表示用户注册时通过哪个应用注册的",
     "Sorry, the page you visited does not exist.": "抱歉，您访问的页面不存在",
     "Sorry, the user you visited does not exist or you are not authorized to access this user.": "抱歉，您访问的用户不存在或您无权访问该用户",
     "Sorry, you do not have permission to access this page or logged in status invalid.": "抱歉，您无权访问该页面或登录状态失效",
@@ -248,12 +253,12 @@
     "Successfully deleted": "删除成功",
     "Successfully saved": "保存成功",
     "Supported country codes": "支持的国家代码",
-    "Supported country codes - Tooltip": "该组织所支持的国家代码，发送短信验证码时可以选择这些国家的代码前缀",
+    "Supported country codes - Tooltip": "支持发送短信的国家",
     "Sure to delete": "确定删除",
     "Swagger": "API文档",
     "Sync": "同步",
     "Syncers": "同步器",
-    "System Info": "系统信息",
+    "SysInfo": "系统信息",
     "This is a read-only demo site!": "这是一个只读演示站点！",
     "Timestamp": "时间戳",
     "Tokens": "令牌",
@@ -261,17 +266,17 @@
     "URL - Tooltip": "URL链接",
     "Up": "上移",
     "User": "用户",
-    "User - Tooltip": "请确保用户名正确",
-    "User containers": "用户池",
+    "User - Tooltip": "用户 - 工具提示",
+    "User containers": "用户容器",
     "User type": "用户类型",
-    "User type - Tooltip": "用户所属的标签，默认为\"normal-user\"",
+    "User type - Tooltip": "具有不同权限的用户角色",
     "Users": "用户",
     "Users under all organizations": "所有组织里的用户",
     "Webhooks": "Webhooks",
-    "empty": "无",
     "{total} in total": "{total} 总计"
   },
   "ldap": {
+    "Address": "地址",
     "Admin": "管理员",
     "Admin - Tooltip": "LDAP服务器管理员的CN或ID",
     "Admin Password": "密码",
@@ -279,20 +284,24 @@
     "Auto Sync": "自动同步",
     "Auto Sync - Tooltip": "自动同步配置，为0时禁用",
     "Base DN": "基本DN",
-    "Base DN - Tooltip": "LDAP搜索时的基DN",
+    "Base DN - Tooltip": "LDAP搜索时的基 DN",
     "CN": "CN",
     "Edit LDAP": "编辑LDAP",
-    "Enable SSL": "启用SSL",
-    "Enable SSL - Tooltip": "是否启用SSL",
-    "Group ID": "组ID",
+    "Email": "电子邮件",
+    "Enable SSL": "启用 SSL",
+    "Enable SSL - Tooltip": "启用 SSL",
+    "Group Id": "组ID",
+    "ID": "ID",
     "Last Sync": "最近同步",
+    "Phone": "电话",
     "Server": "服务器",
-    "Server host": "域名",
-    "Server host - Tooltip": "LDAP服务器地址",
-    "Server name": "LDAP服务器",
-    "Server name - Tooltip": "LDAP服务器配置显示名称",
-    "Server port": "端口",
-    "Server port - Tooltip": "LDAP服务器端口号",
+    "Server Host": "域名",
+    "Server Host - Tooltip": "LDAP服务器地址",
+    "Server Name": "LDAP服务器",
+    "Server Name - Tooltip": "LDAP服务器配置显示名称",
+    "Server Port": "端口",
+    "Server Port - Tooltip": "LDAP服务器端口号",
+    "Sync": "同步",
     "The Auto Sync option will sync all users to specify organization": "自动同步选项将同步所有用户以指定组织",
     "UidNumber / Uid": "Uid号码 / Uid"
   },
@@ -305,6 +314,8 @@
     "Logging out...": "正在退出登录...",
     "No account?": "没有账号？",
     "Or sign in with another account": "或者，登录其他账号",
+    "Password": "密码",
+    "Password - Tooltip": "密码",
     "Please input your Email or Phone!": "请输入您的Email或手机号!",
     "Please input your code!": "请输入您的验证码！",
     "Please input your password!": "请输入您的密码！",
@@ -314,39 +325,41 @@
     "Sign in with WebAuthn": "WebAuthn登录",
     "Sign in with {type}": "{type}登录",
     "Signing in...": "正在登录...",
-    "Successfully logged in with WebAuthn credentials": "成功使用WebAuthn证书登录",
-    "The input is not valid Email or phone number!": "您输入的电子邮箱格式或手机号有误！",
+    "Successfully logged in with webauthn credentials": "成功使用WebAuthn证书登录",
+    "The input is not valid Email or Phone!": "您输入的电子邮箱格式或手机号有误！",
     "To access": "访问",
-    "Verification code": "验证码",
-    "WebAuthn": "WebAuthn",
+    "Verification Code": "验证码",
+    "WebAuthn": "Web身份验证",
     "sign up now": "立即注册",
     "username, Email or phone": "用户名、Email或手机号"
   },
   "model": {
     "Edit Model": "编辑模型",
     "Model text": "模型文本",
-    "Model text - Tooltip": "Casbin访问控制模型，支持ACL、RBAC、ABAC、RESTful等内置模型，也可以自定义模型，具体请查看Casbin官网",
+    "Model text - Tooltip": "Casbin访问控制模型",
     "New Model": "添加模型"
   },
   "organization": {
     "Account items": "个人页设置项",
-    "Account items - Tooltip": "用户的个人设置页面中可配置的选项",
+    "Account items - Tooltip": "个人设置页面中的项目",
+    "Default avatar": "默认头像",
     "Edit Organization": "编辑组织",
+    "Favicon": "图标",
     "Follow global theme": "使用全局默认主题",
-    "Init score": "初始积分",
-    "Init score - Tooltip": "用户注册后所拥有的初始积分",
-    "Is profile public": "是否公开用户个人页",
-    "Is profile public - Tooltip": "关闭后只有全局管理员或同组织用户才能访问用户主页",
+    "InitScore": "初始积分",
+    "Is profile public": "用户个人页公开",
+    "Is profile public - Tooltip": "关闭后，只有全局管理员或同组织用户才能访问用户主页",
     "Modify rule": "修改规则",
     "New Organization": "添加组织",
     "Soft deletion": "软删除",
-    "Soft deletion - Tooltip": "启用后，删除一个用户时不会在数据库彻底清除，只会标记为已删除状态",
+    "Soft deletion - Tooltip": "启用后，删除用户信息时不会在数据库彻底清除，只会标记为已删除状态",
     "Tags": "标签集合",
-    "Tags - Tooltip": "可供用户选择的标签集合",
+    "Tags - Tooltip": "可供用户选择的标签的集合",
+    "The user's initScore - Tooltip": "用户的初始积分",
     "View rule": "查看规则",
     "Visible": "是否可见",
-    "Website URL": "主页地址",
-    "Website URL - Tooltip": "组织的主页地址URL，该字段在Casdoor平台中未被使用"
+    "Website URL": "网页地址",
+    "Website URL - Tooltip": "网页地址"
   },
   "payment": {
     "Confirm your invoice information": "确认您的发票信息",
@@ -371,6 +384,7 @@
     "Message": "消息",
     "Message - Tooltip": "付款处理结果消息",
     "New Payment": "添加付款",
+    "Organization": "单位",
     "Person Email": "缴费人电子邮箱",
     "Person Email - Tooltip": "缴费人本人的电子邮箱",
     "Person ID card": "缴费人身份证号",
@@ -382,13 +396,18 @@
     "Please carefully check your invoice information. Once the invoice is issued, it cannot be withdrawn or modified.": "请仔细检查下列发票信息，发票一经开具，无法退换。",
     "Please click the below button to return to the original website": "请点击下方按钮返回原网站",
     "Please pay the order first!": "请先完成支付后再进行操作!",
+    "Price": "价格",
+    "Price - Tooltip": "商品价格",
     "Processing...": "正在处理...",
     "Product": "商品",
     "Product - Tooltip": "商品名称",
     "Result": "结果",
     "Return to Website": "返回原网站",
+    "State": "状态",
+    "State - Tooltip": "交易状态",
     "The payment has failed": "支付失败",
     "The payment is still under processing": "支付正在处理",
+    "Type": "支付方式",
     "Type - Tooltip": "商品购买时的支付方式",
     "You have successfully completed the payment": "支付成功",
     "please wait for a few seconds...": "请稍后...",
@@ -396,7 +415,7 @@
   },
   "permission": {
     "Actions": "动作",
-    "Actions - Tooltip": "被授权的操作",
+    "Actions - Tooltip": "授权的动作",
     "Admin": "管理员权限",
     "Allow": "允许",
     "Approve time": "审批时间",
@@ -413,7 +432,10 @@
     "Read": "读权限",
     "Resource type": "资源类型",
     "Resource type - Tooltip": "授权资源的类型",
+    "Resources": "资源",
     "Resources - Tooltip": "被授权的资源",
+    "State": "审批状态",
+    "State - Tooltip": "该授权现在的状态",
     "Submitter": "申请者",
     "Submitter - Tooltip": "申请该授权的人",
     "TreeNode": "树节点",
@@ -424,30 +446,35 @@
     "Buy": "购买",
     "Buy Product": "购买商品",
     "CNY": "人民币",
+    "Currency": "币种",
+    "Currency - Tooltip": "币种 - 工具提示",
+    "Description": "描述",
+    "Description - Tooltip": "描述 - 工具提示",
     "Detail": "详情",
-    "Detail - Tooltip": "商品详情",
+    "Detail - Tooltip": "详情 - 工具提示",
     "Edit Product": "编辑商品",
     "I have completed the payment": "支付完成",
     "Image": "图片",
-    "Image - Tooltip": "商品图片",
+    "Image - Tooltip": "图片 - 工具提示",
     "New Product": "添加商品",
     "Pay": "支付方式",
-    "PayPal": "PayPal",
     "Payment providers": "支付提供商",
-    "Payment providers - Tooltip": "支持的支付提供商，包括PayPal、支付宝、微信支付等",
+    "Payment providers - Tooltip": "支付提供商 - 工具提示",
+    "Paypal": "PayPal（贝宝）",
     "Placing order...": "正在下单...",
-    "Please provide your username in the remark": "请在备注中提供您的用户名",
+    "Please provide your username in the remark": "Please provide your username in the remark",
     "Please scan the QR code to pay": "请扫描二维码支付",
     "Price": "价格",
-    "Price - Tooltip": "产品价格",
+    "Price - Tooltip": "价格 - 工具提示",
     "Quantity": "库存",
-    "Quantity - Tooltip": "库存的数量",
+    "Quantity - Tooltip": "库存 - 工具提示",
     "Return URL": "返回URL",
-    "Return URL - Tooltip": "购买成功后返回的URL",
+    "Return URL - Tooltip": "返回URL - 工具提示",
     "SKU": "货号",
     "Sold": "售出",
-    "Sold - Tooltip": "已售出的数量",
-    "Tag - Tooltip": "商品类别",
+    "Sold - Tooltip": "售出 - 工具提示",
+    "Tag": "类别",
+    "Tag - Tooltip": "类别 - 工具提示",
     "Test buy page..": "测试购买页面..",
     "There is no payment channel for this product.": "该商品没有付款方式。",
     "This product is currently not in sale.": "该商品目前未在售。",
@@ -455,74 +482,75 @@
     "WeChat Pay": "微信支付"
   },
   "provider": {
-    "Access key": "Access key",
+    "Access key": "访问密钥",
     "Access key - Tooltip": "Access key",
     "Agent ID": "Agent ID",
-    "Agent ID - Tooltip": "Agent ID",
+    "Agent ID - Tooltip": "Agent ID - Tooltip",
     "App ID": "App ID",
-    "App ID - Tooltip": "App ID",
+    "App ID - Tooltip": "App ID - Tooltip",
     "App key": "App key",
-    "App key - Tooltip": "App key",
+    "App key - Tooltip": "App key - Tooltip",
     "App secret": "App secret",
-    "AppSecret - Tooltip": "App secret",
+    "AppSecret - Tooltip": "AppSecret - Tooltip",
     "Auth URL": "Auth URL",
-    "Auth URL - Tooltip": "Auth URL",
+    "Auth URL - Tooltip": "Auth URL - 工具提示",
     "Bucket": "存储桶",
     "Bucket - Tooltip": "Bucket名称",
-    "Can not parse metadata": "无法解析元数据",
+    "Can not parse Metadata": "无法解析元数据",
     "Can signin": "可用于登录",
     "Can signup": "可用于注册",
     "Can unlink": "可解绑定",
     "Category": "分类",
     "Category - Tooltip": "分类",
-    "Channel No.": "Channel号码",
-    "Channel No. - Tooltip": "Channel号码",
-    "Client ID": "Client ID",
+    "Channel No.": "Channel No.",
+    "Channel No. - Tooltip": "Channel No. - Tooltip",
+    "Client ID": "客户端ID",
     "Client ID - Tooltip": "Client ID",
-    "Client ID 2": "Client ID 2",
-    "Client ID 2 - Tooltip": "第二个Client ID",
-    "Client secret": "Client secret",
+    "Client ID 2": "客户端 ID 2",
+    "Client ID 2 - Tooltip": "客户端 ID 2 - 工具提示",
+    "Client secret": "客户端密钥",
     "Client secret - Tooltip": "Client secret",
-    "Client secret 2": "Client secret 2",
-    "Client secret 2 - Tooltip": "第二个Client secret",
+    "Client secret 2": "客户端密钥 2",
+    "Client secret 2 - Tooltip": "客户端密钥 2 - 工具提示",
     "Copy": "复制",
     "Disable SSL": "禁用SSL",
-    "Disable SSL - Tooltip": "与STMP服务器通信时是否禁用SSL协议",
+    "Disable SSL - Tooltip": "与STMP服务器通信时是否禁用SSL安全协议",
     "Domain": "域名",
-    "Domain - Tooltip": "对象存储的自定义域名",
+    "Domain - Tooltip": "存储节点自定义域名",
     "Edit Provider": "编辑提供商",
     "Email content": "邮件内容",
     "Email content - Tooltip": "邮件内容",
     "Email sent successfully": "邮件发送成功",
     "Email title": "邮件标题",
     "Email title - Tooltip": "邮件标题",
-    "Enable QR code": "扫码登录",
-    "Enable QR code - Tooltip": "是否允许扫描二维码登录",
+    "Enable QR code": "扫码登陆",
+    "Enable QR code - Tooltip": "扫码登陆 - 工具提示",
     "Endpoint": "地域节点 (外网)",
     "Endpoint (Intranet)": "地域节点 (内网)",
     "Host": "主机",
-    "Host - Tooltip": "主机名",
+    "Host - Tooltip": "主机",
     "IdP": "IdP",
-    "IdP certificate": "IdP公钥证书",
-    "Issuer URL": "Issuer链接",
-    "Issuer URL - Tooltip": "Issuer链接URL",
+    "IdP certificate": "IdP 公钥",
+    "Issuer URL": "发行者网址",
+    "Issuer URL - Tooltip": "发行者URL - 工具提示",
     "Link copied to clipboard successfully": "链接已成功复制到剪贴板",
     "Metadata": "元数据",
-    "Metadata - Tooltip": "SAML元数据",
-    "Method - Tooltip": "登录方法，二维码或者静默授权登录",
+    "Metadata - Tooltip": "元数据 - 工具提示",
+    "Method": "方法",
+    "Method - Tooltip": "登录行为，二维码或者静默授权登录",
+    "Name": "名称",
     "New Provider": "添加提供商",
-    "Parse": "解析",
-    "Parse metadata successfully": "解析元数据成功",
+    "Parse": "Parse",
+    "Parse Metadata successfully": "解析元数据成功",
     "Path prefix": "路径前缀",
-    "Path prefix - Tooltip": "对象存储的Bucket路径前缀",
     "Please use WeChat and scan the QR code to sign in": "请使用微信扫描二维码登录",
     "Port": "端口",
-    "Port - Tooltip": "请确保端口号打开",
+    "Port - Tooltip": "端口号",
     "Prompted": "注册后提醒绑定",
     "Provider URL": "提供商URL",
-    "Provider URL - Tooltip": "提供商网址配置对应的URL，该字段仅用来方便跳转，在Casdoor平台中未使用",
+    "Provider URL - Tooltip": "提供商URL",
     "Region ID": "地域ID",
-    "Region ID - Tooltip": "提供商服务所属的地域ID",
+    "Region ID - Tooltip": "地域ID",
     "Region endpoint for Internet": "地域节点 (外网)",
     "Region endpoint for Intranet": "地域节点 (内网)",
     "Required": "是否必填项",
@@ -530,25 +558,25 @@
     "SMS Test": "测试短信配置",
     "SMS Test - Tooltip": "请输入测试手机号",
     "SMS account": "SMS account",
-    "SMS account - Tooltip": "SMS account",
+    "SMS account - Tooltip": "SMS account - Tooltip",
     "SMS sent successfully": "短信发送成功",
     "SP ACS URL": "SP ACS URL",
-    "SP ACS URL - Tooltip": "SP ACS URL",
-    "SP Entity ID": "SP Entity ID",
+    "SP ACS URL - Tooltip": "SP ACS URL - 工具提示",
+    "SP Entity ID": "SP 实体 ID",
     "Scene": "Scene",
-    "Scene - Tooltip": "Scene",
+    "Scene - Tooltip": "Scene - Tooltip",
     "Scope": "Scope",
-    "Scope - Tooltip": "Scope",
-    "Secret access key": "Secret access key",
-    "Secret access key - Tooltip": "Secret access key",
+    "Scope - Tooltip": "Scope - 工具提示",
+    "Secret access key": "秘密访问密钥",
     "Secret key": "Secret key",
     "Secret key - Tooltip": "用于服务端调用验证码提供商API进行验证",
+    "SecretAccessKey - Tooltip": "访问密钥-工具提示",
     "Send Testing Email": "发送测试邮件",
     "Send Testing SMS": "发送测试短信",
     "Sign Name": "签名名称",
     "Sign Name - Tooltip": "签名名称",
     "Sign request": "签名请求",
-    "Sign request - Tooltip": "是否需要对请求签名",
+    "Sign request - Tooltip": "签名请求 - 工具提示",
     "Signin HTML": "登录页面HTML",
     "Signin HTML - Edit": "登录页面 - 编辑",
     "Signin HTML - Tooltip": "自定义HTML，用于替换默认的登录页面样式",
@@ -556,32 +584,42 @@
     "Signup HTML - Edit": "注册页面HTML - 编辑",
     "Signup HTML - Tooltip": "自定义HTML，用于替换默认的注册页面样式",
     "Site key": "Site key",
-    "Site key - Tooltip": "Site key",
+    "Site key - Tooltip": "用于前端嵌入页面",
     "Sub type": "子类型",
     "Sub type - Tooltip": "子类型",
-    "Template code": "模板代码",
-    "Template code - Tooltip": "模板代码",
+    "Template Code": "模板代码",
+    "Template Code - Tooltip": "模板代码",
+    "Terms of Use": "使用条款",
+    "Terms of Use - Tooltip": "使用条款 - 工具提示",
+    "Test Connection": "测试SMTP连接",
     "Test Email": "测试Email配置",
-    "Test Email - Tooltip": "接收测试邮件的Email邮箱",
-    "Test SMTP Connection": "测试SMTP连接",
+    "Test Email - Tooltip": "邮箱地址",
+    "The prefix path of the file - Tooltip": "文件的路径前缀 - 工具提示",
     "Token URL": "Token URL",
-    "Token URL - Tooltip": "自定义OAuth的Token URL",
+    "Token URL - Tooltip": "Token URL - 工具提示",
     "Type": "类型",
     "Type - Tooltip": "类型",
     "UserInfo URL": "UserInfo URL",
-    "UserInfo URL - Tooltip": "自定义OAuth的UserInfo URL",
-    "admin (Shared)": "admin（共享）"
+    "UserInfo URL - Tooltip": "UserInfo URL - 工具提示",
+    "Visible": "是否可见",
+    "admin (share)": "admin (share)",
+    "alertType": "警报类型"
   },
   "record": {
-    "Is triggered": "已触发"
+    "Is Triggered": "已触发"
   },
   "resource": {
+    "Application": "应用",
     "Copy Link": "复制链接",
     "File name": "文件名",
     "File size": "大小",
     "Format": "格式",
+    "Link copied to clipboard successfully": "链接已成功复制到剪贴板",
     "Parent": "属主",
-    "Upload a file...": "上传文件..."
+    "Tag": "标签",
+    "Type": "类型",
+    "Upload a file...": "上传文件...",
+    "User": "用户"
   },
   "role": {
     "Edit Role": "编辑角色",
@@ -612,34 +650,34 @@
     "Please input your last name!": "请输入您的姓氏！",
     "Please input your phone number!": "请输入您的手机号码！",
     "Please input your real name!": "请输入您的姓名！",
-    "Please select your country code!": "请选择国家代码！",
-    "Please select your country/region!": "请选择您的国家或地区",
+    "Please select your country code!": "请选择国家代码!",
+    "Please select your country/region!": "请选择您的国家/地区",
     "Terms of Use": "《用户协议》",
-    "Terms of Use - Tooltip": "用户注册时需要阅读并同意的使用条款",
     "The input is not invoice Tax ID!": "您输入的纳税人识别号有误！",
     "The input is not invoice title!": "您输入的发票抬头有误！",
     "The input is not valid Email!": "您输入的电子邮箱格式有误！",
     "The input is not valid Phone!": "您输入的手机号格式有误！",
     "Username": "用户名",
-    "Your account has been created!": "您的账号已成功创建！",
+    "Username - Tooltip": "唯一的用户名",
+    "Your account has been created!": "您的账号已创建！",
     "Your confirmed password is inconsistent with the password!": "您两次输入的密码不一致！",
     "sign in now": "立即登录"
   },
   "syncer": {
     "Affiliation table": "工作单位表",
     "Affiliation table - Tooltip": "工作单位的数据库表名",
-    "Avatar base URL": "头像基URL",
-    "Avatar base URL - Tooltip": "头像图片的URL前缀",
+    "Avatar base URL": "头像基础URL",
+    "Avatar base URL - Tooltip": "头像URL的前缀",
     "Casdoor column": "Casdoor列名",
     "Column name": "列名",
     "Column type": "列类型",
     "Database": "数据库",
     "Database - Tooltip": "数据库名称",
     "Database type": "数据库类型",
-    "Database type - Tooltip": "数据库类型，支持XORM所支持的所有数据库，如MySQL, PostgreSQL, SQL Server, Oracle, SQLite等",
+    "Database type - Tooltip": "数据库类型",
     "Edit Syncer": "编辑同步器",
     "Error text": "错误信息",
-    "Error text - Tooltip": "错误信息",
+    "Error text - Tooltip": "同步器连接数据库时发生的错误",
     "Is hashed": "是否参与哈希计算",
     "New Syncer": "添加同步器",
     "Sync interval": "同步间隔",
@@ -649,18 +687,18 @@
     "Table columns": "表格列",
     "Table columns - Tooltip": "参与数据同步的表格列，不参与同步的列不需要添加",
     "Table primary key": "表主键",
-    "Table primary key - Tooltip": "表主键，如id等"
+    "Table primary key - Tooltip": "表主键，如id"
   },
   "system": {
-    "About Casdoor": "关于Casdoor",
-    "An Identity and Access Management (IAM) / Single-Sign-On (SSO) platform with web UI supporting OAuth 2.0, OIDC, SAML and CAS": "一个支持OAuth 2.0、OIDC、SAML和CAS的Web UI优先的身份和访问管理（IAM）/单点登录（SSO）平台",
+    "About Casdoor": "关于 Casdoor",
+    "An Identity and Access Management (IAM) / Single-Sign-On (SSO) platform with web UI supporting OAuth 2.0, OIDC, SAML and CAS": "一个支持 OAuth 2.0、OIDC、SAML 和 CAS 的 Web UI 的身份和访问管理 (IAM)/单点登录 (SSO) 平台",
     "CPU Usage": "CPU使用率",
     "Community": "社区",
-    "Failed to get CPU usage": "获取CPU使用率失败",
-    "Failed to get memory usage": "获取内存使用率失败",
+    "Get CPU Usage Failed": "获取CPU使用率失败",
+    "Get Memory Usage Failed": "获取内存使用率失败",
     "Memory Usage": "内存使用率",
-    "Official website": "官方网站",
-    "Unknown version": "未知版本",
+    "Official Website": "官方网站",
+    "Unknown Version": "未知版本",
     "Version": "版本"
   },
   "theme": {
@@ -672,9 +710,9 @@
     "Default": "默认",
     "Document": "知识协作",
     "Is compact": "宽松度",
-    "Primary color": "主题色",
+    "Primary color": "主色",
     "Theme": "主题",
-    "Theme - Tooltip": "应用的样式主题"
+    "Theme - Tooltip": "为你的应用设置主题"
   },
   "token": {
     "Access token": "访问令牌",
@@ -682,39 +720,42 @@
     "Edit Token": "编辑令牌",
     "Expires in": "有效期",
     "New Token": "添加令牌",
+    "Scope": "范围",
     "Token type": "令牌类型"
   },
   "user": {
+    "\" + destType + \" reset": "重设\" + destType + \"",
     "3rd-party logins": "第三方登录",
-    "3rd-party logins - Tooltip": "用户所绑定的社会化登录",
+    "3rd-party logins - Tooltip": "使用第三方应用程序登录",
     "Address": "地址",
-    "Address - Tooltip": "居住地址",
+    "Address - Tooltip": "平时的居住地址",
     "Affiliation": "工作单位",
-    "Affiliation - Tooltip": "工作单位，如公司、组织名称",
+    "Affiliation - Tooltip": "工作单位，如公司名称",
     "Bio": "自我介绍",
-    "Bio - Tooltip": "用户的自我介绍",
+    "Bio - Tooltip": "自我介绍",
+    "Cancel": "取消",
     "Captcha Verify Failed": "验证码校验失败",
     "Captcha Verify Success": "验证码校验成功",
+    "Code Sent": "验证码已发送",
     "Country code": "国家代码",
     "Country/Region": "国家/地区",
-    "Country/Region - Tooltip": "国家或地区",
+    "Country/Region - Tooltip": "国家/地区",
     "Edit User": "编辑用户",
     "Email cannot be empty": "邮箱不能为空",
-    "Email/phone reset successfully": "邮箱或手机号重置成功",
     "Empty input!": "输入为空！",
     "Homepage": "个人主页",
     "Homepage - Tooltip": "个人主页链接",
     "ID card": "身份证号",
     "Input your email": "请输入邮箱",
     "Input your phone number": "输入手机号",
-    "Is admin": "是组织管理员",
-    "Is admin - Tooltip": "是用户所属组织的管理员",
+    "Is admin": "是管理员",
+    "Is admin - Tooltip": "是应用程序管理员",
     "Is deleted": "被删除",
-    "Is deleted - Tooltip": "被软删除的用户只保留数据库记录，无法进行任何操作",
+    "Is deleted - Tooltip": "账户是否已被删除",
     "Is forbidden": "被禁用",
-    "Is forbidden - Tooltip": "被禁用的用户无法再登录",
+    "Is forbidden - Tooltip": "账户是否已被禁用",
     "Is global admin": "是全局管理员",
-    "Is global admin - Tooltip": "是Casdoor平台的管理员",
+    "Is global admin - Tooltip": "是应用程序管理员",
     "Keys": "键",
     "Link": "绑定",
     "Location": "城市",
@@ -725,12 +766,14 @@
     "New Password": "新密码",
     "New User": "添加用户",
     "New phone": "新手机号",
+    "OK": "确定",
     "Old Password": "旧密码",
-    "Password set successfully": "密码设置成功",
+    "Password": "密码",
+    "Password Set": "密码已设置",
     "Phone cannot be empty": "手机号不能为空",
     "Please select avatar from resources": "从资源中选择...",
     "Properties": "属性",
-    "Properties - Tooltip": "用户的属性",
+    "Properties - Tooltip": "属性",
     "Re-enter New": "重复新密码",
     "Reset Email...": "重置邮箱...",
     "Reset Phone...": "重置手机号...",
@@ -739,15 +782,14 @@
     "Set new profile picture": "设置新头像",
     "Set password...": "设置密码...",
     "Tag": "标签",
-    "Tag - Tooltip": "用户的标签",
+    "Tag - Tooltip": "标签",
     "Title": "职务",
-    "Title - Tooltip": "在工作单位担任的职务",
+    "Title - Tooltip": "在单位/公司的职务",
     "Two passwords you typed do not match.": "两次输入的密码不匹配。",
     "Unlink": "解绑",
     "Upload (.xlsx)": "上传（.xlsx）",
     "Upload a photo": "上传头像",
     "Values": "值",
-    "Verification code sent": "验证码已发送",
     "WebAuthn credentials": "WebAuthn凭据",
     "input password": "输入密码"
   },
@@ -760,9 +802,13 @@
     "Headers": "协议头",
     "Headers - Tooltip": "HTTP协议头（键值对）",
     "Is user extended": "扩展用户字段",
-    "Is user extended - Tooltip": "是否在JSON里加入用户的扩展字段",
+    "Is user extended - Tooltip": "JSON里加入extendedUser来扩展用户字段",
+    "Method": "方法",
     "Method - Tooltip": "HTTP方法",
+    "Name": "名称",
     "New Webhook": "添加Webhook",
+    "URL": "网址",
+    "URL - Tooltip": "URL",
     "Value": "值"
   }
 }