diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index bc56fd751..d0d817901 100644 --- a/apps/i18n/core/en/LC_MESSAGES/django.po +++ b/apps/i18n/core/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-04 19:41+0800\n" +"POT-Creation-Date: 2024-02-20 15:15+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3844,7 +3844,7 @@ msgstr "" msgid "Invalid choice: {}" msgstr "" -#: common/serializers/mixin.py:397 +#: common/serializers/mixin.py:400 msgid "Labels" msgstr "" @@ -3937,8 +3937,10 @@ msgid "Labeled resource" msgstr "" #: labels/serializers.py:22 -msgid "Resource count" -msgstr "" +#, fuzzy +#| msgid "Executed amount" +msgid "Resource amount" +msgstr "Executions" #: labels/serializers.py:28 msgid "Cannot contain \":,\"" @@ -7925,8 +7927,8 @@ msgstr "MFA" #: users/serializers/user.py:294 msgid "" -"For security, only a partial list of users is displayed. You can try to " -"search for more" +"For security, only a partial list of users is displayed. You can search for " +"more" msgstr "" #: users/serializers/user.py:327 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo index 774452a8f..7402d6e0a 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.mo +++ b/apps/i18n/core/ja/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d58d2e5e46b76fdd73a85a6620279ba3cfe8ff402fcbbf859d67f3d7c011aaf4 -size 170717 +oid sha256:89339329adfc787fe38cd62cc18caf7adfe5824fa7bbddcb7d69598521a18d18 +size 170670 diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 1416a0476..e7f00effd 100644 --- a/apps/i18n/core/ja/LC_MESSAGES/django.po +++ b/apps/i18n/core/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-04 19:41+0800\n" +"POT-Creation-Date: 2024-02-20 15:15+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3930,7 +3930,7 @@ msgstr "間違ったデータ タイプです。リストにする必要があ msgid "Invalid choice: {}" msgstr "無効なオプション: {}" -#: common/serializers/mixin.py:397 +#: common/serializers/mixin.py:400 msgid "Labels" msgstr "ラベル" @@ -4035,7 +4035,9 @@ msgid "Labeled resource" msgstr "関連リソース" #: labels/serializers.py:22 -msgid "Resource count" +#, fuzzy +#| msgid "Resource count" +msgid "Resource amount" msgstr "リソース数" #: labels/serializers.py:28 @@ -8219,8 +8221,8 @@ msgstr "MFA レベル" #: users/serializers/user.py:294 msgid "" -"For security, only a partial list of users is displayed. You can try to " -"search for more" +"For security, only a partial list of users is displayed. You can search for " +"more" msgstr "" #: users/serializers/user.py:327 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo index 78c08e1e7..fbeaaf9d6 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.mo +++ b/apps/i18n/core/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03ddc4852b8fec1981d4ec0aa746bee83f524cb2823359e3a3bf86e8d3b7497a -size 141101 +oid sha256:c0874d399c18f41aa406ea85ee8eaf60fb870eadcd31ed7f1d9a70c10e83240e +size 141057 diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 65fb79f98..611d916bd 100644 --- a/apps/i18n/core/zh/LC_MESSAGES/django.po +++ b/apps/i18n/core/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-04 19:41+0800\n" +"POT-Creation-Date: 2024-02-20 15:15+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -3872,7 +3872,7 @@ msgstr "错误的数据类型，应该是列表" msgid "Invalid choice: {}" msgstr "无效选项: {}" -#: common/serializers/mixin.py:397 +#: common/serializers/mixin.py:400 msgid "Labels" msgstr "标签" @@ -3972,7 +3972,9 @@ msgid "Labeled resource" msgstr "关联的资源" #: labels/serializers.py:22 -msgid "Resource count" +#, fuzzy +#| msgid "Resource count" +msgid "Resource amount" msgstr "资源数量" #: labels/serializers.py:28 @@ -8041,8 +8043,8 @@ msgstr "MFA" #: users/serializers/user.py:294 msgid "" -"For security, only a partial list of users is displayed. You can try to " -"search for more" +"For security, only a partial list of users is displayed. You can search for " +"more" msgstr "" #: users/serializers/user.py:327 diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index e08c5b990..c1b233405 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -170,7 +170,7 @@ "BasicInfo": "Basic Info", "BasicSetting": "Basic", "BatchConsent": "Batch Approval", - "BatchProcessing": "Bulk Processing (Selected {Number} Items)", + "BatchProcessing": "{Number} items selected", "BatchReject": "Bulk Deny", "BeforeChange": "Before Change", "Beian": "Record", @@ -206,7 +206,7 @@ "CeleryTaskLog": "Celery Task Log", "Certificate": "Certificate", "CertificateKey": "Client Key", - "ChangeField": "Change Fields", + "ChangeField": "Change Field", "ChangePassword": "Update Password", "ChangeReceiver": "Modify Message Recipient", "ChangeSecretParams": "Change Password Parameters", @@ -376,7 +376,7 @@ "DomainCreate": "Create Domain", "DomainDetail": "Domain Details", "DomainEnabled": "Enable Domain", - "DomainHelpMessage": "Domain Function Is Designed To Solve The Problem That Some Environments (Such As: Hybrid Cloud) Cannot Be Directly Connected, And A New Function Is Added. The Principle Is To Log In Through The Gateway Server. JMS => Domain Gateway => Target Assets", + "DomainHelpMessage": "Domain function is designed to solve the problem that some environments (such as: hybrid cloud) cannot be directly connected, and a new function is added. The principle is to log in through the gateway server. JMS => Domain Gateway => Target Assets.", "DomainList": "Domains", "DomainUpdate": "Update Domain", "Download": "Download", @@ -540,12 +540,12 @@ "IntervalOfCreateUpdatePage": "Unit: Hour", "InvalidJson": "Invalid JSON", "InviteSuccess": "Invitation Successful", - "InviteUser": "Invite Member", + "InviteUser": "Invite member", "InviteUserInOrg": "Invite users to join this organization", "Ip": "IP", "IpGroup": "IP Group", "IpGroupHelpText": "* indicates match all. For example: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64", - "IsActive": "Activate", + "IsActive": "Active", "IsAlwaysUpdate": "Keeping Assets Up to Date", "IsAlwaysUpdateHelpTips": "Whether to synchronize and update asset information, including hostname, IP, platform, domain, node, etc. each time a synchronization task is performed", "IsFinished": "Is It Done", @@ -637,7 +637,7 @@ "MenuAccounts": "Accounts", "MenuAcls": "ACLs", "MenuAssets": "Assets", - "MenuMore": "More...", + "MenuMore": "Others", "MenuPermissions": "Policies", "MenuUsers": "Users", "Message": "Message", @@ -772,8 +772,8 @@ "Priority": "Priority", "PrivateCloud": "Private Cloud", "PrivateKey": "Private Key", - "Privileged": "Privilege Account", - "PrivilegedFirst": "Priority Privilege Account", + "Privileged": "Privileged", + "PrivilegedFirst": "Privileged First", "PrivilegedOnly": "Privileged Accounts Only", "PrivilegedTemplate": "Privileged", "Product": "Product", @@ -865,12 +865,13 @@ "ResetSSHKeyWarningMsg": "Are you sure you want to send a reset SSH Key email to the user?", "Resource": "Resources", "ResourceType": "Resource Type", - "RestPasswordNextLogin": "Password Must Be Changed During Next Log In", + "ResetPasswordNextLogin": "Password Must Be Changed During Next Log In", "RestoreButton": "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", @@ -940,7 +941,9 @@ "SelectAtLeastOneAssetOrNodeErrMsg": "Select at Least One Asset or Node", "SelectAttrs": "Select Attributes", "SelectByAttr": "Attribute Filter", - "SelectFile": "Select File.", + "BulkVerify": "Verify selected", + "AccountBatchUpdate": "Updated selected", + "SelectFile": "Select File", "SelectKeyOrCreateNew": "Select Tag Key or Create New One", "SelectLabelFilter": "Select Tag Search", "SelectPlatforms": "Select Platform", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index df13f44de..50a2a3f58 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -859,7 +859,7 @@ "ResetSSHKeyWarningMsg": "你确定要发送重置用户的SSH Key的邮件吗?", "Resource": "资源", "ResourceType": "资源类型", - "RestPasswordNextLogin": "下次登录须修改密码", + "ResetPasswordNextLogin": "下次登录须修改密码", "RestoreButton": "恢复默认", "RestoreDefault": "恢复默认", "RestoreDialogMessage": "您确定要恢复默认初始化吗？", @@ -1211,4 +1211,4 @@ "Workspace": "工作空间", "Yes": "是", "ZStack": "ZStack" -} \ No newline at end of file +} diff --git a/apps/labels/serializers.py b/apps/labels/serializers.py index 62abc1bc8..ace8ab2cf 100644 --- a/apps/labels/serializers.py +++ b/apps/labels/serializers.py @@ -19,7 +19,7 @@ class LabelSerializer(BulkOrgResourceModelSerializer): ] read_only_fields = ('date_created', 'date_updated', 'res_count') extra_kwargs = { - 'res_count': {'label': _('Resource count')}, + 'res_count': {'label': _('Resource amount')}, } @staticmethod diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py index d5ba62c17..dc73d6dc1 100644 --- a/apps/users/serializers/user.py +++ b/apps/users/serializers/user.py @@ -291,7 +291,7 @@ class InviteSerializer(RolesSerializerMixin, serializers.Serializer): queryset=User.get_nature_users(), many=True, label=_("Users"), - help_text=_("For security, only a partial list of users is displayed. You can try to search for more"), + help_text=_("For security, only a partial list of users is displayed. You can search for more"), ) system_roles = None