perf: 修改翻译

apps/i18n/core/en/LC_MESSAGES/django.po

@@ -7717,7 +7717,7 @@ msgstr "First login"
 
 #: users/models/user.py:848
 msgid "Date password last updated"
-msgstr "Password last updated"
+msgstr "Password updated"
 
 #: users/models/user.py:851
 msgid "Need update password"

apps/i18n/lina/en.json

@@ -8,6 +8,7 @@
     "AccountBackup": "Account Backup",
     "AccountBackupCreate": "Create Account Backup",
     "AccountBackupUpdate": "Update Account Backup",
+    "AccountBatchUpdate": "Updated selected",
     "AccountChangeSecret": "Password Change",
     "AccountCreate": "Create Account",
     "AccountDeleteConfirmMsg": "Delete Account, continue?",
@@ -17,7 +18,7 @@
     "AccountGatherTaskCreate": "Create Task",
     "AccountGatherTaskList": "Account Collect",
     "AccountGatherTaskUpdate": "Update Task",
-    "AccountList": "Cloud Account",
+    "AccountList": "Accounts",
     "AccountPolicy": "Account Policy",
     "AccountPushCreate": "Create Account Push",
     "AccountPushExecutionList": "Execute History",
@@ -40,6 +41,7 @@
     "ActiveAsset": "Recently Logged in",
     "ActiveAssetRanking": "Login Asset Ranking",
     "ActiveUser": "Logged in recently",
+    "ActiveUsers": "Active Users",
     "Activity": "Activities",
     "Add": "Add",
     "AddAccount": "Add Account",
@@ -70,7 +72,6 @@
     "AllAccounts": "All Accounts",
     "AllClickRead": "All Marked as Read",
     "AllMembers": "All Members",
-    "AllOrganization": "Organization List",
     "AllowInvalidCert": "Ignore certificate check",
     "Announcement": "Announcement",
     "AnonymousAccount": "Anonymous Account",
@@ -145,7 +146,7 @@
     "Assignees": "Pending Handler",
     "AttrName": "Attribute Name",
     "AttrValue": "Attribute value",
-    "Audits": "Audit Console",
+    "Audits": "Audit",
     "Auth": "Authentication",
     "AuthLimit": "Login Restrictions",
     "AuthSAMLCertHelpText": "Save after uploading the certificate key, then view SP Metadata",
@@ -193,6 +194,7 @@
     "BulkTransfer": "Batch Transfer",
     "BulkUnblock": "Batch Unlock",
     "BulkUpdatePlatformHelpText": "Updates will only be performed when the original platform type of the asset is the same as the selected platform type. If the platform type is different before and after the update, it will not be updated.",
+    "BulkVerify": "Verify selected",
     "CACertificate": "CA Certificate",
     "CAS": "CAS",
     "CMPP2": "CMPP v2.0",
@@ -207,13 +209,14 @@
     "Certificate": "Certificate",
     "CertificateKey": "Client Key",
     "ChangeField": "Change Field",
-    "ChangePassword": "Update Password",
+    "ChangeOrganization": "Change organization",
+    "ChangePassword": "Change Password",
     "ChangeReceiver": "Modify Message Recipient",
     "ChangeSecretParams": "Change Password Parameters",
     "ChangeViewHelpText": "Click to Switch Different Views",
     "Chat": "Chat",
     "ChatAI": "Chat AI",
-    "ChatHello": "Hello! How can I assist you?",
+    "ChatHello": "Hello! Can I help you?",
     "ChdirHelpText": "By Default, the execution directory is the user's home directory",
     "CheckAssetsAmount": "Check Asset Quantity",
     "CheckViewAcceptor": "Click to View the Acceptance Person",
@@ -234,6 +237,7 @@
     "CloseConfirmMessage": "File has changed, save?",
     "CloseStatus": "Completed",
     "Closed": "Completed",
+    "CloudAccountList": "Cloud Accounts",
     "CloudCreate": "Create Asset - Cloud Platform",
     "CloudSource": "Sync Source",
     "CloudSync": "Cloud Sync",
@@ -305,6 +309,7 @@
     "CriticalLoad": "Serious",
     "CronExpression": "Complete crontab expression",
     "CrontabOfCreateUpdatePage": "For example: Perform every Sunday at 03:05 <5 3 * * 0> <br/> Use 5-digit Linux crontab expressions <Min Hour Day Month Weekday> (<a href=\"https://tool.lu/crontab/\" target=\"_blank\">Online Tool</a>) <br/> If both regular execution and cycle execution are set, regular execution is prioritized",
+    "CurrentConnectionUsers": "Online Users",
     "CurrentConnections": "Current Connections",
     "CurrentUserVerify": "Verify Current User",
     "Custom": "Custom",
@@ -531,7 +536,7 @@
     "Input": "Input",
     "InputEmailAddress": "Please enter the correct email address",
     "InputMessage": "Enter message...",
-    "InputPhone": "Please Enter Your Mobile Number",
+    "InputPhone": "Phone number",
     "InstanceAddress": "Instance Address",
     "InstanceName": "Instance Name",
     "InstancePlatformName": "Instance Platform Name",
@@ -540,7 +545,7 @@
     "IntervalOfCreateUpdatePage": "Unit: Hour",
     "InvalidJson": "Invalid JSON",
     "InviteSuccess": "Invitation Successful",
-    "InviteUser": "Invite member",
+    "InviteUser": "Invite",
     "InviteUserInOrg": "Invite users to join this organization",
     "Ip": "IP",
     "IpGroup": "IP Group",
@@ -571,9 +576,9 @@
     "LabelList": "Labels",
     "LabelUpdate": "Update Tags",
     "Language": "Language",
-    "Last30": "Recent 30 times",
+    "Last30": "Recent 30 items",
-    "Last30Days": "Last 30 Days",
+    "Last30Days": "Monthly",
-    "Last7Days": "Past 7 Days",
+    "Last7Days": "Weekly",
     "LastPublishedTime": "Last Publish Time",
     "Ldap": "LDAP",
     "LdapBulkImport": "User Import",
@@ -643,7 +648,7 @@
     "Message": "Message",
     "MessageSubscription": "Message Subscription",
     "MessageType": "Message Type",
-    "MfaLevel": "Multi-factor Authentication",
+    "MfaLevel": "MFA",
     "Min": "Minutes",
     "Modify": "Edit",
     "Module": "Module",
@@ -669,7 +674,7 @@
     "NewSyncCount": "New Sync",
     "No": "No",
     "NoContent": "No Content",
-    "NoData": "No Data Available",
+    "NoData": "No data available",
     "NoFiles": "No Files Currently",
     "NoPermission": "No Permissions",
     "NoPermission403": "403 No Permission",
@@ -702,7 +707,7 @@
     "OneClickReadMsg": "Are you sure you want to mark the current information as read?",
     "OnlineSession": "Online users",
     "OnlineSessionHelpMsg": "Unable to log out of the current session because it is the current user's online session. Currently only users logged in via Web are being logged.",
-    "OnlineSessions": "Online Sessions Number",
+    "OnlineSessions": "Online Sessions",
     "OnlineUserDevices": "Online User Devices",
     "OnlyMailSend": "Current support for email sending",
     "OnlySearchCurrentNodePerm": "Only Search the Current Node's Authorization",
@@ -719,16 +724,16 @@
     "OrgRoleHelpText": "The Org role is the user's role within the current organization",
     "OrgRoles": "Org Role",
     "OrgUser": "Organize Users",
-    "OrganizationCreate": "Local Area Network",
+    "OrganizationCreate": "Create new",
     "OrganizationDetail": "Organization Details",
     "OrganizationList": "Organizations",
-    "OrganizationLists": "Organization List",
+    "OrganizationManage": "Manage orgs",
     "OrganizationUpdate": "Update Organization",
     "Other": "Other",
     "Output": "Output",
     "Overview": "Overview",
-    "PageNext": "Next Page",
+    "PageNext": "Next",
-    "PagePrev": "Previous Page",
+    "PagePrev": "Previous",
     "Params": "Parameter",
     "ParamsHelpText": "Password parameter settings, currently only effective for assets of the host type.",
     "PassKey": "Passkey",
@@ -766,6 +771,7 @@
     "PlaybookManage": "Playbook",
     "PlaybookUpdate": "Update Playbook",
     "PleaseAgreeToTheTerms": "Please Agree to the Terms",
+    "PleaseSelect": "Please select",
     "PolicyName": "Policy Name",
     "Port": "Port",
     "Ports": "Port",
@@ -777,8 +783,8 @@
     "PrivilegedOnly": "Privileged Accounts Only",
     "PrivilegedTemplate": "Privileged",
     "Product": "Product",
-    "Profile": "Personal Information",
+    "Profile": "Profile",
-    "ProfileSetting": "Personal Information",
+    "ProfileSetting": "Profile Info",
     "Project": "Project Name",
     "Prompt": "Prompt",
     "Proportion": "Proportion",
@@ -816,7 +822,7 @@
     "RecipientServer": "Receiving Server",
     "Reconnect": "Reconnect",
     "Refresh": "Refresh",
-    "RefreshHardware": "Update Hardware Information",
+    "RefreshHardware": "Hardware Info",
     "Regex": "Regular Expression",
     "Region": "Region",
     "RegularlyPerform": "Periodic Execution",
@@ -857,6 +863,7 @@
     "ResetMFAWarningMsg": "Are you sure you want to reset the user's MFA?",
     "ResetMFAdSuccessMsg": "MFA Reset Successful, User Can Reset MFA Again",
     "ResetPassword": "Reset Password",
+    "ResetPasswordNextLogin": "Password must be changed during next log in",
     "ResetPasswordSuccessMsg": "Reset Password Message Sent to User",
     "ResetPasswordWarningMsg": "Are you sure you want to send the password reset email for the user",
     "ResetPublicKeyAndDownload": "Reset and Download SSH Key",
@@ -865,13 +872,11 @@
     "ResetSSHKeyWarningMsg": "Are you sure you want to send a reset SSH Key email to the user?",
     "Resource": "Resources",
     "ResourceType": "Resource Type",
-    "ResetPasswordNextLogin": "Password Must Be Changed During Next Log In",
+    "RestoreButton": "Restore",
-    "RestoreButton": "Reset to Default",
+    "RestoreDefault": "Reset to default",
-    "RestoreDefault": "Reset to Default",
     "RestoreDialogMessage": "Are you sure you want to restore to default initialization?",
     "RestoreDialogTitle": "Do you confirm?",
     "Result": "Result",
-    "CloudAccountList": "Cloud Accounts",
     "Resume": "Recovery",
     "ResumeTaskSendSuccessMsg": "Recovery Task Issued, Please Refresh Later",
     "Retry": "Retry",
@@ -941,18 +946,16 @@
     "SelectAtLeastOneAssetOrNodeErrMsg": "Select at Least One Asset or Node",
     "SelectAttrs": "Select Attributes",
     "SelectByAttr": "Attribute Filter",
-    "BulkVerify": "Verify selected",
-    "AccountBatchUpdate": "Updated selected",
     "SelectFile": "Select File",
     "SelectKeyOrCreateNew": "Select Tag Key or Create New One",
-    "SelectLabelFilter": "Select Tag Search",
+    "SelectLabelFilter": "Select tag for search",
     "SelectPlatforms": "Select Platform",
     "SelectProperties": "Select Attribute",
     "SelectResource": "Select Resources",
     "SelectTemplate": "Select Template",
     "SelectValueOrCreateNew": "Select Tag Value or Create New One",
     "Selected": "Selected",
-    "Selection": "Selectable",
+    "Selection": "Selection",
     "Selector": "Selector",
     "Send": "Send",
     "SendVerificationCode": "Send Verification Code",
@@ -976,17 +979,17 @@
     "SessionsAudit": "Session Audit",
     "SessionsNum": "Sessions",
     "Set": "Configured",
-    "SetDingTalk": "Configure DingTalk Authentication",
+    "SetDingTalk": "DingTalk OAuth",
     "SetFailed": "Setting Failed",
     "SetFeiShu": "Set Feishu Authentication",
-    "SetMFA": "Set Multi-factor Authentication",
+    "SetMFA": "Multi-factor Auth",
-    "SetSlack": "Set-up Slack Authentication",
+    "SetSlack": "Slack OAuth",
     "SetStatus": "Status Setting",
     "SetSuccess": "Successfully Set",
     "SetToDefault": "Set as Default",
     "SetToDefaultStorage": "Set as Default Storage",
-    "SetWeCom": "Set up Enterprise WeChat Authentication",
+    "SetWeCom": "WeCom OAuth",
-    "Setting": "Settings",
+    "Setting": "Setting",
     "SettingInEndpointHelpText": "Configure service address and port in System Settings / Component Settings / Server Endpoints",
     "Settings": "System Settings",
     "Show": "Display",
@@ -1056,7 +1059,8 @@
     "SystemRoles": "System Roles",
     "SystemSetting": "System Settings",
     "SystemTools": "System Tools",
-    "TableColSettingInfo": "Please select the list details you want to display.",
+    "TableColSetting": "Select visible attribute columns",
+    "TableSetting": "Table preference",
     "Target": "Target",
     "TargetResources": "Target Resource",
     "Task": "Task",
@@ -1105,7 +1109,7 @@
     "Title": "Title",
     "To": "To",
     "Today": "Today",
-    "TodayFailedConnections": "Failed Connections Today",
+    "TodayFailedConnections": "Failed Session Today",
     "Token": "Token",
     "Total": "Total",
     "TotalJobFailed": "Failed Execution Actions",
@@ -1139,7 +1143,7 @@
     "UpdateEndpointRule": "Update Endpoint Rules",
     "UpdateErrorMsg": "Update Failed",
     "UpdateNodeAssetHardwareInfo": "Update Node Asset Hardware Information",
-    "UpdateSSHKey": "Update SSH Public Key",
+    "UpdateSSHKey": "Change SSH Public Key",
     "UpdateSelected": "Update selected",
     "UpdateSuccessMsg": "Update Successful",
     "Updated": "Updated",
@@ -1155,10 +1159,10 @@
     "UseProtocol": "User Agreement",
     "UseSSL": "Use SSL/TLS",
     "User": "User",
-    "UserAclLists": "User Login Rules",
+    "UserAclLists": "Login ACLs",
     "UserAssetActivity": "Account/Asset Activity",
-    "UserCreate": "Create User",
+    "UserCreate": "Create a User",
-    "UserData": "Account Data",
+    "UserData": "User Data",
     "UserDetail": "User Details",
     "UserGroupCreate": "Create User Group",
     "UserGroupDetail": "User Group Details",
@@ -1174,8 +1178,8 @@
     "UserLoginAclUpdate": "Update User Login Control",
     "UserLoginLimit": "User Login Restriction",
     "UserLoginTrend": "Account Login Trend",
-    "UserProfile": "Personal Information",
+    "UserProfile": "Profile",
-    "UserSession": "User Sessions",
+    "UserSession": "Asset Sessions",
     "UserSetting": "Preference",
     "UserSwitchFrom": "Switch from",
     "UserUpdate": "Update User",

apps/i18n/lina/zh.json

@@ -68,7 +68,6 @@
     "AllAccounts": "所有账号",
     "AllClickRead": "全部已读",
     "AllMembers": "全部成员",
-    "AllOrganization": "组织列表",
     "AllowInvalidCert": "忽略证书检查",
     "Announcement": "公告",
     "AnonymousAccount": "匿名账号",
@@ -205,6 +204,7 @@
     "Certificate": "证书",
     "CertificateKey": "客户端密钥",
     "ChangeField": "变更字段",
+    "ChangeOrganization": "更改组织",
     "ChangePassword": "更新密码",
     "ChangeReceiver": "修改消息接收人",
     "ChangeSecretParams": "改密参数",
@@ -851,6 +851,7 @@
     "ResetMFAWarningMsg": "你确定要重置用户的 MFA 吗?",
     "ResetMFAdSuccessMsg": "重置MFA成功, 用户可以重新设置MFA了",
     "ResetPassword": "重置密码",
+    "ResetPasswordNextLogin": "下次登录须修改密码",
     "ResetPasswordSuccessMsg": "已向用户发送重置密码消息",
     "ResetPasswordWarningMsg": "你确定要发送重置用户密码的邮件吗",
     "ResetPublicKeyAndDownload": "重置并下载SSH密钥",
@@ -859,7 +860,6 @@
     "ResetSSHKeyWarningMsg": "你确定要发送重置用户的SSH Key的邮件吗?",
     "Resource": "资源",
     "ResourceType": "资源类型",
-    "ResetPasswordNextLogin": "下次登录须修改密码",
     "RestoreButton": "恢复默认",
     "RestoreDefault": "恢复默认",
     "RestoreDialogMessage": "您确定要恢复默认初始化吗？",

apps/users/serializers/group.py

@@ -18,7 +18,7 @@ __all__ = [
 class UserGroupSerializer(ResourceLabelsMixin, BulkOrgResourceModelSerializer):
     users = ObjectRelatedField(
         required=False, many=True, queryset=User.objects,
-        attrs=("id", "name", "is_service_account"), label=_('User'),
+        attrs=("id", "name", "is_service_account"), label=_('Users'),
     )
 
     class Meta:

apps/users/serializers/user.py

@@ -6,7 +6,7 @@ from functools import partial
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
-from common.serializers import CommonBulkSerializerMixin, ResourceLabelsMixin
+from common.serializers import ResourceLabelsMixin, CommonBulkModelSerializer
 from common.serializers.fields import (
     EncryptedField, ObjectRelatedField, LabeledChoiceField, PhoneField
 )
@@ -81,7 +81,7 @@ class RolesSerializerMixin(serializers.Serializer):
         return fields
 
 
-class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, ResourceLabelsMixin, serializers.ModelSerializer):
+class UserSerializer(RolesSerializerMixin, ResourceLabelsMixin, CommonBulkModelSerializer):
     password_strategy = LabeledChoiceField(
         choices=PasswordStrategy.choices,
         default=PasswordStrategy.email,