[Merge] with doc

2025-10-22 00:09:14 +00:00 · 2018-03-06 18:04:03 +08:00
parent 25ebb5c442 86c0a2d28b
commit d3e77b09ef
38 changed files with 1391 additions and 119 deletions
--- a/apps/assets/models/user.py
+++ b/apps/assets/models/user.py
@@ -26,14 +26,14 @@ signer = get_signer()
 class AssetUser(models.Model):
    id = models.UUIDField(default=uuid.uuid4, primary_key=True)
    name = models.CharField(max_length=128, unique=True, verbose_name=_('Name'))
-    username = models.CharField(max_length=16, verbose_name=_('Username'))
+    username = models.CharField(max_length=128, verbose_name=_('Username'))
    _password = models.CharField(max_length=256, blank=True, null=True, verbose_name=_('Password'))
    _private_key = models.TextField(max_length=4096, blank=True, null=True, verbose_name=_('SSH private key'), validators=[private_key_validator, ])
    _public_key = models.TextField(max_length=4096, blank=True, verbose_name=_('SSH public key'))
    comment = models.TextField(blank=True, verbose_name=_('Comment'))
    date_created = models.DateTimeField(auto_now_add=True)
    date_updated = models.DateTimeField(auto_now=True)
-    created_by = models.CharField(max_length=32, null=True, verbose_name=_('Created by'))
+    created_by = models.CharField(max_length=128, null=True, verbose_name=_('Created by'))

    @property
    def password(self):
--- a/apps/assets/templates/assets/_system_user.html
+++ b/apps/assets/templates/assets/_system_user.html
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <div class="ibox float-e-margins">
                    <div class="ibox-title">
-                        <h5>{% trans 'Create system user' %}</h5>
+                        <h5>{{ action }}</h5>
                        <div class="ibox-tools">
                            <a class="collapse-link">
                                <i class="fa fa-chevron-up"></i>
--- a/apps/assets/templates/assets/admin_user_create_update.html
+++ b/apps/assets/templates/assets/admin_user_create_update.html
@@ -13,7 +13,7 @@
            <div class="col-sm-12">
                <div class="ibox float-e-margins">
                    <div class="ibox-title">
-                        <h5>{% trans 'Create admin user' %}</h5>
+                        <h5>{{ action }}</h5>
                        <div class="ibox-tools">
                            <a class="collapse-link">
                                <i class="fa fa-chevron-up"></i>
--- a/apps/i18n/zh/LC_MESSAGES/django.mo
+++ b/apps/i18n/zh/LC_MESSAGES/django.mo
--- a/apps/i18n/zh/LC_MESSAGES/django.po
+++ b/apps/i18n/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-01 15:29+0800\n"
+"POT-Creation-Date: 2018-03-06 17:57+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -87,7 +87,7 @@ msgid "Password or private key passphrase"
 msgstr "密码或密钥密码"

 #: assets/forms/user.py:25 assets/models/user.py:30 common/forms.py:113
-#: users/forms.py:16 users/forms.py:24 users/templates/users/login.html:56
+#: users/forms.py:16 users/forms.py:24 users/templates/users/login.html:59
 #: users/templates/users/reset_password.html:52
 #: users/templates/users/user_create.html:11
 #: users/templates/users/user_password_update.html:40
@@ -138,9 +138,9 @@ msgstr "名称"
 #: assets/templates/assets/system_user_detail.html:62
 #: assets/templates/assets/system_user_list.html:25
 #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:14
-#: users/models/authentication.py:44 users/models/user.py:34
+#: users/models/authentication.py:45 users/models/user.py:34
 #: users/templates/users/_select_user_modal.html:14
-#: users/templates/users/login.html:53
+#: users/templates/users/login.html:56
 #: users/templates/users/login_log_list.html:49
 #: users/templates/users/user_detail.html:67
 #: users/templates/users/user_list.html:24
@@ -165,7 +165,7 @@ msgstr "高优先级的系统用户将会作为默认登录用户"
 #: assets/models/asset.py:50 assets/templates/assets/_asset_list_modal.html:21
 #: assets/templates/assets/admin_user_assets.html:52
 #: assets/templates/assets/asset_detail.html:61
-#: assets/templates/assets/asset_list.html:81
+#: assets/templates/assets/asset_list.html:87
 #: assets/templates/assets/system_user_asset.html:50
 #: assets/templates/assets/user_asset_list.html:20 common/forms.py:144
 #: perms/templates/perms/asset_permission_asset.html:55
@@ -178,7 +178,7 @@ msgstr "IP"
 #: assets/models/asset.py:51 assets/templates/assets/_asset_list_modal.html:20
 #: assets/templates/assets/admin_user_assets.html:51
 #: assets/templates/assets/asset_detail.html:57
-#: assets/templates/assets/asset_list.html:80
+#: assets/templates/assets/asset_list.html:86
 #: assets/templates/assets/system_user_asset.html:49
 #: assets/templates/assets/user_asset_list.html:19 common/forms.py:143
 #: perms/templates/perms/asset_permission_asset.html:54
@@ -331,7 +331,7 @@ msgid "Default"
 msgstr "默认"

 #: assets/models/cluster.py:36 assets/models/label.py:13
-#: users/models/user.py:265
+#: users/models/user.py:266
 msgid "System"
 msgstr "系统"

@@ -357,8 +357,9 @@ msgstr "默认资产组"
 #: terminal/templates/terminal/command_list.html:72
 #: terminal/templates/terminal/session_list.html:33
 #: terminal/templates/terminal/session_list.html:71 users/forms.py:190
-#: users/models/user.py:30 users/templates/users/user_group_detail.html:78
-#: users/templates/users/user_group_list.html:13 users/views/user.py:334
+#: users/models/user.py:30 users/models/user.py:254
+#: users/templates/users/user_group_detail.html:78
+#: users/templates/users/user_group_list.html:13 users/views/user.py:333
 msgid "User"
 msgstr "用户"

@@ -463,7 +464,7 @@ msgstr "推送系统用户到节点: {}"

 #: assets/templates/assets/_asset_group_bulk_update_modal.html:5
 msgid "Update asset group"
-msgstr "编辑用户组"
+msgstr "更新用户组"

 #: assets/templates/assets/_asset_group_bulk_update_modal.html:8
 msgid "Hint: only change the field you want to update."
@@ -474,12 +475,11 @@ msgstr "仅修改你需要更新的字段"
 #: assets/views/admin_user.py:29 assets/views/admin_user.py:47
 #: assets/views/admin_user.py:63 assets/views/admin_user.py:78
 #: assets/views/admin_user.py:102 assets/views/asset.py:48
-#: assets/views/asset.py:61 assets/views/asset.py:95 assets/views/asset.py:155
-#: assets/views/asset.py:172 assets/views/asset.py:196 assets/views/label.py:26
-#: assets/views/label.py:42 assets/views/label.py:58
-#: assets/views/system_user.py:28 assets/views/system_user.py:44
-#: assets/views/system_user.py:60 assets/views/system_user.py:74
-#: templates/_nav.html:20
+#: assets/views/asset.py:94 assets/views/asset.py:154 assets/views/asset.py:171
+#: assets/views/asset.py:195 assets/views/label.py:26 assets/views/label.py:42
+#: assets/views/label.py:58 assets/views/system_user.py:28
+#: assets/views/system_user.py:44 assets/views/system_user.py:60
+#: assets/views/system_user.py:74 templates/_nav.html:20
 msgid "Assets"
 msgstr "资产管理"

@@ -522,14 +522,14 @@ msgid "If set id, will use this id update asset existed"
 msgstr "如果设置了id，则会使用该行信息更新该id的资产"

 #: assets/templates/assets/_asset_list_modal.html:22
-#: assets/templates/assets/asset_list.html:82
+#: assets/templates/assets/asset_list.html:88
 #: assets/templates/assets/user_asset_list.html:22
 msgid "Hardware"
 msgstr "硬件"

 #: assets/templates/assets/_asset_list_modal.html:23
 #: assets/templates/assets/asset_detail.html:143
-#: assets/templates/assets/asset_list.html:83
+#: assets/templates/assets/asset_list.html:89
 #: assets/templates/assets/user_asset_list.html:23 perms/models.py:20
 #: perms/models.py:77
 #: perms/templates/perms/asset_permission_create_update.html:51
@@ -548,7 +548,7 @@ msgstr "激活中"
 #: assets/templates/assets/admin_user_assets.html:54
 #: assets/templates/assets/admin_user_list.html:25
 #: assets/templates/assets/asset_detail.html:357
-#: assets/templates/assets/asset_list.html:84
+#: assets/templates/assets/asset_list.html:90
 #: assets/templates/assets/system_user_asset.html:52
 #: assets/templates/assets/system_user_list.html:27
 #: users/templates/users/user_granted_asset.html:47
@@ -558,7 +558,7 @@ msgstr "可连接"

 #: assets/templates/assets/_asset_list_modal.html:25
 #: assets/templates/assets/admin_user_list.html:29
-#: assets/templates/assets/asset_list.html:85
+#: assets/templates/assets/asset_list.html:91
 #: assets/templates/assets/label_list.html:17
 #: assets/templates/assets/system_user_list.html:31
 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:61
@@ -572,25 +572,25 @@ msgid "Action"
 msgstr "动作"

 #: assets/templates/assets/_asset_list_modal.html:34
-#: assets/templates/assets/asset_list.html:94
+#: assets/templates/assets/asset_list.html:100
 #: users/templates/users/user_list.html:37
 msgid "Delete selected"
 msgstr "批量删除"

 #: assets/templates/assets/_asset_list_modal.html:35
-#: assets/templates/assets/asset_list.html:95
+#: assets/templates/assets/asset_list.html:101
 #: users/templates/users/user_list.html:38
 msgid "Update selected"
 msgstr "批量更新"

 #: assets/templates/assets/_asset_list_modal.html:36
-#: assets/templates/assets/asset_list.html:97
+#: assets/templates/assets/asset_list.html:103
 #: users/templates/users/user_list.html:39
 msgid "Deactive selected"
 msgstr "禁用所选"

 #: assets/templates/assets/_asset_list_modal.html:37
-#: assets/templates/assets/asset_list.html:98
+#: assets/templates/assets/asset_list.html:104
 #: users/templates/users/user_list.html:40
 msgid "Active selected"
 msgstr "激活所选"
@@ -600,7 +600,7 @@ msgstr "激活所选"
 #: assets/templates/assets/admin_user_create_update.html:46
 #: assets/templates/assets/asset_bulk_update.html:24
 #: assets/templates/assets/asset_create.html:66
-#: assets/templates/assets/asset_list.html:102
+#: assets/templates/assets/asset_list.html:108
 #: assets/templates/assets/asset_update.html:70
 #: assets/templates/assets/label_create_update.html:17
 #: common/templates/common/basic_setting.html:59
@@ -608,6 +608,7 @@ msgstr "激活所选"
 #: common/templates/common/ldap_setting.html:60
 #: common/templates/common/terminal_setting.html:103
 #: perms/templates/perms/asset_permission_create_update.html:72
+#: terminal/templates/terminal/session_list.html:120
 #: terminal/templates/terminal/terminal_update.html:48
 #: users/templates/users/_user.html:44
 #: users/templates/users/first_login.html:62
@@ -624,7 +625,7 @@ msgstr "提交"
 #: assets/templates/assets/admin_user_detail.html:24
 #: assets/templates/assets/admin_user_list.html:84
 #: assets/templates/assets/asset_detail.html:24
-#: assets/templates/assets/asset_list.html:160
+#: assets/templates/assets/asset_list.html:166
 #: assets/templates/assets/label_list.html:38
 #: assets/templates/assets/system_user_detail.html:26
 #: assets/templates/assets/system_user_list.html:85
@@ -643,7 +644,7 @@ msgstr "更新"
 #: assets/templates/assets/admin_user_detail.html:28
 #: assets/templates/assets/admin_user_list.html:85
 #: assets/templates/assets/asset_detail.html:28
-#: assets/templates/assets/asset_list.html:161
+#: assets/templates/assets/asset_list.html:167
 #: assets/templates/assets/label_list.html:39
 #: assets/templates/assets/system_user_detail.html:30
 #: assets/templates/assets/system_user_list.html:86
@@ -773,7 +774,7 @@ msgstr "替换资产的管理员"

 #: assets/templates/assets/admin_user_detail.html:100
 #: assets/templates/assets/asset_detail.html:198
-#: assets/templates/assets/asset_list.html:535
+#: assets/templates/assets/asset_list.html:541
 #: assets/templates/assets/system_user_detail.html:181
 #: assets/templates/assets/system_user_list.html:135 templates/_modal.html:16
 #: terminal/templates/terminal/session_detail.html:108
@@ -807,12 +808,12 @@ msgid "Node"
 msgstr "节点"

 #: assets/templates/assets/asset_create.html:34
-#: assets/templates/assets/asset_list.html:69
+#: assets/templates/assets/asset_list.html:75
 #: assets/templates/assets/asset_update.html:39
 msgid "Label"
 msgstr "标签"

-#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:197
+#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:196
 msgid "Asset detail"
 msgstr "资产详情"

@@ -850,50 +851,50 @@ msgstr "刷新"
 msgid "Update successfully!"
 msgstr "更新成功"

-#: assets/templates/assets/asset_list.html:57
-#: assets/templates/assets/asset_list.html:114 assets/views/asset.py:96
+#: assets/templates/assets/asset_list.html:63
+#: assets/templates/assets/asset_list.html:120 assets/views/asset.py:95
 msgid "Create asset"
 msgstr "创建资产"

-#: assets/templates/assets/asset_list.html:61
+#: assets/templates/assets/asset_list.html:67
 #: users/templates/users/user_list.html:7
 msgid "Import"
 msgstr "导入"

-#: assets/templates/assets/asset_list.html:64
+#: assets/templates/assets/asset_list.html:70
 #: users/templates/users/user_list.html:10
 msgid "Export"
 msgstr "导出"

-#: assets/templates/assets/asset_list.html:96
+#: assets/templates/assets/asset_list.html:102
 msgid "Remove from this node"
 msgstr "从节点移除"

-#: assets/templates/assets/asset_list.html:115
+#: assets/templates/assets/asset_list.html:121
 msgid "Add asset"
 msgstr "添加资产到节点"

-#: assets/templates/assets/asset_list.html:117
+#: assets/templates/assets/asset_list.html:123
 msgid "Add node"
 msgstr "新建节点"

-#: assets/templates/assets/asset_list.html:118
+#: assets/templates/assets/asset_list.html:124
 msgid "Rename node"
 msgstr "重命名节点"

-#: assets/templates/assets/asset_list.html:120
+#: assets/templates/assets/asset_list.html:126
 msgid "Delete node"
 msgstr "删除节点"

-#: assets/templates/assets/asset_list.html:195
+#: assets/templates/assets/asset_list.html:201
 msgid "Create node failed"
 msgstr "创建节点失败"

-#: assets/templates/assets/asset_list.html:208
+#: assets/templates/assets/asset_list.html:214
 msgid "Have child node, cancel"
 msgstr "存在子节点，不能删除"

-#: assets/templates/assets/asset_list.html:530
+#: assets/templates/assets/asset_list.html:536
 #: assets/templates/assets/system_user_list.html:130
 #: users/templates/users/user_detail.html:334
 #: users/templates/users/user_detail.html:359
@@ -902,20 +903,20 @@ msgstr "存在子节点，不能删除"
 msgid "Are you sure?"
 msgstr "你确认吗?"

-#: assets/templates/assets/asset_list.html:531
+#: assets/templates/assets/asset_list.html:537
 msgid "This will delete the selected assets !!!"
 msgstr "删除选择资产"

-#: assets/templates/assets/asset_list.html:539
+#: assets/templates/assets/asset_list.html:545
 msgid "Asset Deleted."
 msgstr "已被删除"

-#: assets/templates/assets/asset_list.html:540
-#: assets/templates/assets/asset_list.html:545
+#: assets/templates/assets/asset_list.html:546
+#: assets/templates/assets/asset_list.html:551
 msgid "Asset Delete"
 msgstr "删除"

-#: assets/templates/assets/asset_list.html:544
+#: assets/templates/assets/asset_list.html:550
 msgid "Asset Deleting failed."
 msgstr "删除失败"

@@ -1011,19 +1012,23 @@ msgstr "更新管理用户"
 msgid "Admin user detail"
 msgstr "管理用户详情"

-#: assets/views/asset.py:49 assets/views/asset.py:62 templates/_nav.html:23
+#: assets/views/asset.py:49 templates/_nav.html:23
 msgid "Asset list"
 msgstr "资产列表"

-#: assets/views/asset.py:156
+#: assets/views/asset.py:61 templates/_nav_user.html:4
+msgid "My assets"
+msgstr "我的资产"
+
+#: assets/views/asset.py:155
 msgid "Bulk update asset"
 msgstr "批量更新资产"

-#: assets/views/asset.py:173
+#: assets/views/asset.py:172
 msgid "Update asset"
-msgstr "编辑资产"
+msgstr "更新资产"

-#: assets/views/asset.py:297
+#: assets/views/asset.py:296
 msgid "already exists"
 msgstr "已经存在"

@@ -1033,7 +1038,7 @@ msgstr "标签列表"

 #: assets/views/label.py:59
 msgid "Update label"
-msgstr "编辑标签"
+msgstr "更新标签"

 #: assets/views/system_user.py:29
 msgid "System user list"
@@ -1269,7 +1274,7 @@ msgid "Type"
 msgstr "类型"

 #: common/views.py:20 common/views.py:46 common/views.py:72 common/views.py:102
-#: templates/_nav.html:67
+#: templates/_nav.html:72
 msgid "Settings"
 msgstr "系统设置"

@@ -1536,7 +1541,7 @@ msgstr "任务开始: "
 msgid "Ops"
 msgstr "作业中心"

-#: ops/views.py:37 templates/_nav.html:53
+#: ops/views.py:37 templates/_nav.html:58
 msgid "Task list"
 msgstr "任务列表"

@@ -1546,7 +1551,8 @@ msgstr "执行历史"

 #: perms/forms.py:22 perms/models.py:16 perms/models.py:75
 #: perms/templates/perms/asset_permission_list.html:68 templates/_nav.html:14
-#: users/models/user.py:37 users/templates/users/_select_user_modal.html:16
+#: users/models/group.py:25 users/models/user.py:37
+#: users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_detail.html:179
 #: users/templates/users/user_list.html:26
 msgid "User group"
@@ -1684,28 +1690,28 @@ msgstr "文档"
 #: users/templates/users/user_profile.html:17
 #: users/templates/users/user_profile_update.html:37
 #: users/templates/users/user_profile_update.html:57
-#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:317
+#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:316
 msgid "Profile"
 msgstr "个人信息"

-#: templates/_header_bar.html:41
+#: templates/_header_bar.html:40
 msgid "Admin page"
 msgstr "管理页面"

-#: templates/_header_bar.html:43
+#: templates/_header_bar.html:42
 msgid "User page"
 msgstr "用户页面"

-#: templates/_header_bar.html:46
+#: templates/_header_bar.html:45
 msgid "Logout"
 msgstr "注销登录"

-#: templates/_header_bar.html:50 users/templates/users/login.html:42
-#: users/templates/users/login.html:61
+#: templates/_header_bar.html:49 users/templates/users/login.html:44
+#: users/templates/users/login.html:64
 msgid "Login"
 msgstr "登录"

-#: templates/_header_bar.html:63 templates/_nav.html:4
+#: templates/_header_bar.html:62 templates/_nav.html:4
 msgid "Dashboard"
 msgstr "仪表盘"

@@ -1740,10 +1746,10 @@ msgid "Close"
 msgstr "关闭"

 #: templates/_nav.html:10 users/views/group.py:28 users/views/group.py:44
-#: users/views/group.py:62 users/views/group.py:79 users/views/login.py:200
-#: users/views/login.py:249 users/views/user.py:59 users/views/user.py:74
-#: users/views/user.py:93 users/views/user.py:149 users/views/user.py:304
-#: users/views/user.py:316 users/views/user.py:352 users/views/user.py:374
+#: users/views/group.py:62 users/views/group.py:79 users/views/group.py:95
+#: users/views/login.py:209 users/views/login.py:258 users/views/user.py:59
+#: users/views/user.py:74 users/views/user.py:93 users/views/user.py:149
+#: users/views/user.py:304 users/views/user.py:351 users/views/user.py:373
 msgid "Users"
 msgstr "用户管理"

@@ -1771,7 +1777,11 @@ msgstr "历史会话"
 msgid "Commands"
 msgstr "命令记录"

-#: templates/_nav.html:45 terminal/templates/terminal/session_list.html:75
+#: templates/_nav.html:47 templates/_nav_user.html:14
+msgid "Web terminal"
+msgstr "Web终端"
+
+#: templates/_nav.html:50 terminal/templates/terminal/session_list.html:75
 #: terminal/views/command.py:47 terminal/views/session.py:75
 #: terminal/views/session.py:92 terminal/views/session.py:114
 #: terminal/views/terminal.py:31 terminal/views/terminal.py:46
@@ -1779,18 +1789,10 @@ msgstr "命令记录"
 msgid "Terminal"
 msgstr "终端管理"

-#: templates/_nav.html:50
+#: templates/_nav.html:55
 msgid "Job Center"
 msgstr "作业中心"

-#: templates/_nav_user.html:4
-msgid "My assets"
-msgstr "我的资产"
-
-#: templates/_nav_user.html:14
-msgid "Web terminal"
-msgstr "Web终端"
-
 #: templates/captcha/image.html:3
 msgid "Play CAPTCHA as audio file"
 msgstr "语言播放验证码"
@@ -1878,10 +1880,8 @@ msgid "Command"
 msgstr "命令"

 #: terminal/models.py:131
-#, fuzzy
-#| msgid "Date start"
 msgid "Date last active"
-msgstr "开始日期"
+msgstr "最后活跃日期"

 #: terminal/models.py:133
 msgid "Date end"
@@ -1938,7 +1938,13 @@ msgstr "监控"
 msgid "Terminate"
 msgstr "终断"

-#: terminal/templates/terminal/session_list.html:121
+#: terminal/templates/terminal/session_list.html:116
+#, fuzzy
+#| msgid "Deactive selected"
+msgid "Terminate selected"
+msgstr "禁用所选"
+
+#: terminal/templates/terminal/session_list.html:136
 msgid "Terminate task send, waiting ..."
 msgstr "终断任务已发送，请等待"

@@ -2109,31 +2115,31 @@ msgstr "ssh密钥不合法"
 msgid "Select users"
 msgstr "选择用户"

-#: users/models/authentication.py:35
+#: users/models/authentication.py:36
 msgid "Private Token"
 msgstr "ssh密钥"

-#: users/models/authentication.py:45
+#: users/models/authentication.py:46
 msgid "Login type"
 msgstr "登录方式"

-#: users/models/authentication.py:46
+#: users/models/authentication.py:47
 msgid "Login ip"
 msgstr "登录IP"

-#: users/models/authentication.py:47
+#: users/models/authentication.py:48
 msgid "Login city"
 msgstr "登录城市"

-#: users/models/authentication.py:48
+#: users/models/authentication.py:49
 msgid "User agent"
 msgstr "Agent"

-#: users/models/authentication.py:49
+#: users/models/authentication.py:50
 msgid "Date login"
 msgstr "登录日期"

-#: users/models/user.py:29 users/models/user.py:261
+#: users/models/user.py:29 users/models/user.py:262
 msgid "Administrator"
 msgstr "管理员"

@@ -2172,7 +2178,7 @@ msgstr "二次验证"
 msgid "Public key"
 msgstr "ssh公钥"

-#: users/models/user.py:264
+#: users/models/user.py:265
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"

@@ -2243,7 +2249,7 @@ msgid " for more information"
 msgstr "获取更多信息"

 #: users/templates/users/forgot_password.html:26
-#: users/templates/users/login.html:64
+#: users/templates/users/login.html:73
 msgid "Forgot password"
 msgstr "忘记密码"

@@ -2251,7 +2257,7 @@ msgstr "忘记密码"
 msgid "Input your email, that will send a mail to your"
 msgstr "输入您的邮箱, 将会发一封重置邮件到您的邮箱中"

-#: users/templates/users/login.html:47
+#: users/templates/users/login.html:50
 msgid "Captcha invalid"
 msgstr "验证码错误"

@@ -2360,7 +2366,7 @@ msgstr "取消"
 #: users/templates/users/user_group_granted_asset.html:18
 #: users/views/group.py:80
 msgid "User group detail"
-msgstr "资产组详情"
+msgstr "用户组详情"

 #: users/templates/users/user_group_detail.html:86
 msgid "Add user"
@@ -2431,7 +2437,7 @@ msgstr "更新密钥"

 #: users/templates/users/user_update.html:4 users/views/user.py:93
 msgid "Update user"
-msgstr "编辑用户"
+msgstr "更新用户"

 #: users/utils.py:35
 msgid "Create account successfully"
@@ -2569,54 +2575,58 @@ msgstr "用户组列表"

 #: users/views/group.py:63
 msgid "Update user group"
-msgstr "编辑用户组"
+msgstr "更新用户组"

-#: users/views/login.py:56
+#: users/views/group.py:96
+msgid "User group granted asset"
+msgstr "用户组授权资产"
+
+#: users/views/login.py:57
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"

-#: users/views/login.py:90
+#: users/views/login.py:99
 msgid "Logout success"
 msgstr "退出登录成功"

-#: users/views/login.py:91
+#: users/views/login.py:100
 msgid "Logout success, return login page"
 msgstr "退出登录成功，返回到登录页面"

-#: users/views/login.py:107
+#: users/views/login.py:116
 msgid "Email address invalid, please input again"
 msgstr "邮箱地址错误，重新输入"

-#: users/views/login.py:120
+#: users/views/login.py:129
 msgid "Send reset password message"
 msgstr "发送重置密码邮件"

-#: users/views/login.py:121
+#: users/views/login.py:130
 msgid "Send reset password mail success, login your mail box and follow it "
 msgstr ""
 "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)"

-#: users/views/login.py:135
+#: users/views/login.py:144
 msgid "Reset password success"
 msgstr "重置密码成功"

-#: users/views/login.py:136
+#: users/views/login.py:145
 msgid "Reset password success, return to login page"
 msgstr "重置密码成功，返回到登录页面"

-#: users/views/login.py:153 users/views/login.py:166
+#: users/views/login.py:162 users/views/login.py:175
 msgid "Token invalid or expired"
 msgstr "Token错误或失效"

-#: users/views/login.py:162
+#: users/views/login.py:171
 msgid "Password not same"
 msgstr "密码不一致"

-#: users/views/login.py:200
+#: users/views/login.py:209
 msgid "First login"
 msgstr "首次登陆"

-#: users/views/login.py:250
+#: users/views/login.py:259
 msgid "Login log list"
 msgstr "登录日志"

@@ -2632,17 +2642,14 @@ msgstr "文件不合法"
 msgid "User granted assets"
 msgstr "用户授权资产"

-#: users/views/user.py:335
+#: users/views/user.py:334
 msgid "Profile setting"
 msgstr "个人信息设置"

-#: users/views/user.py:353
+#: users/views/user.py:352
 msgid "Password update"
 msgstr "密码更新"

-#: users/views/user.py:375
+#: users/views/user.py:374
 msgid "Public key update"
 msgstr "密钥更新"
-
-#~ msgid "Help"
-#~ msgstr "帮助"
--- a/apps/perms/templates/perms/asset_permission_create_update.html
+++ b/apps/perms/templates/perms/asset_permission_create_update.html
@@ -14,7 +14,7 @@
            <div class="col-sm-12">
                <div class="ibox float-e-margins">
                    <div class="ibox-title">
-                        <h5>{% trans 'Create asset permission ' %}</h5>
+                        <h5>{{ action }}</h5>
                        <div class="ibox-tools">
                            <a class="collapse-link">
                                <i class="fa fa-chevron-up"></i>
--- a/apps/users/views/group.py
+++ b/apps/users/views/group.py
@@ -92,8 +92,8 @@ class UserGroupGrantedAssetView(AdminUserRequiredMixin, DetailView):

    def get_context_data(self, **kwargs):
        context = {
-            'app': 'User',
-            'action': 'User group granted asset',
+            'app': _('Users'),
+            'action': _('User group granted asset'),
        }
        kwargs.update(context)
        return super().get_context_data(**kwargs)