diff --git a/apps/audits/migrations/0005_auto_20190228_1715.py b/apps/audits/migrations/0005_auto_20190228_1715.py
index aac747e9b..910644526 100644
--- a/apps/audits/migrations/0005_auto_20190228_1715.py
+++ b/apps/audits/migrations/0005_auto_20190228_1715.py
@@ -42,7 +42,7 @@ class Migration(migrations.Migration):
default=True, max_length=2, verbose_name='Status')),
('datetime',
models.DateTimeField(default=django.utils.timezone.now,
- verbose_name='Date login')),
+ verbose_name='Login Date')),
],
options={
'ordering': ['-datetime', 'username'],
diff --git a/apps/audits/migrations/0023_auto_20230906_1322.py b/apps/audits/migrations/0023_auto_20230906_1322.py
index 34998318c..34928eef6 100644
--- a/apps/audits/migrations/0023_auto_20230906_1322.py
+++ b/apps/audits/migrations/0023_auto_20230906_1322.py
@@ -24,6 +24,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='userloginlog',
name='datetime',
- field=models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='Date login'),
+ field=models.DateTimeField(db_index=True, default=django.utils.timezone.now, verbose_name='Login Date'),
),
]
diff --git a/apps/audits/models.py b/apps/audits/models.py
index c4b4486a5..646f63aef 100644
--- a/apps/audits/models.py
+++ b/apps/audits/models.py
@@ -207,7 +207,7 @@ class UserLoginLog(models.Model):
choices=LoginStatusChoices.choices,
verbose_name=_("Status"),
)
- datetime = models.DateTimeField(default=timezone.now, verbose_name=_("Date login"), db_index=True)
+ datetime = models.DateTimeField(default=timezone.now, verbose_name=_("Login Date"), db_index=True)
backend = models.CharField(
max_length=32, default="", verbose_name=_("Authentication backend")
)
diff --git a/apps/authentication/templates/authentication/_msg_different_city.html b/apps/authentication/templates/authentication/_msg_different_city.html
index 02dbf4271..b3ca09432 100644
--- a/apps/authentication/templates/authentication/_msg_different_city.html
+++ b/apps/authentication/templates/authentication/_msg_different_city.html
@@ -7,7 +7,7 @@
{% trans 'Username' %}: {{ username }}
- {% trans 'Login time' %}: {{ time }}
+ {% trans 'Login Date' %}: {{ time }}
{% trans 'Login city' %}: {{ city }}({{ ip }})
diff --git a/apps/i18n/core/en/LC_MESSAGES/django.mo b/apps/i18n/core/en/LC_MESSAGES/django.mo
index 455e3bc71..7042cc815 100644
--- a/apps/i18n/core/en/LC_MESSAGES/django.mo
+++ b/apps/i18n/core/en/LC_MESSAGES/django.mo
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0f38416ee042bf98512fadd5dc339c7476f1c40c99f8e4fd4fa6834c894c4345
-size 1398
+oid sha256:d192f1809f7eec4c976f6c0734985eeae75d66965ddd73cd870aaa70000ba9c5
+size 1665
diff --git a/apps/i18n/core/en/LC_MESSAGES/django.po b/apps/i18n/core/en/LC_MESSAGES/django.po
index d0d817901..b777d1321 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-20 15:15+0800\n"
+"POT-Creation-Date: 2024-02-22 17:43+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -404,7 +404,7 @@ msgstr ""
#: accounts/serializers/automations/change_secret.py:128
#: ops/serializers/job.py:67 terminal/serializers/session.py:49
msgid "Is success"
-msgstr "Success"
+msgstr "Is success"
#: accounts/models/automations/backup_account.py:143
msgid "Account backup execution"
@@ -540,10 +540,8 @@ msgid "Gather account automation"
msgstr ""
#: accounts/models/automations/gather_account.py:56
-#, fuzzy
-#| msgid "Sync account"
msgid "Is sync account"
-msgstr "Sync account"
+msgstr "Is sync account"
#: accounts/models/automations/gather_account.py:75
#: accounts/tasks/gather_accounts.py:29
@@ -974,8 +972,6 @@ msgstr ""
#: common/const/choices.py:18 ops/const.py:73 ops/serializers/celery.py:48
#: terminal/const.py:78 terminal/models/session/sharing.py:121
#: tickets/views/approve.py:117
-#, fuzzy
-#| msgid "Is success"
msgid "Success"
msgstr "Success"
@@ -2501,7 +2497,9 @@ msgid "MFA"
msgstr ""
#: audits/models.py:210
-msgid "Date login"
+#: authentication/templates/authentication/_msg_different_city.html:10
+#: tickets/models/ticket/login_confirm.py:12
+msgid "Login Date"
msgstr ""
#: audits/models.py:212 audits/models.py:266 audits/serializers.py:70
@@ -3192,10 +3190,8 @@ msgstr ""
#: authentication/serializers/token.py:92 perms/serializers/permission.py:43
#: perms/serializers/permission.py:66 users/serializers/user.py:98
#: users/serializers/user.py:174
-#, fuzzy
-#| msgid "Valid"
msgid "Is valid"
-msgstr "Valid"
+msgstr "Is Valid"
#: authentication/tasks.py:11
msgid "Clean expired session"
@@ -3278,10 +3274,6 @@ msgstr ""
msgid "Your account has remote login behavior, please pay attention"
msgstr ""
-#: authentication/templates/authentication/_msg_different_city.html:10
-msgid "Login time"
-msgstr ""
-
#: authentication/templates/authentication/_msg_different_city.html:16
msgid ""
"If you suspect that the login behavior is abnormal, please modify the "
@@ -3937,10 +3929,8 @@ msgid "Labeled resource"
msgstr ""
#: labels/serializers.py:22
-#, fuzzy
-#| msgid "Executed amount"
-msgid "Resource amount"
-msgstr "Executions"
+msgid "Resource count"
+msgstr "Resource count"
#: labels/serializers.py:28
msgid "Cannot contain \":,\""
@@ -7110,10 +7100,8 @@ msgid "Online sessions"
msgstr ""
#: terminal/serializers/terminal.py:43
-#, fuzzy
-#| msgid "Alive"
msgid "Is alive"
-msgstr "Alive"
+msgstr "Is alive"
#: terminal/serializers/terminal.py:49
msgid "Stat"
@@ -7413,10 +7401,6 @@ msgstr ""
msgid "Apply Login Asset Ticket"
msgstr ""
-#: tickets/models/ticket/login_confirm.py:12
-msgid "Login datetime"
-msgstr ""
-
#: tickets/models/ticket/login_confirm.py:15
msgid "Apply Login Ticket"
msgstr ""
@@ -7689,10 +7673,8 @@ msgid "Force enable"
msgstr ""
#: users/models/user.py:812 users/serializers/user.py:175
-#, fuzzy
-#| msgid "Service account"
msgid "Is service account"
-msgstr "Service account"
+msgstr "Is service account"
#: users/models/user.py:814
msgid "Avatar"
@@ -8862,7 +8844,6 @@ msgid "Logo of logout page"
msgstr ""
#: xpack/plugins/interface/models.py:41
-#: xpack/plugins/interface/serializers/interface.py:26
msgid "Theme"
msgstr ""
@@ -8878,14 +8859,6 @@ msgstr ""
msgid "Interface setting"
msgstr ""
-#: xpack/plugins/interface/serializers/interface.py:37
-msgid "Wide logo on top"
-msgstr ""
-
-#: xpack/plugins/interface/serializers/interface.py:38
-msgid "Small logo without text"
-msgstr ""
-
#: xpack/plugins/license/api.py:52
msgid "License import successfully"
msgstr ""
diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.mo b/apps/i18n/core/ja/LC_MESSAGES/django.mo
index 7402d6e0a..9d0077e5a 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:89339329adfc787fe38cd62cc18caf7adfe5824fa7bbddcb7d69598521a18d18
-size 170670
+oid sha256:1b64a2cb215d6258ede3d9794241a80d7104690075054ad966e649834e49910f
+size 170574
diff --git a/apps/i18n/core/ja/LC_MESSAGES/django.po b/apps/i18n/core/ja/LC_MESSAGES/django.po
index e7f00effd..d056b5c41 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-20 15:15+0800\n"
+"POT-Creation-Date: 2024-02-22 17:42+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -2550,7 +2550,9 @@ msgid "MFA"
msgstr "MFA"
#: audits/models.py:210
-msgid "Date login"
+#: authentication/templates/authentication/_msg_different_city.html:10
+#: tickets/models/ticket/login_confirm.py:12
+msgid "Login Date"
msgstr "日付ログイン"
#: audits/models.py:212 audits/models.py:266 audits/serializers.py:70
@@ -3345,10 +3347,6 @@ msgstr "こんにちは"
msgid "Your account has remote login behavior, please pay attention"
msgstr "アカウントにリモートログイン動作があります。注意してください"
-#: authentication/templates/authentication/_msg_different_city.html:10
-msgid "Login time"
-msgstr "ログイン時間"
-
#: authentication/templates/authentication/_msg_different_city.html:16
msgid ""
"If you suspect that the login behavior is abnormal, please modify the "
@@ -4036,9 +4034,9 @@ msgstr "関連リソース"
#: labels/serializers.py:22
#, fuzzy
-#| msgid "Resource count"
-msgid "Resource amount"
-msgstr "リソース数"
+#| msgid "Resource type"
+msgid "Resource count"
+msgstr "リソースタイプ"
#: labels/serializers.py:28
msgid "Cannot contain \":,\""
@@ -7686,10 +7684,6 @@ msgstr "ログインアカウント"
msgid "Apply Login Asset Ticket"
msgstr "資産ログインレビュー製造オーダ"
-#: tickets/models/ticket/login_confirm.py:12
-msgid "Login datetime"
-msgstr "ログイン日時"
-
#: tickets/models/ticket/login_confirm.py:15
msgid "Apply Login Ticket"
msgstr "ユーザーログインレビュー製造オーダ"
@@ -9180,7 +9174,6 @@ msgid "Logo of logout page"
msgstr "ログアウトページのロゴ"
#: xpack/plugins/interface/models.py:41
-#: xpack/plugins/interface/serializers/interface.py:26
msgid "Theme"
msgstr "テーマ"
@@ -9196,14 +9189,6 @@ msgstr "公安網登録番号"
msgid "Interface setting"
msgstr "インターフェイスの設定"
-#: xpack/plugins/interface/serializers/interface.py:37
-msgid "Wide logo on top"
-msgstr ""
-
-#: xpack/plugins/interface/serializers/interface.py:38
-msgid "Small logo without text"
-msgstr ""
-
#: xpack/plugins/license/api.py:52
msgid "License import successfully"
msgstr "ライセンスのインポートに成功"
@@ -9232,6 +9217,9 @@ msgstr "エンタープライズプロフェッショナル版"
msgid "Ultimate edition"
msgstr "エンタープライズ・フラッグシップ・エディション"
+#~ msgid "Login time"
+#~ msgstr "ログイン時間"
+
#~ msgid "SMTP port"
#~ msgstr "SMTPポート"
diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.mo b/apps/i18n/core/zh/LC_MESSAGES/django.mo
index fbeaaf9d6..280765547 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:c0874d399c18f41aa406ea85ee8eaf60fb870eadcd31ed7f1d9a70c10e83240e
-size 141057
+oid sha256:048f6988bf37dd7b1c8d20d052009187fbb76548ea3608bb9704880f2dd28eef
+size 140998
diff --git a/apps/i18n/core/zh/LC_MESSAGES/django.po b/apps/i18n/core/zh/LC_MESSAGES/django.po
index 611d916bd..36877af6b 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-20 15:15+0800\n"
+"POT-Creation-Date: 2024-02-22 17:43+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler \n"
"Language-Team: JumpServer team\n"
@@ -2523,7 +2523,9 @@ msgid "MFA"
msgstr "MFA"
#: audits/models.py:210
-msgid "Date login"
+#: authentication/templates/authentication/_msg_different_city.html:10
+#: tickets/models/ticket/login_confirm.py:12
+msgid "Login Date"
msgstr "登录日期"
#: audits/models.py:212 audits/models.py:266 audits/serializers.py:70
@@ -3301,10 +3303,6 @@ msgstr "你好"
msgid "Your account has remote login behavior, please pay attention"
msgstr "你的账号存在异地登录行为，请关注。"
-#: authentication/templates/authentication/_msg_different_city.html:10
-msgid "Login time"
-msgstr "登录日期"
-
#: authentication/templates/authentication/_msg_different_city.html:16
msgid ""
"If you suspect that the login behavior is abnormal, please modify the "
@@ -3972,9 +3970,7 @@ msgid "Labeled resource"
msgstr "关联的资源"
#: labels/serializers.py:22
-#, fuzzy
-#| msgid "Resource count"
-msgid "Resource amount"
+msgid "Resource count"
msgstr "资源数量"
#: labels/serializers.py:28
@@ -4973,10 +4969,8 @@ msgid "Chat prompt"
msgstr "聊天提示"
#: settings/notifications.py:23
-#, fuzzy
-#| msgid "Notification of account backup route task results"
msgid "Notification of Synchronized LDAP User Task Results"
-msgstr "账号备份任务结果通知"
+msgstr "同步 LDAP 用户任务结果的通知"
#: settings/serializers/auth/base.py:10
msgid "Authentication"
@@ -7521,10 +7515,6 @@ msgstr "登录账号"
msgid "Apply Login Asset Ticket"
msgstr "资产登录复核工单"
-#: tickets/models/ticket/login_confirm.py:12
-msgid "Login datetime"
-msgstr "登录日期"
-
#: tickets/models/ticket/login_confirm.py:15
msgid "Apply Login Ticket"
msgstr "用户登录复核工单"
@@ -8986,7 +8976,6 @@ msgid "Logo of logout page"
msgstr "退出页面 Logo"
#: xpack/plugins/interface/models.py:41
-#: xpack/plugins/interface/serializers/interface.py:26
msgid "Theme"
msgstr "主题"
@@ -9002,14 +8991,6 @@ msgstr "公安联网备案号"
msgid "Interface setting"
msgstr "界面设置"
-#: xpack/plugins/interface/serializers/interface.py:37
-msgid "Wide logo on top"
-msgstr "顶部宽 Logo"
-
-#: xpack/plugins/interface/serializers/interface.py:38
-msgid "Small logo without text"
-msgstr "方形小 Logo"
-
#: xpack/plugins/license/api.py:52
msgid "License import successfully"
msgstr "许可证导入成功"
@@ -9038,6 +9019,12 @@ msgstr "企业专业版"
msgid "Ultimate edition"
msgstr "企业旗舰版"
+#~ msgid "Wide logo on top"
+#~ msgstr "顶部宽 Logo"
+
+#~ msgid "Small logo without text"
+#~ msgstr "方形小 Logo"
+
#~ msgid "Password can not contains `{{` or `}}`"
#~ msgstr "密码不能包含 `{{` 或 `}}` 字符"
diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json
index ce8ef3bd5..69c901150 100644
--- a/apps/i18n/lina/en.json
+++ b/apps/i18n/lina/en.json
@@ -139,8 +139,7 @@
"AssetsAmount": "Asset",
"AssetsTotal": "Asset Total",
"AssignedInfo": "Approval Information",
- "AssignedMe": "Pending My Approval",
- "AssignedTicketList": "Pending My Approval",
+ "AwaitingMyApproval": "Awaiting my approval",
"Assignee": "Handler",
"Assignees": "Pending Handler",
"AttrName": "Attribute Name",
@@ -190,8 +189,8 @@
"BulkOffline": "Batch Offline",
"BulkSyncDelete": "Bulk Sync Delete",
"BulkSyncErrorMsg": "Bulk Synchronization Failed:",
- "BulkTransfer": "Batch Transfer",
- "BulkUnblock": "Batch Unlock",
+ "BulkTransfer": "Bulk Transfer",
+ "BulkUnblock": "Bulk 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.",
"CACertificate": "CA Certificate",
"CAS": "CAS",
@@ -443,7 +442,7 @@
"FeiShu": "Feishu",
"FeiShuTest": "Test",
"FieldRequiredError": "This field is required",
- "FileManager": "File",
+ "FileManagement": "File management",
"FileNameTooLong": "Filename too long",
"FileSizeExceedsLimit": "File size exceeds limit\"",
"FileTransfer": "File Transfer",
@@ -560,7 +559,7 @@
"JobCreate": "Create Job",
"JobDetail": "Job Details",
"JobExecutionLog": "Job Logs",
- "JobList": "Job",
+ "JobManagement": "Job Management",
"JobUpdate": "Update Job",
"KingSoftCloud": "Kingsoft Cloud",
"KokoSettingUpdate": "Koko Configuration Settings",
@@ -1068,7 +1067,7 @@
"TaskMonitor": "Task Monitoring",
"TechnologyConsult": "Technical Consultation",
"TempPassword": "The temporary password is valid for 300 seconds and becomes invalid immediately after use",
- "Template": "Template",
+ "TemplateManagement": "Template Management",
"TemplateAdd": "Add from template",
"TemplateCreate": "Create Template",
"TemplateHelpText": "When selecting a template to add, accounts that do not exist under the asset will be automatically created and pushed",
diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json
index bca892e27..3a4c18879 100644
--- a/apps/i18n/lina/zh.json
+++ b/apps/i18n/lina/zh.json
@@ -137,8 +137,7 @@
"AssetsAmount": "资产",
"AssetsTotal": "资产总数",
"AssignedInfo": "审批信息",
- "AssignedMe": "待我审批",
- "AssignedTicketList": "待我审批",
+ "AwaitingMyApproval": "待我审批",
"Assignee": "处理人",
"Assignees": "待处理人",
"AttrName": "属性名",
@@ -439,7 +438,7 @@
"FeiShu": "飞书",
"FeiShuTest": "测试",
"FieldRequiredError": "此字段是必填项",
- "FileManager": "文件管理",
+ "FileManagement": "文件管理",
"FileNameTooLong": "文件名太长",
"FileSizeExceedsLimit": "文件大小超出限制",
"FileTransfer": "文件传输",
@@ -555,7 +554,7 @@
"JobCreate": "创建作业",
"JobDetail": "作业详情",
"JobExecutionLog": "作业日志",
- "JobList": "作业管理",
+ "JobManagement": "作业管理",
"JobUpdate": "更新作业",
"KingSoftCloud": "金山云",
"KokoSettingUpdate": "Koko 配置设置",
@@ -1060,7 +1059,7 @@
"TaskMonitor": "任务监控",
"TechnologyConsult": "技术咨询",
"TempPassword": "临时密码有效期为 300 秒，使用后立刻失效",
- "Template": "模版管理",
+ "TemplateManagement": "模版管理",
"TemplateAdd": "模版添加",
"TemplateCreate": "创建模版",
"TemplateHelpText": "选择模版添加时，会自动创建资产下不存在的账号并推送",
diff --git a/apps/labels/serializers.py b/apps/labels/serializers.py
index ace8ab2cf..62abc1bc8 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 amount')},
+ 'res_count': {'label': _('Resource count')},
}
@staticmethod
diff --git a/apps/tickets/migrations/0016_auto_20220609_1758.py b/apps/tickets/migrations/0016_auto_20220609_1758.py
index d7f079e5d..51ab30cc9 100644
--- a/apps/tickets/migrations/0016_auto_20220609_1758.py
+++ b/apps/tickets/migrations/0016_auto_20220609_1758.py
@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
primary_key=True, serialize=False, to='tickets.ticket')),
('apply_login_ip', models.GenericIPAddressField(null=True, verbose_name='Login IP')),
('apply_login_city', models.CharField(max_length=64, null=True, verbose_name='Login city')),
- ('apply_login_datetime', models.DateTimeField(null=True, verbose_name='Login datetime')),
+ ('apply_login_datetime', models.DateTimeField(null=True, verbose_name='Login Date')),
],
options={
'abstract': False,
diff --git a/apps/tickets/models/ticket/login_confirm.py b/apps/tickets/models/ticket/login_confirm.py
index 7b17dd1f8..1f22bbca5 100644
--- a/apps/tickets/models/ticket/login_confirm.py
+++ b/apps/tickets/models/ticket/login_confirm.py
@@ -9,7 +9,7 @@ __all__ = ['ApplyLoginTicket']
class ApplyLoginTicket(Ticket):
apply_login_ip = models.GenericIPAddressField(verbose_name=_('Login IP'), null=True)
apply_login_city = models.CharField(max_length=64, verbose_name=_('Login city'), null=True)
- apply_login_datetime = models.DateTimeField(verbose_name=_('Login datetime'), null=True)
+ apply_login_datetime = models.DateTimeField(verbose_name=_('Login Date'), null=True)
class Meta:
verbose_name = _('Apply Login Ticket')
diff --git a/apps/users/migrations/0001_initial.py b/apps/users/migrations/0001_initial.py
index 5c0f28a38..b4205d231 100644
--- a/apps/users/migrations/0001_initial.py
+++ b/apps/users/migrations/0001_initial.py
@@ -100,7 +100,7 @@ class Migration(migrations.Migration):
('ip', models.GenericIPAddressField(verbose_name='Login IP')),
('city', models.CharField(blank=True, max_length=254, null=True, verbose_name='Login city')),
('user_agent', models.CharField(blank=True, max_length=254, null=True, verbose_name='User agent')),
- ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date login')),
+ ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Login Date')),
],
options={
'ordering': ['-datetime', 'username'],