diff --git a/apps/accounts/migrations/0020_alter_accountbackupautomation_backup_type_and_more.py b/apps/accounts/migrations/0020_alter_accountbackupautomation_backup_type_and_more.py index 7e88fa547..dda414f94 100644 --- a/apps/accounts/migrations/0020_alter_accountbackupautomation_backup_type_and_more.py +++ b/apps/accounts/migrations/0020_alter_accountbackupautomation_backup_type_and_more.py @@ -18,11 +18,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='accountbackupautomation', name='is_password_divided_by_email', - field=models.BooleanField(default=True, verbose_name='Is Password Divided'), + field=models.BooleanField(default=True, verbose_name='Password divided'), ), migrations.AlterField( model_name='accountbackupautomation', name='is_password_divided_by_obj_storage', - field=models.BooleanField(default=True, verbose_name='Is Password Divided'), + field=models.BooleanField(default=True, verbose_name='Password divided'), ), ] diff --git a/apps/accounts/models/automations/backup_account.py b/apps/accounts/models/automations/backup_account.py index db325c702..5defd7b6e 100644 --- a/apps/accounts/models/automations/backup_account.py +++ b/apps/accounts/models/automations/backup_account.py @@ -24,9 +24,9 @@ logger = get_logger(__file__) class AccountBackupAutomation(PeriodTaskModelMixin, JMSOrgBaseModel): types = models.JSONField(default=list) backup_type = models.CharField(max_length=128, choices=AccountBackupType.choices, - default=AccountBackupType.email.value, verbose_name=_('Backup Type')) - is_password_divided_by_email = models.BooleanField(default=True, verbose_name=_('Is Password Divided')) - is_password_divided_by_obj_storage = models.BooleanField(default=True, verbose_name=_('Is Password Divided')) + default=AccountBackupType.email.value, verbose_name=_('Backup type')) + is_password_divided_by_email = models.BooleanField(default=True, verbose_name=_('Password divided')) + is_password_divided_by_obj_storage = models.BooleanField(default=True, verbose_name=_('Password divided')) recipients_part_one = models.ManyToManyField( 'users.User', related_name='recipient_part_one_plans', blank=True, verbose_name=_("Recipient part one") @@ -37,14 +37,15 @@ class AccountBackupAutomation(PeriodTaskModelMixin, JMSOrgBaseModel): ) obj_recipients_part_one = models.ManyToManyField( 'terminal.ReplayStorage', related_name='obj_recipient_part_one_plans', blank=True, - verbose_name=_("Object Storage Recipient part one") + verbose_name=_("Object storage recipient part one") ) obj_recipients_part_two = models.ManyToManyField( 'terminal.ReplayStorage', related_name='obj_recipient_part_two_plans', blank=True, - verbose_name=_("Object Storage Recipient part two") + verbose_name=_("Object storage recipient part two") + ) + zip_encrypt_password = fields.EncryptCharField( + max_length=4096, blank=True, null=True, verbose_name=_('Zip encrypt password') ) - zip_encrypt_password = fields.EncryptCharField(max_length=4096, blank=True, null=True, - verbose_name=_('Zip Encrypt Password')) def __str__(self): return f'{self.name}({self.org_id})' diff --git a/apps/acls/const.py b/apps/acls/const.py index cccc906f4..3c03d8e2d 100644 --- a/apps/acls/const.py +++ b/apps/acls/const.py @@ -6,5 +6,5 @@ class ActionChoices(models.TextChoices): reject = 'reject', _('Reject') accept = 'accept', _('Accept') review = 'review', _('Review') - warning = 'warning', _('Warning') - notice = 'notice', _('Notifications') + warning = 'warning', _('Warn') + notice = 'notice', _('Notify') diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po index d90b7b535..e1d827f43 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-03-28 11:19+0800\n" +"POT-Creation-Date: 2024-03-29 11:00+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -329,12 +329,12 @@ msgid "Can remove account" msgstr "" #: accounts/models/automations/backup_account.py:27 -msgid "Backup Type" +msgid "Backup type" msgstr "" #: accounts/models/automations/backup_account.py:28 #: accounts/models/automations/backup_account.py:29 -msgid "Is Password Divided" +msgid "Password divided" msgstr "" #: accounts/models/automations/backup_account.py:32 @@ -346,24 +346,23 @@ msgid "Recipient part two" msgstr "" #: accounts/models/automations/backup_account.py:40 -msgid "Object Storage Recipient part one" +msgid "Object storage recipient part one" msgstr "" #: accounts/models/automations/backup_account.py:44 -msgid "Object Storage Recipient part two" +msgid "Object storage recipient part two" msgstr "" #: accounts/models/automations/backup_account.py:47 -#: accounts/serializers/account/backup.py:20 -msgid "Zip Encrypt Password" -msgstr "" +msgid "Zip encrypt password" +msgstr "Passphrase" -#: accounts/models/automations/backup_account.py:55 -#: accounts/models/automations/backup_account.py:138 +#: accounts/models/automations/backup_account.py:56 +#: accounts/models/automations/backup_account.py:139 msgid "Account backup plan" msgstr "" -#: accounts/models/automations/backup_account.py:119 +#: accounts/models/automations/backup_account.py:120 #: assets/models/automations/base.py:115 audits/models.py:65 #: ops/models/base.py:55 ops/models/celery.py:86 ops/models/job.py:236 #: ops/templates/ops/celery_task_log.html:75 @@ -375,18 +374,18 @@ msgstr "" msgid "Date start" msgstr "" -#: accounts/models/automations/backup_account.py:122 +#: accounts/models/automations/backup_account.py:123 #: authentication/templates/authentication/_msg_oauth_bind.html:11 #: notifications/notifications.py:186 #: settings/templates/ldap/_msg_import_ldap_user.html:3 msgid "Time" msgstr "" -#: accounts/models/automations/backup_account.py:126 +#: accounts/models/automations/backup_account.py:127 msgid "Account backup snapshot" msgstr "" -#: accounts/models/automations/backup_account.py:130 +#: accounts/models/automations/backup_account.py:131 #: accounts/serializers/account/backup.py:48 #: accounts/serializers/automations/base.py:55 #: assets/models/automations/base.py:122 @@ -394,19 +393,19 @@ msgstr "" msgid "Trigger mode" msgstr "" -#: accounts/models/automations/backup_account.py:133 audits/models.py:203 +#: accounts/models/automations/backup_account.py:134 audits/models.py:203 #: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:208 msgid "Reason" msgstr "" -#: accounts/models/automations/backup_account.py:135 +#: accounts/models/automations/backup_account.py:136 #: accounts/serializers/automations/change_secret.py:105 #: accounts/serializers/automations/change_secret.py:128 #: ops/serializers/job.py:67 terminal/serializers/session.py:49 msgid "Is success" msgstr "Is success" -#: accounts/models/automations/backup_account.py:143 +#: accounts/models/automations/backup_account.py:144 msgid "Account backup execution" msgstr "" @@ -847,6 +846,10 @@ msgstr "" msgid "Date" msgstr "" +#: accounts/serializers/account/backup.py:20 +msgid "Zip Encrypt Password" +msgstr "" + #: accounts/serializers/account/backup.py:38 #: accounts/serializers/automations/base.py:37 msgid "Executions" @@ -8837,6 +8840,3 @@ msgstr "" #: xpack/plugins/license/models.py:86 msgid "Ultimate edition" msgstr "" - -#~ msgid "Key password" -#~ msgstr "Passphrase" diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po index 2776f34d5..c219c6d57 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-03-28 11:19+0800\n" +"POT-Creation-Date: 2024-03-29 11:00+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -329,12 +329,14 @@ msgid "Can remove account" msgstr "アカウントを削除できます" #: accounts/models/automations/backup_account.py:27 -msgid "Backup Type" +#, fuzzy +#| msgid "Backup Type" +msgid "Backup type" msgstr "バックアップの種類" #: accounts/models/automations/backup_account.py:28 #: accounts/models/automations/backup_account.py:29 -msgid "Is Password Divided" +msgid "Password divided" msgstr "キーが 2 つの部分に分割されているかどうか" #: accounts/models/automations/backup_account.py:32 @@ -346,24 +348,29 @@ msgid "Recipient part two" msgstr "受信者 2" #: accounts/models/automations/backup_account.py:40 -msgid "Object Storage Recipient part one" +#, fuzzy +#| msgid "Object Storage Recipient part one" +msgid "Object storage recipient part one" msgstr "受信サーバー 1" #: accounts/models/automations/backup_account.py:44 -msgid "Object Storage Recipient part two" +#, fuzzy +#| msgid "Object Storage Recipient part two" +msgid "Object storage recipient part two" msgstr "受信サーバー 2" #: accounts/models/automations/backup_account.py:47 -#: accounts/serializers/account/backup.py:20 -msgid "Zip Encrypt Password" +#, fuzzy +#| msgid "Zip Encrypt Password" +msgid "Zip encrypt password" msgstr "新しいファイルの暗号化パスワード" -#: accounts/models/automations/backup_account.py:55 -#: accounts/models/automations/backup_account.py:138 +#: accounts/models/automations/backup_account.py:56 +#: accounts/models/automations/backup_account.py:139 msgid "Account backup plan" msgstr "アカウントバックアップ計画" -#: accounts/models/automations/backup_account.py:119 +#: accounts/models/automations/backup_account.py:120 #: assets/models/automations/base.py:115 audits/models.py:65 #: ops/models/base.py:55 ops/models/celery.py:86 ops/models/job.py:236 #: ops/templates/ops/celery_task_log.html:75 @@ -375,18 +382,18 @@ msgstr "アカウントバックアップ計画" msgid "Date start" msgstr "開始日" -#: accounts/models/automations/backup_account.py:122 +#: accounts/models/automations/backup_account.py:123 #: authentication/templates/authentication/_msg_oauth_bind.html:11 #: notifications/notifications.py:186 #: settings/templates/ldap/_msg_import_ldap_user.html:3 msgid "Time" msgstr "時間" -#: accounts/models/automations/backup_account.py:126 +#: accounts/models/automations/backup_account.py:127 msgid "Account backup snapshot" msgstr "アカウントのバックアップスナップショット" -#: accounts/models/automations/backup_account.py:130 +#: accounts/models/automations/backup_account.py:131 #: accounts/serializers/account/backup.py:48 #: accounts/serializers/automations/base.py:55 #: assets/models/automations/base.py:122 @@ -394,19 +401,19 @@ msgstr "アカウントのバックアップスナップショット" msgid "Trigger mode" msgstr "トリガーモード" -#: accounts/models/automations/backup_account.py:133 audits/models.py:203 +#: accounts/models/automations/backup_account.py:134 audits/models.py:203 #: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:208 msgid "Reason" msgstr "理由" -#: accounts/models/automations/backup_account.py:135 +#: accounts/models/automations/backup_account.py:136 #: accounts/serializers/automations/change_secret.py:105 #: accounts/serializers/automations/change_secret.py:128 #: ops/serializers/job.py:67 terminal/serializers/session.py:49 msgid "Is success" msgstr "成功は" -#: accounts/models/automations/backup_account.py:143 +#: accounts/models/automations/backup_account.py:144 msgid "Account backup execution" msgstr "アカウントバックアップの実行" @@ -863,6 +870,10 @@ msgstr "ユーザー" msgid "Date" msgstr "日付" +#: accounts/serializers/account/backup.py:20 +msgid "Zip Encrypt Password" +msgstr "新しいファイルの暗号化パスワード" + #: accounts/serializers/account/backup.py:38 #: accounts/serializers/automations/base.py:37 msgid "Executions" diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po index 58b0b8435..cf5246d21 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-03-28 11:19+0800\n" +"POT-Creation-Date: 2024-03-29 11:00+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler <ibuler@qq.com>\n" "Language-Team: JumpServer team<ibuler@qq.com>\n" @@ -328,12 +328,14 @@ msgid "Can remove account" msgstr "可以移除账号" #: accounts/models/automations/backup_account.py:27 -msgid "Backup Type" +#, fuzzy +#| msgid "Backup Type" +msgid "Backup type" msgstr "备份类型" #: accounts/models/automations/backup_account.py:28 #: accounts/models/automations/backup_account.py:29 -msgid "Is Password Divided" +msgid "Password divided" msgstr "密钥是否拆分成前后两部分" #: accounts/models/automations/backup_account.py:32 @@ -345,24 +347,29 @@ msgid "Recipient part two" msgstr "收件人部分二" #: accounts/models/automations/backup_account.py:40 -msgid "Object Storage Recipient part one" +#, fuzzy +#| msgid "Object Storage Recipient part one" +msgid "Object storage recipient part one" msgstr "接收服务器一" #: accounts/models/automations/backup_account.py:44 -msgid "Object Storage Recipient part two" +#, fuzzy +#| msgid "Object Storage Recipient part two" +msgid "Object storage recipient part two" msgstr "接收服务器二" #: accounts/models/automations/backup_account.py:47 -#: accounts/serializers/account/backup.py:20 -msgid "Zip Encrypt Password" +#, fuzzy +#| msgid "Zip Encrypt Password" +msgid "Zip encrypt password" msgstr "文件加密密码" -#: accounts/models/automations/backup_account.py:55 -#: accounts/models/automations/backup_account.py:138 +#: accounts/models/automations/backup_account.py:56 +#: accounts/models/automations/backup_account.py:139 msgid "Account backup plan" msgstr "账号备份计划" -#: accounts/models/automations/backup_account.py:119 +#: accounts/models/automations/backup_account.py:120 #: assets/models/automations/base.py:115 audits/models.py:65 #: ops/models/base.py:55 ops/models/celery.py:86 ops/models/job.py:236 #: ops/templates/ops/celery_task_log.html:75 @@ -374,18 +381,18 @@ msgstr "账号备份计划" msgid "Date start" msgstr "开始日期" -#: accounts/models/automations/backup_account.py:122 +#: accounts/models/automations/backup_account.py:123 #: authentication/templates/authentication/_msg_oauth_bind.html:11 #: notifications/notifications.py:186 #: settings/templates/ldap/_msg_import_ldap_user.html:3 msgid "Time" msgstr "时间" -#: accounts/models/automations/backup_account.py:126 +#: accounts/models/automations/backup_account.py:127 msgid "Account backup snapshot" msgstr "账号备份快照" -#: accounts/models/automations/backup_account.py:130 +#: accounts/models/automations/backup_account.py:131 #: accounts/serializers/account/backup.py:48 #: accounts/serializers/automations/base.py:55 #: assets/models/automations/base.py:122 @@ -393,19 +400,19 @@ msgstr "账号备份快照" msgid "Trigger mode" msgstr "触发模式" -#: accounts/models/automations/backup_account.py:133 audits/models.py:203 +#: accounts/models/automations/backup_account.py:134 audits/models.py:203 #: terminal/models/session/sharing.py:125 xpack/plugins/cloud/models.py:208 msgid "Reason" msgstr "原因" -#: accounts/models/automations/backup_account.py:135 +#: accounts/models/automations/backup_account.py:136 #: accounts/serializers/automations/change_secret.py:105 #: accounts/serializers/automations/change_secret.py:128 #: ops/serializers/job.py:67 terminal/serializers/session.py:49 msgid "Is success" msgstr "是否成功" -#: accounts/models/automations/backup_account.py:143 +#: accounts/models/automations/backup_account.py:144 msgid "Account backup execution" msgstr "账号备份执行" @@ -859,6 +866,10 @@ msgstr "用户" msgid "Date" msgstr "日期" +#: accounts/serializers/account/backup.py:20 +msgid "Zip Encrypt Password" +msgstr "文件加密密码" + #: accounts/serializers/account/backup.py:38 #: accounts/serializers/automations/base.py:37 msgid "Executions" diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index a60766b8a..571e5556b 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -187,8 +187,8 @@ "BatchSyncErrorMsg": "Batch sync Failed", "BatchTest": "Batch Test", "BatchTransfer": "Batch Transfer", - "BatchUpdate": "Batch update", - "BatchUpdatePlatformHelpText": "The asset will be updated only if the original platform type is the same as the selected platform type. If the platform types before and after the update are different, it will not be updated.", + "BatchUpdate": "Batch edit", + "BatchUpdatePlatformHelpTxt": "The asset will be updated only if the original platform type is the same as the selected platform type. If the platform types before and after the update are different, it will not be updated.", "BeforeChange": "Before Change", "Beian": "Record", "BelongAll": "Including at the same time", @@ -205,7 +205,7 @@ "CMPP2": "CMPP v2.0", "CTYunPrivate": "Tianyi Private Cloud", "CalculationResults": "Error in cron expression", - "CanDragSelect": "Select Time Period by Dragging Mouse", + "CanDragSelect": "Select time period by dragging mouse", "Cancel": "Cancel", "CancelCollection": "Cancel Favorite", "CannotAccess": "Can't Access the Current Page", @@ -231,8 +231,8 @@ "Clear": "Clear", "ClearScreen": "Clear Screen", "ClearSecret": "Clear secret", - "ClearSelection": "Clear Selection", - "ClearSuccessMsg": "Clear Successful", + "ClearSelection": "Clear selection", + "ClearSuccessMsg": "Clear successful", "ClickCopy": "Click to Copy", "ClientCertificate": "Client certificate", "ClipboardCopyPaste": "Clipboard Copy and Paste", @@ -467,7 +467,7 @@ "FirstLogin": "First Login", "FlowSetUp": "Flow set up", "FormatError": "Format Error", - "Friday": "Friday", + "Friday": "Fri", "From": "From", "FromTicket": "From the work order", "FullName": "Full name", @@ -658,16 +658,20 @@ "MessageSubscription": "Message Subscription", "MessageType": "Message Type", "MfaLevel": "MFA", - "Min": "Minutes", + "Min": "Min", "Modify": "Edit", "Module": "Module", - "Monday": "Monday", + "Monday": "Mon", "Monitor": "Monitoring", "Month": "Month", "More": "More", "MoreActions": "Actions", "MoveAssetToNode": "Move Assets to Nodes", "MsgSubscribe": "Subscription", + "AllUser": "All users", + "AllAsset": "All assets", + "SpecificUser": "Specific user", + "SpecificAsset": "Specific asset", "MyAssets": "My Assets", "MyTickets": "I Initiated", "Name": "Name", @@ -934,7 +938,7 @@ "SameAccount": "Same account", "SameAccountTip": "Accounts with the Same Username as Authorized Users", "SameTypeAccountTip": "An account with the same username and key type already exists", - "Saturday": "Saturday", + "Saturday": "Sat", "Save": "Save", "SaveAdhoc": "Save Command", "SaveAndAddAnother": "Save and Continue", @@ -956,7 +960,7 @@ "SelectAdhoc": "Select Command", "SelectAll": "Select all", "SelectAtLeastOneAssetOrNodeErrMsg": "Select at Least One Asset or Node", - "SelectAttrs": "Select Attributes", + "SelectAttrs": "Select attributes", "SelectByAttr": "Attribute Filter", "SelectFile": "Select File", "SelectKeyOrCreateNew": "Select Tag Key or Create New One", @@ -1018,7 +1022,7 @@ "Source": "Source", "SourceIP": "Source address", "SourcePort": "Source port", - "Spec": "Specify", + "Spec": "Specific", "SpecAccount": "Specified accounts", "SpecAccountTip": "Specify username to choose authorized account", "SpecialSymbol": "Special Char", @@ -1048,7 +1052,7 @@ "SuccessfulOperation": "Action successful", "AddInDetailText": "After successful creation or update, add to the details", "Summary(success/total)": " Overview( Successful/Total )", - "Sunday": "Sunday", + "Sunday": "Sun", "SuperAdmin": "Super Administrator", "SuperOrgAdmin": "Super Admin + Organization Admin", "Support": "Support", @@ -1110,7 +1114,7 @@ "TestNodeAssetConnectivity": "Test Connectivity of Asset Nodes", "TestPortErrorMsg": "Port Error, Please Re-enter", "TestSuccessMsg": "Test Succeeded", - "Thursday": "Thursday", + "Thursday": "Thu", "Ticket": "Ticket", "TicketDetail": "Work Order Details", "TicketFlow": "Work Order Flow", @@ -1133,7 +1137,7 @@ "TotalJobLog": "Total Job Executions", "TotalJobRunning": "Running Jobs", "Transfer": "Transfer", - "Tuesday": "Tuesday", + "Tuesday": "Tue", "TwoAssignee": "Subscribe to Authorization ID", "TwoAssigneeType": "Secondary Recipient Type", "Type": "Type", @@ -1194,6 +1198,7 @@ "UserLoginAclList": "User Login", "UserLoginAclUpdate": "Update the User Login Control", "UserLoginLimit": "User Restriction", + "IpDomain": "Address", "UserLoginTrend": "Account Login Trend", "UserProfile": "Profile", "UserSession": "Asset Sessions", @@ -1232,7 +1237,7 @@ "WebSocketDisconnect": "WebSocket Disconnected", "WebTerminal": "Web Terminal", "WebUpdate": "Update the Asset - Web", - "Wednesday": "Wednesday", + "Wednesday": "Wed", "Week": "Week", "WeekAdd": "New this Week", "WeekOrTime": "Day/Time",