Merge pull request #17995 from abpframework/auto-merge/rel-7-4/2251

Merge branch dev with rel-7.4

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json

@@ -114,6 +114,13 @@
     "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "用户是否可以确认电话号码",
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "登录时是否需要验证的手机号码.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "是否允许用户更新用户名.",
-    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "是否允许用户更新电子邮箱."
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "是否允许用户更新电子邮箱.",
+    "Details": "详情",
+    "CreatedBy": "创建者",
+    "ModifiedBy": "修改者",
+    "ModificationTime": "修改时间",
+    "PasswordUpdateTime": "密码更新时间",
+    "LockoutEndTime": "锁定结束时间",
+    "FailedAccessCount": "访问失败次数"
   }
 }

modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json

@@ -114,6 +114,13 @@
     "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "是否啟用電話認證.",
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "決定使用者是否需電話認證後才能登入.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "決定使用者是否能更新帳號.",
-    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "決定使用者是否能更新信箱."
+    "Description:Abp.Identity.User.IsEmailUpdateEnabled": "決定使用者是否能更新信箱.",
+    "Details": "詳情",
+    "CreatedBy": "創建者",
+    "ModifiedBy": "修改者",
+    "ModificationTime": "修改時間",
+    "PasswordUpdateTime": "密碼更新時間",
+    "LockoutEndTime": "鎖定結束時間",
+    "FailedAccessCount": "訪問失敗次數"
   }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json

@@ -25,7 +25,7 @@
     "SmtpPassword": "密码",
     "SmtpDomain": "域",
     "SmtpEnableSsl": "启用ssl",
-    "SmtpUseDefaultCredentials": "使用默认证书",
+    "SmtpUseDefaultCredentials": "使用默认凭据",
     "DefaultFromAddress": "默认发件人",
     "DefaultFromDisplayName": "默认显示名称",
     "Feature:SettingManagementGroup": "设置管理",