\n"
@@ -78,20 +78,20 @@ msgstr "运行参数"
#: assets/forms/domain.py:15 assets/forms/label.py:13
#: assets/models/asset.py:295 assets/models/authbook.py:24
#: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:32
-#: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:37
+#: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:45
#: assets/templates/assets/admin_user_list.html:44
#: assets/templates/assets/domain_detail.html:55
#: assets/templates/assets/domain_list.html:22
#: assets/templates/assets/label_list.html:16
#: assets/templates/assets/system_user_list.html:49 audits/models.py:20
-#: audits/templates/audits/ftp_log_list.html:42
-#: audits/templates/audits/ftp_log_list.html:72
+#: audits/templates/audits/ftp_log_list.html:45
+#: audits/templates/audits/ftp_log_list.html:75
#: perms/forms/asset_permission.py:84 perms/models/asset_permission.py:80
#: perms/templates/perms/asset_permission_asset.html:53
#: perms/templates/perms/asset_permission_create_update.html:43
#: perms/templates/perms/asset_permission_list.html:50
#: perms/templates/perms/asset_permission_list.html:107
-#: terminal/backends/command/models.py:13 terminal/models.py:160
+#: terminal/backends/command/models.py:13 terminal/models.py:177
#: terminal/templates/terminal/command_list.html:30
#: terminal/templates/terminal/command_list.html:66
#: terminal/templates/terminal/session_list.html:26
@@ -119,6 +119,7 @@ msgstr "资产"
#: assets/forms/user.py:95 assets/models/base.py:28 assets/models/cluster.py:18
#: assets/models/cmd_filter.py:21 assets/models/domain.py:20
#: assets/models/group.py:20 assets/models/label.py:18
+#: assets/templates/assets/_node_detail_modal.html:27
#: assets/templates/assets/admin_user_detail.html:51
#: assets/templates/assets/admin_user_list.html:42
#: assets/templates/assets/cmd_filter_detail.html:56
@@ -139,13 +140,13 @@ msgstr "资产"
#: perms/templates/perms/remote_app_permission_list.html:14
#: perms/templates/perms/remote_app_permission_remote_app.html:49
#: perms/templates/perms/remote_app_permission_user.html:49
-#: settings/models.py:14
+#: settings/models.py:28
#: settings/templates/settings/_ldap_list_users_modal.html:32
-#: terminal/models.py:26 terminal/models.py:263 terminal/models.py:295
-#: terminal/models.py:332 terminal/templates/terminal/base_storage_list.html:32
+#: terminal/models.py:26 terminal/models.py:281 terminal/models.py:313
+#: terminal/models.py:350 terminal/templates/terminal/base_storage_list.html:32
#: terminal/templates/terminal/terminal_detail.html:43
#: terminal/templates/terminal/terminal_list.html:30 users/forms.py:162
-#: users/models/group.py:14 users/models/user.py:429
+#: users/models/group.py:14 users/models/user.py:433
#: users/templates/users/_select_user_modal.html:13
#: users/templates/users/user_asset_permission.html:54
#: users/templates/users/user_asset_permission.html:174
@@ -201,7 +202,7 @@ msgstr "参数"
#: orgs/models.py:16 perms/models/base.py:54
#: perms/templates/perms/asset_permission_detail.html:93
#: perms/templates/perms/remote_app_permission_detail.html:85
-#: users/models/user.py:470 users/serializers/group.py:32
+#: users/models/user.py:474 users/serializers/group.py:32
#: users/templates/users/user_detail.html:112
#: xpack/plugins/change_auth_plan/models.py:109
#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113
@@ -261,11 +262,11 @@ msgstr "创建日期"
#: orgs/models.py:18 perms/models/base.py:56
#: perms/templates/perms/asset_permission_detail.html:97
#: perms/templates/perms/remote_app_permission_detail.html:89
-#: settings/models.py:19 terminal/models.py:36 terminal/models.py:302
-#: terminal/models.py:339 terminal/templates/terminal/base_storage_list.html:34
+#: settings/models.py:33 terminal/models.py:36 terminal/models.py:320
+#: terminal/models.py:357 terminal/templates/terminal/base_storage_list.html:34
#: terminal/templates/terminal/terminal_detail.html:63
#: tickets/templates/tickets/ticket_detail.html:104 users/models/group.py:15
-#: users/models/user.py:462 users/templates/users/user_detail.html:130
+#: users/models/user.py:466 users/templates/users/user_detail.html:130
#: users/templates/users/user_group_detail.html:62
#: users/templates/users/user_group_list.html:37
#: users/templates/users/user_profile.html:138
@@ -377,7 +378,7 @@ msgstr "提交"
#: assets/templates/assets/cmd_filter_rule_list.html:14
#: assets/templates/assets/domain_detail.html:13
#: assets/templates/assets/domain_gateway_list.html:15
-#: assets/templates/assets/system_user_assets.html:14
+#: assets/templates/assets/system_user_assets.html:22
#: assets/templates/assets/system_user_detail.html:13
#: ops/templates/ops/adhoc_history.html:128
#: ops/templates/ops/task_adhoc.html:114
@@ -404,7 +405,7 @@ msgstr "详情"
#: assets/templates/assets/admin_user_list.html:72
#: assets/templates/assets/asset_detail.html:24
#: assets/templates/assets/asset_list.html:78
-#: assets/templates/assets/asset_list.html:167
+#: assets/templates/assets/asset_list.html:168
#: assets/templates/assets/cmd_filter_detail.html:24
#: assets/templates/assets/cmd_filter_list.html:56
#: assets/templates/assets/cmd_filter_rule_list.html:81
@@ -452,7 +453,7 @@ msgstr "更新"
#: assets/templates/assets/admin_user_detail.html:23
#: assets/templates/assets/admin_user_list.html:73
#: assets/templates/assets/asset_detail.html:28
-#: assets/templates/assets/asset_list.html:168
+#: assets/templates/assets/asset_list.html:169
#: assets/templates/assets/cmd_filter_detail.html:28
#: assets/templates/assets/cmd_filter_list.html:57
#: assets/templates/assets/cmd_filter_rule_list.html:82
@@ -535,7 +536,7 @@ msgstr "创建远程应用"
#: terminal/templates/terminal/base_storage_list.html:35
#: terminal/templates/terminal/session_list.html:34
#: terminal/templates/terminal/terminal_list.html:37
-#: tickets/templates/tickets/ticket_list.html:105
+#: tickets/templates/tickets/ticket_list.html:108
#: users/templates/users/_granted_assets.html:34
#: users/templates/users/user_asset_permission.html:61
#: users/templates/users/user_asset_permission.html:99
@@ -612,7 +613,7 @@ msgstr "端口"
#: assets/forms/asset.py:56 assets/models/asset.py:145
#: assets/models/user.py:110 assets/templates/assets/asset_detail.html:186
#: assets/templates/assets/asset_detail.html:194
-#: assets/templates/assets/system_user_assets.html:79
+#: assets/templates/assets/system_user_assets.html:87
#: perms/models/asset_permission.py:81
#: xpack/plugins/change_auth_plan/models.py:75
#: xpack/plugins/gathered_user/models.py:31
@@ -647,7 +648,7 @@ msgstr "网域"
#: assets/forms/asset.py:69 assets/forms/asset.py:103 assets/forms/asset.py:116
#: assets/forms/asset.py:152 assets/models/node.py:462
-#: assets/serializers/system_user.py:36
+#: assets/serializers/system_user.py:44
#: assets/templates/assets/asset_create.html:42
#: perms/forms/asset_permission.py:87 perms/forms/asset_permission.py:94
#: perms/templates/perms/asset_permission_list.html:51
@@ -718,7 +719,7 @@ msgstr "SSH网关,支持代理SSH,RDP和VNC"
#: ops/models/adhoc.py:189 perms/templates/perms/asset_permission_list.html:205
#: perms/templates/perms/remote_app_permission_user.html:50
#: settings/templates/settings/_ldap_list_users_modal.html:31 users/forms.py:14
-#: users/forms.py:161 users/models/user.py:427
+#: users/forms.py:161 users/models/user.py:431
#: users/templates/users/_select_user_modal.html:14
#: users/templates/users/user_detail.html:68
#: users/templates/users/user_list.html:36
@@ -759,7 +760,7 @@ msgstr "密码"
#: assets/forms/user.py:30 assets/serializers/asset_user.py:71
#: assets/templates/assets/_asset_user_auth_update_modal.html:27
-#: users/models/user.py:456
+#: users/models/user.py:460
msgid "Private key"
msgstr "ssh私钥"
@@ -974,7 +975,7 @@ msgstr "带宽"
msgid "Contact"
msgstr "联系人"
-#: assets/models/cluster.py:22 users/models/user.py:448
+#: assets/models/cluster.py:22 users/models/user.py:452
#: users/templates/users/user_detail.html:77
msgid "Phone"
msgstr "手机"
@@ -1000,7 +1001,7 @@ msgid "Default"
msgstr "默认"
#: assets/models/cluster.py:36 assets/models/label.py:14
-#: users/models/user.py:568
+#: users/models/user.py:575
msgid "System"
msgstr "系统"
@@ -1029,7 +1030,7 @@ msgid "Regex"
msgstr "正则表达式"
#: assets/models/cmd_filter.py:40 ops/models/command.py:22
-#: ops/templates/ops/command_execution_list.html:62 terminal/models.py:166
+#: ops/templates/ops/command_execution_list.html:67 terminal/models.py:185
#: terminal/templates/terminal/command_list.html:28
#: terminal/templates/terminal/command_list.html:68
#: terminal/templates/terminal/session_detail.html:48
@@ -1053,7 +1054,7 @@ msgstr "过滤器"
#: assets/templates/assets/cmd_filter_rule_list.html:53
#: audits/templates/audits/login_log_list.html:58
#: perms/templates/perms/remote_app_permission_remote_app.html:50
-#: terminal/models.py:297 terminal/models.py:334
+#: terminal/models.py:315 terminal/models.py:352
#: terminal/templates/terminal/base_storage_list.html:33
#: tickets/models/ticket.py:43 tickets/templates/tickets/ticket_detail.html:33
#: tickets/templates/tickets/ticket_list.html:35
@@ -1118,14 +1119,14 @@ msgid "Default asset group"
msgstr "默认资产组"
#: assets/models/label.py:15 audits/models.py:18 audits/models.py:38
-#: audits/models.py:51 audits/templates/audits/ftp_log_list.html:34
-#: audits/templates/audits/ftp_log_list.html:71
+#: audits/models.py:51 audits/templates/audits/ftp_log_list.html:37
+#: audits/templates/audits/ftp_log_list.html:74
#: audits/templates/audits/operate_log_list.html:37
#: audits/templates/audits/operate_log_list.html:70
#: audits/templates/audits/password_change_log_list.html:37
#: audits/templates/audits/password_change_log_list.html:54
-#: authentication/models.py:43 ops/templates/ops/command_execution_list.html:36
-#: ops/templates/ops/command_execution_list.html:61
+#: authentication/models.py:43 ops/templates/ops/command_execution_list.html:41
+#: ops/templates/ops/command_execution_list.html:66
#: perms/forms/asset_permission.py:78 perms/forms/remote_app_permission.py:34
#: perms/models/base.py:49
#: perms/templates/perms/asset_permission_create_update.html:39
@@ -1134,14 +1135,14 @@ msgstr "默认资产组"
#: perms/templates/perms/remote_app_permission_create_update.html:41
#: perms/templates/perms/remote_app_permission_list.html:15
#: templates/index.html:87 terminal/backends/command/models.py:12
-#: terminal/models.py:159 terminal/templates/terminal/command_list.html:29
+#: terminal/models.py:175 terminal/templates/terminal/command_list.html:29
#: terminal/templates/terminal/command_list.html:65
#: terminal/templates/terminal/session_list.html:25
#: terminal/templates/terminal/session_list.html:69 tickets/models/ticket.py:33
#: tickets/models/ticket.py:128 tickets/templates/tickets/ticket_detail.html:32
#: tickets/templates/tickets/ticket_list.html:34
-#: tickets/templates/tickets/ticket_list.html:100 users/forms.py:339
-#: users/models/user.py:148 users/models/user.py:164 users/models/user.py:556
+#: tickets/templates/tickets/ticket_list.html:103 users/forms.py:339
+#: users/models/user.py:148 users/models/user.py:164 users/models/user.py:563
#: users/serializers/group.py:21
#: users/templates/users/user_asset_permission.html:55
#: users/templates/users/user_asset_permission.html:84
@@ -1154,7 +1155,7 @@ msgid "User"
msgstr "用户"
#: assets/models/label.py:19 assets/models/node.py:453
-#: assets/templates/assets/label_list.html:15 settings/models.py:15
+#: assets/templates/assets/label_list.html:15 settings/models.py:29
msgid "Value"
msgstr "值"
@@ -1178,7 +1179,7 @@ msgstr "空"
msgid "favorite"
msgstr "收藏夹"
-#: assets/models/node.py:452
+#: assets/models/node.py:452 assets/templates/assets/_node_detail_modal.html:39
msgid "Key"
msgstr "键"
@@ -1192,7 +1193,7 @@ msgstr "手动登录"
#: assets/models/user.py:111
#: assets/templates/assets/_asset_group_bulk_update_modal.html:11
-#: assets/templates/assets/system_user_assets.html:18
+#: assets/templates/assets/system_user_assets.html:26
#: assets/templates/assets/system_user_detail.html:17
#: assets/views/admin_user.py:30 assets/views/admin_user.py:49
#: assets/views/admin_user.py:67 assets/views/admin_user.py:84
@@ -1233,8 +1234,8 @@ msgid "Login mode"
msgstr "登录模式"
#: assets/models/user.py:166 assets/templates/assets/user_asset_list.html:79
-#: audits/models.py:21 audits/templates/audits/ftp_log_list.html:50
-#: audits/templates/audits/ftp_log_list.html:73
+#: audits/models.py:21 audits/templates/audits/ftp_log_list.html:53
+#: audits/templates/audits/ftp_log_list.html:76
#: perms/forms/asset_permission.py:90 perms/forms/remote_app_permission.py:43
#: perms/models/asset_permission.py:82 perms/models/remote_app_permission.py:16
#: perms/templates/perms/asset_permission_asset.html:124
@@ -1244,7 +1245,7 @@ msgstr "登录模式"
#: perms/templates/perms/remote_app_permission_detail.html:126
#: perms/templates/perms/remote_app_permission_list.html:18
#: templates/_nav.html:45 terminal/backends/command/models.py:14
-#: terminal/models.py:161 terminal/templates/terminal/command_list.html:31
+#: terminal/models.py:179 terminal/templates/terminal/command_list.html:31
#: terminal/templates/terminal/command_list.html:67
#: terminal/templates/terminal/session_list.html:27
#: terminal/templates/terminal/session_list.html:71
@@ -1302,7 +1303,7 @@ msgid "Backend"
msgstr "后端"
#: assets/serializers/asset_user.py:67 users/forms.py:282
-#: users/models/user.py:459 users/templates/users/first_login.html:42
+#: users/models/user.py:463 users/templates/users/first_login.html:42
#: users/templates/users/user_password_update.html:49
#: users/templates/users/user_profile.html:69
#: users/templates/users/user_profile_update.html:46
@@ -1327,15 +1328,15 @@ msgstr "值"
msgid "The same level node name cannot be the same"
msgstr "同级别节点名字不能重复"
-#: assets/serializers/system_user.py:38
+#: assets/serializers/system_user.py:46
msgid "Login mode display"
msgstr "登录模式显示"
-#: assets/serializers/system_user.py:82
+#: assets/serializers/system_user.py:90
msgid "* Automatic login mode must fill in the username."
msgstr "自动登录模式,必须填写用户名"
-#: assets/serializers/system_user.py:93
+#: assets/serializers/system_user.py:101
msgid "Password or private key required"
msgstr "密码或密钥密码需要一个"
@@ -1497,8 +1498,8 @@ msgstr "请输入密码"
#: assets/templates/assets/_asset_user_auth_update_modal.html:68
#: assets/templates/assets/asset_detail.html:300
#: users/templates/users/user_asset_permission.html:193
-#: users/templates/users/user_detail.html:368
-#: users/templates/users/user_detail.html:395
+#: users/templates/users/user_detail.html:373
+#: users/templates/users/user_detail.html:400
#: xpack/plugins/interface/views.py:35
msgid "Update successfully!"
msgstr "更新成功"
@@ -1508,6 +1509,7 @@ msgid "Asset user auth"
msgstr "资产用户信息"
#: assets/templates/assets/_asset_user_auth_view_modal.html:54
+#: assets/templates/assets/_node_detail_modal.html:56
#: authentication/templates/authentication/login_wait_confirm.html:114
msgid "Copy success"
msgstr "复制成功"
@@ -1517,6 +1519,7 @@ msgid "Get auth info error"
msgstr "获取认证信息错误"
#: assets/templates/assets/_asset_user_auth_view_modal.html:97
+#: assets/templates/assets/_node_detail_modal.html:67
#: assets/templates/assets/_user_asset_detail_modal.html:23
#: authentication/templates/authentication/_access_key_modal.html:142
#: authentication/templates/authentication/_mfa_confirm_modal.html:53
@@ -1537,7 +1540,7 @@ msgid "Datetime"
msgstr "日期"
#: assets/templates/assets/_asset_user_list.html:41
-#: assets/templates/assets/asset_list.html:137
+#: assets/templates/assets/asset_list.html:138
msgid "Test datetime: "
msgstr "测试日期: "
@@ -1549,14 +1552,14 @@ msgstr "查看"
#: assets/templates/assets/admin_user_assets.html:56
#: assets/templates/assets/asset_asset_user_list.html:57
#: assets/templates/assets/asset_detail.html:174
-#: assets/templates/assets/system_user_assets.html:59
+#: assets/templates/assets/system_user_assets.html:67
#: assets/templates/assets/system_user_detail.html:146
#: terminal/templates/terminal/base_storage_list.html:73
msgid "Test"
msgstr "测试"
#: assets/templates/assets/_asset_user_list.html:77
-#: assets/templates/assets/system_user_assets.html:68
+#: assets/templates/assets/system_user_assets.html:76
#: assets/templates/assets/system_user_detail.html:137
msgid "Push"
msgstr "推送"
@@ -1573,6 +1576,27 @@ msgstr "SSH端口"
msgid "If use nat, set the ssh real port"
msgstr "如果使用了nat端口映射,请设置为ssh真实监听的端口"
+#: assets/templates/assets/_node_detail_modal.html:11
+#: assets/templates/assets/asset_list.html:203
+msgid "Node detail"
+msgstr "节点详情"
+
+#: assets/templates/assets/_node_detail_modal.html:18
+#: audits/templates/audits/login_log_list.html:56
+#: authentication/templates/authentication/_access_key_modal.html:30
+#: ops/templates/ops/adhoc_detail.html:47
+#: ops/templates/ops/adhoc_history_detail.html:47
+#: ops/templates/ops/task_detail.html:54
+#: terminal/templates/terminal/session_list.html:24
+#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:64
+#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:60
+msgid "ID"
+msgstr "ID"
+
+#: assets/templates/assets/_node_detail_modal.html:33
+msgid "Full name"
+msgstr "全名"
+
#: assets/templates/assets/_node_tree.html:49
msgid "Add node"
msgstr "新建节点"
@@ -1662,7 +1686,7 @@ msgid "Asset list of "
msgstr "资产列表"
#: assets/templates/assets/admin_user_assets.html:47
-#: assets/templates/assets/system_user_assets.html:50
+#: assets/templates/assets/system_user_assets.html:58
#: assets/templates/assets/system_user_detail.html:111
#: perms/templates/perms/asset_permission_detail.html:109
#: perms/templates/perms/remote_app_permission_detail.html:101
@@ -1689,18 +1713,18 @@ msgstr "选择节点"
#: assets/templates/assets/admin_user_detail.html:95
#: assets/templates/assets/asset_detail.html:200
-#: assets/templates/assets/asset_list.html:424
+#: assets/templates/assets/asset_list.html:427
#: assets/templates/assets/cmd_filter_detail.html:101
-#: assets/templates/assets/system_user_assets.html:93
+#: assets/templates/assets/system_user_assets.html:101
#: assets/templates/assets/system_user_detail.html:177
#: assets/templates/assets/system_user_list.html:133
#: authentication/templates/authentication/_mfa_confirm_modal.html:20
#: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112
-#: users/templates/users/user_detail.html:273
-#: users/templates/users/user_detail.html:449
-#: users/templates/users/user_detail.html:475
-#: users/templates/users/user_detail.html:498
-#: users/templates/users/user_detail.html:543
+#: users/templates/users/user_detail.html:277
+#: users/templates/users/user_detail.html:454
+#: users/templates/users/user_detail.html:480
+#: users/templates/users/user_detail.html:503
+#: users/templates/users/user_detail.html:548
#: users/templates/users/user_group_create_update.html:28
#: users/templates/users/user_group_list.html:120
#: users/templates/users/user_list.html:256
@@ -1754,8 +1778,8 @@ msgstr "创建管理用户"
#: assets/templates/assets/admin_user_list.html:123
#: assets/templates/assets/admin_user_list.html:154
-#: assets/templates/assets/asset_list.html:304
-#: assets/templates/assets/asset_list.html:341
+#: assets/templates/assets/asset_list.html:307
+#: assets/templates/assets/asset_list.html:344
#: assets/templates/assets/system_user_list.html:186
#: assets/templates/assets/system_user_list.html:217
#: users/templates/users/user_group_list.html:164
@@ -1874,66 +1898,66 @@ msgstr "禁用所选"
msgid "Active selected"
msgstr "激活所选"
-#: assets/templates/assets/asset_list.html:193
+#: assets/templates/assets/asset_list.html:194
msgid "Add assets to node"
msgstr "添加资产到节点"
-#: assets/templates/assets/asset_list.html:194
+#: assets/templates/assets/asset_list.html:195
msgid "Move assets to node"
msgstr "移动资产到节点"
-#: assets/templates/assets/asset_list.html:196
+#: assets/templates/assets/asset_list.html:197
msgid "Refresh node hardware info"
msgstr "更新节点资产硬件信息"
-#: assets/templates/assets/asset_list.html:197
+#: assets/templates/assets/asset_list.html:198
msgid "Test node connective"
msgstr "测试节点资产可连接性"
-#: assets/templates/assets/asset_list.html:199
+#: assets/templates/assets/asset_list.html:200
msgid "Display only current node assets"
msgstr "仅显示当前节点资产"
-#: assets/templates/assets/asset_list.html:200
+#: assets/templates/assets/asset_list.html:201
msgid "Displays all child node assets"
msgstr "显示所有子节点资产"
-#: assets/templates/assets/asset_list.html:418
+#: assets/templates/assets/asset_list.html:421
#: assets/templates/assets/system_user_list.html:127
-#: users/templates/users/user_detail.html:443
-#: users/templates/users/user_detail.html:469
-#: users/templates/users/user_detail.html:537
+#: users/templates/users/user_detail.html:448
+#: users/templates/users/user_detail.html:474
+#: users/templates/users/user_detail.html:542
#: users/templates/users/user_group_list.html:114
#: users/templates/users/user_list.html:250
#: xpack/plugins/interface/templates/interface/interface.html:97
msgid "Are you sure?"
msgstr "你确认吗?"
-#: assets/templates/assets/asset_list.html:419
+#: assets/templates/assets/asset_list.html:422
msgid "This will delete the selected assets !!!"
msgstr "删除选择资产"
-#: assets/templates/assets/asset_list.html:422
+#: assets/templates/assets/asset_list.html:425
#: assets/templates/assets/system_user_list.html:131
-#: users/templates/users/user_detail.html:447
-#: users/templates/users/user_detail.html:473
-#: users/templates/users/user_detail.html:541
+#: users/templates/users/user_detail.html:452
+#: users/templates/users/user_detail.html:478
+#: users/templates/users/user_detail.html:546
#: users/templates/users/user_group_list.html:118
#: users/templates/users/user_list.html:254
#: xpack/plugins/interface/templates/interface/interface.html:101
msgid "Cancel"
msgstr "取消"
-#: assets/templates/assets/asset_list.html:433
+#: assets/templates/assets/asset_list.html:436
msgid "Asset Deleted."
msgstr "已被删除"
-#: assets/templates/assets/asset_list.html:434
-#: assets/templates/assets/asset_list.html:442
+#: assets/templates/assets/asset_list.html:437
+#: assets/templates/assets/asset_list.html:445
msgid "Asset Delete"
msgstr "删除"
-#: assets/templates/assets/asset_list.html:441
+#: assets/templates/assets/asset_list.html:444
msgid "Asset Deleting failed."
msgstr "删除失败"
@@ -2046,21 +2070,21 @@ msgstr "创建网域"
msgid "Create label"
msgstr "创建标签"
-#: assets/templates/assets/system_user_assets.html:27
+#: assets/templates/assets/system_user_assets.html:35
msgid "Assets of "
msgstr "资产"
-#: assets/templates/assets/system_user_assets.html:56
+#: assets/templates/assets/system_user_assets.html:64
#: assets/templates/assets/system_user_detail.html:143
msgid "Test assets connective"
msgstr "测试资产可连接性"
-#: assets/templates/assets/system_user_assets.html:65
+#: assets/templates/assets/system_user_assets.html:73
#: assets/templates/assets/system_user_detail.html:134
msgid "Push system user now"
msgstr "立刻推送系统"
-#: assets/templates/assets/system_user_assets.html:87
+#: assets/templates/assets/system_user_assets.html:95
msgid "Add to node"
msgstr "添加到节点"
@@ -2219,29 +2243,29 @@ msgid "System user asset"
msgstr "系统用户资产"
#: audits/models.py:19 audits/models.py:42 audits/models.py:53
-#: audits/templates/audits/ftp_log_list.html:74
+#: audits/templates/audits/ftp_log_list.html:77
#: audits/templates/audits/operate_log_list.html:74
#: audits/templates/audits/password_change_log_list.html:56
-#: terminal/models.py:163 terminal/templates/terminal/session_list.html:28
+#: terminal/models.py:182 terminal/templates/terminal/session_list.html:28
#: terminal/templates/terminal/session_list.html:72
#: terminal/templates/terminal/terminal_detail.html:47
msgid "Remote addr"
msgstr "远端地址"
-#: audits/models.py:22 audits/templates/audits/ftp_log_list.html:75
+#: audits/models.py:22 audits/templates/audits/ftp_log_list.html:78
msgid "Operate"
msgstr "操作"
-#: audits/models.py:23 audits/templates/audits/ftp_log_list.html:57
-#: audits/templates/audits/ftp_log_list.html:76
+#: audits/models.py:23 audits/templates/audits/ftp_log_list.html:60
+#: audits/templates/audits/ftp_log_list.html:79
msgid "Filename"
msgstr "文件名"
#: audits/models.py:24 audits/models.py:77
-#: audits/templates/audits/ftp_log_list.html:77
-#: ops/templates/ops/command_execution_list.html:66
+#: audits/templates/audits/ftp_log_list.html:80
+#: ops/templates/ops/command_execution_list.html:71
#: ops/templates/ops/task_list.html:15
-#: users/templates/users/user_detail.html:519
+#: users/templates/users/user_detail.html:524
#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:14
#: xpack/plugins/cloud/api.py:61
msgid "Success"
@@ -2270,7 +2294,7 @@ msgstr "修改者"
msgid "Disabled"
msgstr "禁用"
-#: audits/models.py:72 settings/models.py:18
+#: audits/models.py:72 settings/models.py:32
#: users/templates/users/user_detail.html:97
msgid "Enabled"
msgstr "启用"
@@ -2302,7 +2326,7 @@ msgstr "Agent"
#: audits/models.py:86 audits/templates/audits/login_log_list.html:62
#: authentication/templates/authentication/_mfa_confirm_modal.html:14
-#: users/forms.py:194 users/models/user.py:451
+#: users/forms.py:194 users/models/user.py:455
#: users/templates/users/first_login.html:45
msgid "MFA"
msgstr "MFA"
@@ -2318,7 +2342,7 @@ msgstr "原因"
#: audits/models.py:88 audits/templates/audits/login_log_list.html:64
#: tickets/templates/tickets/ticket_detail.html:34
#: tickets/templates/tickets/ticket_list.html:36
-#: tickets/templates/tickets/ticket_list.html:101
+#: tickets/templates/tickets/ticket_list.html:104
#: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/models.py:310
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65
@@ -2329,14 +2353,14 @@ msgstr "状态"
msgid "Date login"
msgstr "登录日期"
-#: audits/templates/audits/ftp_log_list.html:78
+#: audits/templates/audits/ftp_log_list.html:81
#: ops/templates/ops/adhoc_history.html:50
#: ops/templates/ops/adhoc_history_detail.html:59
-#: ops/templates/ops/command_execution_list.html:67
+#: ops/templates/ops/command_execution_list.html:72
#: ops/templates/ops/task_history.html:56 perms/models/base.py:52
#: perms/templates/perms/asset_permission_detail.html:81
#: perms/templates/perms/remote_app_permission_detail.html:73
-#: terminal/models.py:170 terminal/templates/terminal/session_list.html:32
+#: terminal/models.py:188 terminal/templates/terminal/session_list.html:32
#: xpack/plugins/change_auth_plan/models.py:250
#: xpack/plugins/change_auth_plan/models.py:426
#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:59
@@ -2355,25 +2379,14 @@ msgstr "选择用户"
#: audits/templates/audits/login_log_list.html:46
#: audits/templates/audits/operate_log_list.html:62
#: audits/templates/audits/password_change_log_list.html:46
-#: ops/templates/ops/command_execution_list.html:44
#: ops/templates/ops/command_execution_list.html:49
+#: ops/templates/ops/command_execution_list.html:54
#: templates/_base_list.html:37 templates/_user_profile.html:23
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:52
#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48
msgid "Search"
msgstr "搜索"
-#: audits/templates/audits/login_log_list.html:56
-#: authentication/templates/authentication/_access_key_modal.html:30
-#: ops/templates/ops/adhoc_detail.html:47
-#: ops/templates/ops/adhoc_history_detail.html:47
-#: ops/templates/ops/task_detail.html:54
-#: terminal/templates/terminal/session_list.html:24
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:64
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:60
-msgid "ID"
-msgstr "ID"
-
#: audits/templates/audits/login_log_list.html:59
msgid "UA"
msgstr "Agent"
@@ -2537,12 +2550,12 @@ msgstr "MFA 验证码"
msgid "Private Token"
msgstr "ssh密钥"
-#: authentication/models.py:44 users/templates/users/user_detail.html:267
+#: authentication/models.py:44 users/templates/users/user_detail.html:271
msgid "Reviewers"
msgstr "审批人"
#: authentication/models.py:53 tickets/models/ticket.py:25
-#: users/templates/users/user_detail.html:259
+#: users/templates/users/user_detail.html:263
msgid "Login confirm"
msgstr "登录复核"
@@ -2568,14 +2581,14 @@ msgid "Show"
msgstr "显示"
#: authentication/templates/authentication/_access_key_modal.html:66
-#: users/models/user.py:351 users/templates/users/user_profile.html:94
+#: users/models/user.py:355 users/templates/users/user_profile.html:94
#: users/templates/users/user_profile.html:163
#: users/templates/users/user_profile.html:166
msgid "Disable"
msgstr "禁用"
#: authentication/templates/authentication/_access_key_modal.html:67
-#: users/models/user.py:352 users/templates/users/user_profile.html:92
+#: users/models/user.py:356 users/templates/users/user_profile.html:92
#: users/templates/users/user_profile.html:170
msgid "Enable"
msgstr "启用"
@@ -2790,6 +2803,10 @@ msgstr ""
msgid "discard time"
msgstr ""
+#: common/utils/ipip/utils.py:15
+msgid "Invalid ip"
+msgstr "无效 IP"
+
#: common/validators.py:11
msgid "Special char not allowed"
msgstr "不能包含特殊字符"
@@ -2829,7 +2846,7 @@ msgstr ""
"div>如果你看到了这个页面,证明你访问的不是nginx监听的端口,祝你好运"
"div>"
-#: ops/api/celery.py:54
+#: ops/api/celery.py:57
msgid "Waiting task start"
msgstr "等待任务开始"
@@ -2871,9 +2888,9 @@ msgid "Options"
msgstr "选项"
#: ops/models/adhoc.py:186 ops/templates/ops/adhoc_detail.html:51
-#: ops/templates/ops/command_execution_list.html:60
+#: ops/templates/ops/command_execution_list.html:65
#: ops/templates/ops/task_adhoc.html:57 ops/templates/ops/task_list.html:14
-#: terminal/forms/storage.py:107
+#: terminal/forms/storage.py:152
msgid "Hosts"
msgstr "主机"
@@ -2960,6 +2977,14 @@ msgstr "命令 `{}` 不允许被执行 ......."
msgid "Task end"
msgstr "任务结束"
+#: ops/tasks.py:63
+msgid "Clean task history period"
+msgstr "定期清除任务历史"
+
+#: ops/tasks.py:76
+msgid "Clean celery log period"
+msgstr ""
+
#: ops/templates/ops/adhoc_detail.html:17
#: ops/templates/ops/adhoc_history.html:17
msgid "Version detail"
@@ -2972,7 +2997,7 @@ msgstr "执行历史"
#: ops/templates/ops/adhoc_detail.html:70
#: ops/templates/ops/adhoc_detail.html:75
-#: ops/templates/ops/command_execution_list.html:63
+#: ops/templates/ops/command_execution_list.html:68
#: ops/templates/ops/task_adhoc.html:59
msgid "Run as"
msgstr "运行用户"
@@ -3036,7 +3061,7 @@ msgid "Run history detail"
msgstr "执行历史详情"
#: ops/templates/ops/adhoc_history_detail.html:20
-#: ops/templates/ops/command_execution_list.html:64
+#: ops/templates/ops/command_execution_list.html:69
#: terminal/backends/command/models.py:16
msgid "Output"
msgstr "输出"
@@ -3102,7 +3127,7 @@ msgstr "没有选择系统用户"
msgid "Pending"
msgstr "等待"
-#: ops/templates/ops/command_execution_list.html:65
+#: ops/templates/ops/command_execution_list.html:70
msgid "Finished"
msgstr "结束"
@@ -3155,10 +3180,14 @@ msgstr "执行"
msgid "Task start: "
msgstr "任务开始: "
-#: ops/utils.py:51
+#: ops/utils.py:53
msgid "Update task content: {}"
msgstr "更新任务内容: {}"
+#: ops/utils.py:63
+msgid "Disk used more than 80%: {} => {}"
+msgstr ""
+
#: ops/views/adhoc.py:31 ops/views/adhoc.py:54 ops/views/adhoc.py:68
#: ops/views/adhoc.py:82 ops/views/adhoc.py:96 ops/views/adhoc.py:110
#: ops/views/adhoc.py:124 ops/views/command.py:48 ops/views/command.py:79
@@ -3206,10 +3235,10 @@ msgstr "提示:RDP 协议不支持单独控制上传或下载文件"
#: perms/templates/perms/asset_permission_list.html:206
#: perms/templates/perms/remote_app_permission_list.html:16
#: templates/_nav.html:21 users/forms.py:313 users/models/group.py:26
-#: users/models/user.py:435 users/templates/users/_select_user_modal.html:16
+#: users/models/user.py:439 users/templates/users/_select_user_modal.html:16
#: users/templates/users/user_asset_permission.html:56
#: users/templates/users/user_asset_permission.html:87
-#: users/templates/users/user_detail.html:220
+#: users/templates/users/user_detail.html:222
#: users/templates/users/user_list.html:38
#: xpack/plugins/orgs/templates/orgs/org_list.html:16
msgid "User group"
@@ -3254,7 +3283,7 @@ msgstr "资产授权"
#: perms/models/base.py:53
#: perms/templates/perms/asset_permission_detail.html:85
#: perms/templates/perms/remote_app_permission_detail.html:77
-#: users/models/user.py:467 users/templates/users/user_detail.html:108
+#: users/models/user.py:471 users/templates/users/user_detail.html:108
#: users/templates/users/user_profile.html:120
msgid "Date expired"
msgstr "失效日期"
@@ -3305,7 +3334,7 @@ msgid "Add node to this permission"
msgstr "添加节点"
#: perms/templates/perms/asset_permission_asset.html:105
-#: users/templates/users/user_detail.html:237
+#: users/templates/users/user_detail.html:239
#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:105
msgid "Join"
msgstr "加入"
@@ -3811,7 +3840,7 @@ msgid "ex: Last\\s*login|success|成功"
msgstr ""
"登录telnet服务器成功后的提示正则表达式,如: Last\\s*login|success|成功 "
-#: settings/models.py:82 users/templates/users/reset_password.html:68
+#: settings/models.py:97 users/templates/users/reset_password.html:68
#: users/templates/users/user_profile.html:20
msgid "Setting"
msgstr "设置"
@@ -3829,7 +3858,7 @@ msgid "Refresh cache"
msgstr "刷新缓存"
#: settings/templates/settings/_ldap_list_users_modal.html:33
-#: users/models/user.py:431 users/templates/users/user_detail.html:72
+#: users/models/user.py:435 users/templates/users/user_detail.html:72
#: users/templates/users/user_profile.html:59
msgid "Email"
msgstr "邮件"
@@ -3923,10 +3952,6 @@ msgstr "会话管理 -> 终端管理 -> 存储配置"
msgid "Here"
msgstr "这里"
-#: settings/utils/ldap.py:128
-msgid "Search no entry matched in ou {}"
-msgstr "在ou:{}中没有匹配条目"
-
#: settings/views.py:19 settings/views.py:46 settings/views.py:73
#: settings/views.py:105 settings/views.py:134 settings/views.py:161
#: templates/_nav.html:178
@@ -4065,7 +4090,7 @@ msgstr ""
#: templates/_nav.html:17 users/views/group.py:28 users/views/group.py:45
#: users/views/group.py:63 users/views/group.py:82 users/views/group.py:99
-#: users/views/login.py:154 users/views/profile.py:88
+#: users/views/login.py:153 users/views/profile.py:88
#: users/views/profile.py:123 users/views/user.py:48 users/views/user.py:65
#: users/views/user.py:109 users/views/user.py:176 users/views/user.py:204
#: users/views/user.py:218
@@ -4108,9 +4133,9 @@ msgid "File manager"
msgstr "文件管理"
#: templates/_nav.html:101 terminal/views/storage.py:27
-#: terminal/views/storage.py:42 terminal/views/storage.py:94
-#: terminal/views/storage.py:118 terminal/views/storage.py:147
-#: terminal/views/storage.py:173
+#: terminal/views/storage.py:42 terminal/views/storage.py:96
+#: terminal/views/storage.py:120 terminal/views/storage.py:149
+#: terminal/views/storage.py:175
msgid "Terminal"
msgstr "终端管理"
@@ -4347,39 +4372,43 @@ msgstr "输入"
msgid "Session"
msgstr "会话"
-#: terminal/forms/storage.py:40
+#: terminal/forms/storage.py:41
msgid "Container name"
msgstr "容器名称"
-#: terminal/forms/storage.py:43
+#: terminal/forms/storage.py:44
msgid "Account name"
msgstr "账户名称"
-#: terminal/forms/storage.py:46
+#: terminal/forms/storage.py:47
msgid "Account key"
msgstr "账户密钥"
-#: terminal/forms/storage.py:54
+#: terminal/forms/storage.py:55
msgid "Endpoint suffix"
msgstr "端点后缀"
-#: terminal/forms/storage.py:60 terminal/forms/storage.py:83
+#: terminal/forms/storage.py:61 terminal/forms/storage.py:84
+#: terminal/forms/storage.py:108 terminal/forms/storage.py:132
msgid "Bucket"
msgstr "桶名称"
-#: terminal/forms/storage.py:63 terminal/forms/storage.py:86
+#: terminal/forms/storage.py:64 terminal/forms/storage.py:87
+#: terminal/forms/storage.py:111 terminal/forms/storage.py:135
msgid "Access key"
msgstr ""
-#: terminal/forms/storage.py:67 terminal/forms/storage.py:90
+#: terminal/forms/storage.py:68 terminal/forms/storage.py:91
+#: terminal/forms/storage.py:115 terminal/forms/storage.py:139
msgid "Secret key"
msgstr ""
-#: terminal/forms/storage.py:71 terminal/forms/storage.py:94
+#: terminal/forms/storage.py:72 terminal/forms/storage.py:95
+#: terminal/forms/storage.py:119 terminal/forms/storage.py:146
msgid "Endpoint"
msgstr "端点"
-#: terminal/forms/storage.py:73
+#: terminal/forms/storage.py:74
#, python-brace-format
msgid ""
"\n"
@@ -4388,7 +4417,7 @@ msgid ""
" "
msgstr ""
-#: terminal/forms/storage.py:96
+#: terminal/forms/storage.py:97 terminal/forms/storage.py:121
#, python-brace-format
msgid ""
"\n"
@@ -4398,7 +4427,13 @@ msgid ""
" "
msgstr ""
-#: terminal/forms/storage.py:109
+#: terminal/forms/storage.py:143 xpack/plugins/cloud/models.py:304
+#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:109
+#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62
+msgid "Region"
+msgstr "地域"
+
+#: terminal/forms/storage.py:154
msgid ""
"\n"
" Tips: If there are multiple hosts, separate them with a comma "
@@ -4413,11 +4448,11 @@ msgstr ""
" eg: http://www.jumpserver.a.com,http://www.jumpserver.b.com\n"
" "
-#: terminal/forms/storage.py:117
+#: terminal/forms/storage.py:162
msgid "Index"
msgstr "索引"
-#: terminal/forms/storage.py:120
+#: terminal/forms/storage.py:165
msgid "Doc type"
msgstr "文档类型"
@@ -4452,43 +4487,39 @@ msgstr "远端地址"
msgid "HTTP Port"
msgstr "HTTP端口"
-#: terminal/models.py:129
+#: terminal/models.py:145
msgid "Session Online"
msgstr "在线会话"
-#: terminal/models.py:130
+#: terminal/models.py:146
msgid "CPU Usage"
msgstr "CPU使用"
-#: terminal/models.py:131
+#: terminal/models.py:147
msgid "Memory Used"
msgstr "内存使用"
-#: terminal/models.py:132
+#: terminal/models.py:148
msgid "Connections"
msgstr "连接数"
-#: terminal/models.py:133
+#: terminal/models.py:149
msgid "Threads"
msgstr "线程数"
-#: terminal/models.py:134
+#: terminal/models.py:150
msgid "Boot Time"
msgstr "运行时间"
-#: terminal/models.py:165 terminal/templates/terminal/session_list.html:135
+#: terminal/models.py:184 terminal/templates/terminal/session_list.html:135
msgid "Replay"
msgstr "回放"
-#: terminal/models.py:169
-msgid "Date last active"
-msgstr "最后活跃日期"
-
-#: terminal/models.py:171
+#: terminal/models.py:189
msgid "Date end"
msgstr "结束日期"
-#: terminal/models.py:264
+#: terminal/models.py:282
msgid "Args"
msgstr "参数"
@@ -4501,12 +4532,12 @@ msgid "Goto"
msgstr "转到"
#: terminal/templates/terminal/command_storage_list.html:5
-#: terminal/views/storage.py:148
+#: terminal/views/storage.py:150
msgid "Create command storage"
msgstr "创建命令存储"
#: terminal/templates/terminal/replay_storage_list.html:5
-#: terminal/views/storage.py:95
+#: terminal/views/storage.py:97
msgid "Create replay storage"
msgstr "创建录像存储"
@@ -4595,7 +4626,7 @@ msgstr "接受"
#: terminal/templates/terminal/terminal_list.html:81
#: tickets/models/ticket.py:31 tickets/templates/tickets/ticket_detail.html:101
-#: tickets/templates/tickets/ticket_list.html:107
+#: tickets/templates/tickets/ticket_list.html:110
msgid "Reject"
msgstr "拒绝"
@@ -4619,11 +4650,11 @@ msgstr "录像存储列表"
msgid "Command storage list"
msgstr "命令存储列表"
-#: terminal/views/storage.py:119
+#: terminal/views/storage.py:121
msgid "Update replay storage"
msgstr "更新录像存储"
-#: terminal/views/storage.py:174
+#: terminal/views/storage.py:176
msgid "Update command storage"
msgstr "更新命令存储"
@@ -4649,11 +4680,11 @@ msgid ""
msgstr "你可以使用ssh客户端工具连接终端"
#: tickets/models/ticket.py:18 tickets/models/ticket.py:70
-#: tickets/templates/tickets/ticket_list.html:102
+#: tickets/templates/tickets/ticket_list.html:105
msgid "Open"
msgstr "开启"
-#: tickets/models/ticket.py:19 tickets/templates/tickets/ticket_list.html:103
+#: tickets/models/ticket.py:19 tickets/templates/tickets/ticket_list.html:106
msgid "Closed"
msgstr "关闭"
@@ -4662,7 +4693,7 @@ msgid "General"
msgstr "一般"
#: tickets/models/ticket.py:30 tickets/templates/tickets/ticket_detail.html:100
-#: tickets/templates/tickets/ticket_list.html:106
+#: tickets/templates/tickets/ticket_list.html:109
msgid "Approve"
msgstr "同意"
@@ -4671,7 +4702,7 @@ msgid "User display name"
msgstr "用户显示名称"
#: tickets/models/ticket.py:36 tickets/templates/tickets/ticket_list.html:33
-#: tickets/templates/tickets/ticket_list.html:99
+#: tickets/templates/tickets/ticket_list.html:102
msgid "Title"
msgstr "标题"
@@ -4800,7 +4831,7 @@ msgstr "工单详情"
msgid "Could not reset self otp, use profile reset instead"
msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
-#: users/forms.py:47 users/models/user.py:439
+#: users/forms.py:47 users/models/user.py:443
#: users/templates/users/_select_user_modal.html:15
#: users/templates/users/user_detail.html:88
#: users/templates/users/user_list.html:37
@@ -4808,7 +4839,7 @@ msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
msgid "Role"
msgstr "角色"
-#: users/forms.py:51 users/models/user.py:474
+#: users/forms.py:51 users/models/user.py:478
#: users/templates/users/user_detail.html:104
#: users/templates/users/user_list.html:39
#: users/templates/users/user_profile.html:102
@@ -4828,7 +4859,7 @@ msgstr ""
msgid "Paste user id_rsa.pub here."
msgstr "复制用户公钥到这里"
-#: users/forms.py:71 users/templates/users/user_detail.html:228
+#: users/forms.py:71 users/templates/users/user_detail.html:230
msgid "Join user groups"
msgstr "添加到用户组"
@@ -4926,7 +4957,7 @@ msgstr "选择用户"
msgid "User auth from {}, go there change password"
msgstr "用户认证源来自 {}, 请去相应系统修改密码"
-#: users/models/user.py:147 users/models/user.py:564
+#: users/models/user.py:147 users/models/user.py:571
msgid "Administrator"
msgstr "管理员"
@@ -4947,27 +4978,27 @@ msgstr "组织管理员"
msgid "Org auditor"
msgstr "组织审计员"
-#: users/models/user.py:353 users/templates/users/user_profile.html:90
+#: users/models/user.py:357 users/templates/users/user_profile.html:90
msgid "Force enable"
msgstr "强制启用"
-#: users/models/user.py:419
+#: users/models/user.py:423
msgid "Local"
msgstr "数据库"
-#: users/models/user.py:442
+#: users/models/user.py:446
msgid "Avatar"
msgstr "头像"
-#: users/models/user.py:445 users/templates/users/user_detail.html:83
+#: users/models/user.py:449 users/templates/users/user_detail.html:83
msgid "Wechat"
msgstr "微信"
-#: users/models/user.py:478
+#: users/models/user.py:482
msgid "Date password last updated"
msgstr "最后更新密码日期"
-#: users/models/user.py:567
+#: users/models/user.py:574
msgid "Administrator is the super user of system"
msgstr "Administrator是初始的超级管理员"
@@ -5139,7 +5170,7 @@ msgid "Always young, always with tears in my eyes. Stay foolish Stay hungry"
msgstr "永远年轻,永远热泪盈眶 stay foolish stay hungry"
#: users/templates/users/reset_password.html:46
-#: users/templates/users/user_detail.html:434 users/utils.py:83
+#: users/templates/users/user_detail.html:439 users/utils.py:83
msgid "Reset password"
msgstr "重置密码"
@@ -5258,7 +5289,7 @@ msgid "Send reset ssh key mail"
msgstr "发送重置密钥邮件"
#: users/templates/users/user_detail.html:206
-#: users/templates/users/user_detail.html:522
+#: users/templates/users/user_detail.html:527
msgid "Unblock user"
msgstr "解除登录限制"
@@ -5266,46 +5297,46 @@ msgstr "解除登录限制"
msgid "Unblock"
msgstr "解除"
-#: users/templates/users/user_detail.html:377
+#: users/templates/users/user_detail.html:382
msgid "Goto profile page enable MFA"
msgstr "请去个人信息页面启用自己的MFA"
-#: users/templates/users/user_detail.html:433
+#: users/templates/users/user_detail.html:438
msgid "An e-mail has been sent to the user`s mailbox."
msgstr "已发送邮件到用户邮箱"
-#: users/templates/users/user_detail.html:444
+#: users/templates/users/user_detail.html:449
msgid "This will reset the user password and send a reset mail"
msgstr "将失效用户当前密码,并发送重设密码邮件到用户邮箱"
-#: users/templates/users/user_detail.html:459
+#: users/templates/users/user_detail.html:464
msgid ""
"The reset-ssh-public-key E-mail has been sent successfully. Please inform "
"the user to update his new ssh public key."
msgstr "重设密钥邮件将会发送到用户邮箱"
-#: users/templates/users/user_detail.html:460
+#: users/templates/users/user_detail.html:465
msgid "Reset SSH public key"
msgstr "重置SSH密钥"
-#: users/templates/users/user_detail.html:470
+#: users/templates/users/user_detail.html:475
msgid "This will reset the user public key and send a reset mail"
msgstr "将会失效用户当前密钥,并发送重置邮件到用户邮箱"
-#: users/templates/users/user_detail.html:488
+#: users/templates/users/user_detail.html:493
msgid "Successfully updated the SSH public key."
msgstr "更新ssh密钥成功"
-#: users/templates/users/user_detail.html:489
-#: users/templates/users/user_detail.html:493
+#: users/templates/users/user_detail.html:494
+#: users/templates/users/user_detail.html:498
msgid "User SSH public key update"
msgstr "ssh密钥"
-#: users/templates/users/user_detail.html:538
+#: users/templates/users/user_detail.html:543
msgid "After unlocking the user, the user can log in normally."
msgstr "解除用户登录限制后,此用户即可正常登录"
-#: users/templates/users/user_detail.html:552
+#: users/templates/users/user_detail.html:557
msgid "Reset user MFA success"
msgstr "重置用户MFA成功"
@@ -5696,7 +5727,7 @@ msgstr "Token错误或失效"
msgid "Password not same"
msgstr "密码不一致"
-#: users/views/login.py:154
+#: users/views/login.py:153
msgid "First login"
msgstr "首次登录"
@@ -6084,12 +6115,6 @@ msgstr "同步实例任务历史"
msgid "Instance"
msgstr "实例"
-#: xpack/plugins/cloud/models.py:304
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:109
-#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62
-msgid "Region"
-msgstr "地域"
-
#: xpack/plugins/cloud/providers/aliyun.py:14
msgid "Aliyun"
msgstr "阿里云"
@@ -6478,6 +6503,12 @@ msgstr "密码匣子"
msgid "vault create"
msgstr "创建"
+#~ msgid "Search no entry matched in ou {}"
+#~ msgstr "在ou:{}中没有匹配条目"
+
+#~ msgid "Date last active"
+#~ msgstr "最后活跃日期"
+
#~ msgid ""
#~ "Error: Account invalid (Please make sure the information such as Access "
#~ "key or Secret key is correct)"
@@ -6697,9 +6728,6 @@ msgstr "创建"
#~ msgid "already exists"
#~ msgstr "已经存在"
-#~ msgid "Invalid file."
-#~ msgstr "文件不合法"
-
#~ msgid "Refresh all node assets amount"
#~ msgstr "刷新所有节点资产数量"