diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index a04d6205c..0a8f755fa 100644
Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ
diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index cda86f2c0..5218a674d 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/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: 2016-11-22 21:30+0800\n"
+"POT-Creation-Date: 2017-03-26 13:39+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"
@@ -17,857 +17,1181 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: assets/forms.py:53 assets/forms.py:208
-#: assets/templates/assets/admin_user_detail.html:191 perms/forms.py:27
-#: perms/templates/perms/asset_permission_asset.html:139 users/forms.py:124
-msgid "Select asset groups"
-msgstr "添加到资产组"
+#: applications/models.py:14
+#: applications/templates/applications/terminal_detail.html:43
+#: applications/templates/applications/terminal_list.html:29
+#: assets/forms.py:121 assets/forms.py:201 assets/forms.py:269
+#: assets/models/group.py:18 assets/models/idc.py:18 assets/models/user.py:34
+#: assets/models/user.py:136 assets/templates/assets/admin_user_detail.html:52
+#: assets/templates/assets/admin_user_list.html:15
+#: assets/templates/assets/asset_group_list.html:15
+#: assets/templates/assets/idc_detail.html:57
+#: assets/templates/assets/idc_list.html:18
+#: assets/templates/assets/system_user_asset_group.html:51
+#: assets/templates/assets/system_user_detail.html:52
+#: assets/templates/assets/system_user_list.html:17 audits/models.py:18
+#: audits/templates/audits/login_log_list.html:49 ops/models.py:19
+#: ops/templates/ops/task_detail.html:50 ops/templates/ops/task_list.html:39
+#: perms/models.py:21
+#: perms/templates/perms/asset_permission_create_update.html:33
+#: perms/templates/perms/asset_permission_detail.html:62
+#: perms/templates/perms/asset_permission_list.html:11
+#: perms/templates/perms/asset_permission_user.html:64 users/models/group.py:18
+#: users/models/user.py:32 users/templates/users/_select_user_modal.html:13
+#: users/templates/users/user_asset_permission.html:54
+#: users/templates/users/user_detail.html:65
+#: users/templates/users/user_granted_asset.html:88
+#: users/templates/users/user_group_asset_permission.html:54
+#: users/templates/users/user_group_detail.html:58
+#: users/templates/users/user_group_granted_asset.html:88
+#: users/templates/users/user_group_list.html:12
+#: users/templates/users/user_list.html:25
+msgid "Name"
+msgstr "名称"
 
-#: assets/forms.py:56
-#, fuzzy
-#| msgid "Select assets"
-msgid "Select asset tags"
-msgstr "选择资产"
+#: applications/models.py:15
+msgid "Remote address"
+msgstr "远端地址"
+
+#: applications/models.py:16
+#: applications/templates/applications/terminal_detail.html:55
+msgid "Terminal type"
+msgstr "终端类型"
+
+#: applications/models.py:19
+#, fuzzy
+msgid "URL to login"
+msgstr "登录地址"
+
+#: applications/models.py:22
+#: applications/templates/applications/terminal_detail.html:63
+#: assets/models/asset.py:85 assets/models/group.py:22 assets/models/idc.py:35
+#: assets/models/user.py:46 assets/models/user.py:157
+#: assets/templates/assets/admin_user_detail.html:68
+#: assets/templates/assets/admin_user_list.html:19
+#: assets/templates/assets/asset_detail.html:129
+#: assets/templates/assets/asset_group_list.html:17
+#: assets/templates/assets/idc_detail.html:97
+#: assets/templates/assets/system_user_asset_group.html:54
+#: assets/templates/assets/system_user_detail.html:106
+#: assets/templates/assets/system_user_list.html:21 perms/models.py:40
+#: perms/templates/perms/asset_permission_detail.html:98
+#: users/models/group.py:19 users/models/user.py:43
+#: users/templates/users/user_detail.html:109
+#: users/templates/users/user_group_detail.html:70
+#: users/templates/users/user_group_list.html:14
+msgid "Comment"
+msgstr "备注"
 
-#: assets/forms.py:58
-#, fuzzy
-#| msgid "System user"
-msgid "Select asset system users"
-msgstr "系统"
+#: applications/templates/applications/terminal_detail.html:13
+#: applications/views.py:51
+msgid "Terminal detail"
+msgstr "终端详情"
+
+#: applications/templates/applications/terminal_detail.html:51
+msgid "Terminal url"
+msgstr "终端地址"
+
+#: applications/templates/applications/terminal_detail.html:59
+#: assets/templates/assets/admin_user_detail.html:60
+#: assets/templates/assets/asset_tag_detail.html:51
+#: assets/templates/assets/idc_detail.html:89
+#: assets/templates/assets/system_user_detail.html:98 perms/models.py:39
+#: perms/templates/perms/asset_permission_detail.html:90
+#: users/templates/users/user_group_detail.html:66
+msgid "Date created"
+msgstr "创建日期"
+
+#: applications/templates/applications/terminal_list.html:30
+#: assets/models/asset.py:41 assets/templates/assets/admin_user_detail.html:98
+#: assets/templates/assets/asset_detail.html:53
+#: assets/templates/assets/asset_group_detail.html:46
+#: assets/templates/assets/asset_list.html:55
+#: assets/templates/assets/asset_tag_detail.html:82
+#: assets/templates/assets/idc_assets.html:55
+#: assets/templates/assets/system_user_asset.html:48
+#: audits/templates/audits/login_log_list.html:52
+#: perms/templates/perms/asset_permission_asset.html:65
+#: users/templates/users/user_granted_asset.html:53
+#: users/templates/users/user_group_granted_asset.html:53
+msgid "IP"
+msgstr "IP"
+
+#: applications/templates/applications/terminal_list.html:31
+#: assets/templates/assets/asset_group_detail.html:48
+#: assets/templates/assets/asset_list.html:57
+#: assets/templates/assets/asset_tag_detail.html:84
+#: assets/templates/assets/idc_assets.html:57
+#: audits/templates/audits/login_log_list.html:50
+msgid "Type"
+msgstr "类型"
+
+#: applications/templates/applications/terminal_list.html:32
+#: templates/_nav.html:59
+msgid "Session online"
+msgstr "在线session"
+
+#: applications/templates/applications/terminal_list.html:33
+#: assets/templates/assets/asset_detail.html:146
+#: assets/templates/assets/asset_list.html:74 perms/models.py:33
+#: perms/templates/perms/asset_permission_create_update.html:47
+#: users/templates/users/_select_user_modal.html:18
+#: users/templates/users/user_detail.html:126
+#: users/templates/users/user_list.html:29
+msgid "Active"
+msgstr "激活"
+
+#: applications/templates/applications/terminal_list.html:34
+#: assets/templates/assets/admin_user_detail.html:100
+#: assets/templates/assets/asset_group_detail.html:49
+#: assets/templates/assets/asset_list.html:61
+msgid "Alive"
+msgstr "在线"
+
+#: applications/templates/applications/terminal_list.html:35
+#: assets/templates/assets/admin_user_detail.html:101
+#: assets/templates/assets/admin_user_list.html:20
+#: assets/templates/assets/asset_group_detail.html:50
+#: assets/templates/assets/asset_group_list.html:18
+#: assets/templates/assets/asset_list.html:62
+#: assets/templates/assets/asset_tag_detail.html:86
+#: assets/templates/assets/asset_tags_list.html:65
+#: assets/templates/assets/idc_list.html:23
+#: assets/templates/assets/system_user_asset.html:51
+#: assets/templates/assets/system_user_list.html:22
+#: ops/templates/ops/task_list.html:45
+#: perms/templates/perms/asset_permission_list.html:18
+#: users/templates/users/user_group_list.html:15
+#: users/templates/users/user_list.html:30
+msgid "Action"
+msgstr "动作"
+
+#: applications/templates/applications/terminal_list.html:72
+#: assets/templates/assets/admin_user_detail.html:305
+#: assets/templates/assets/admin_user_list.html:56
+#: assets/templates/assets/asset_group_detail.html:176
+#: assets/templates/assets/asset_group_detail.html:300
+#: assets/templates/assets/asset_group_list.html:55
+#: assets/templates/assets/asset_list.html:131
+#: assets/templates/assets/asset_tag_detail.html:223
+#: assets/templates/assets/asset_tags_list.html:99
+#: assets/templates/assets/idc_list.html:55
+#: assets/templates/assets/system_user_asset.html:256
+#: assets/templates/assets/system_user_list.html:58
+#: perms/templates/perms/asset_permission_list.html:44
+#: users/templates/users/user_group_list.html:50
+#: users/templates/users/user_list.html:78
+#: users/templates/users/user_profile.html:111
+msgid "Update"
+msgstr "更新"
+
+#: applications/templates/applications/terminal_list.html:74
+#: assets/templates/assets/admin_user_list.html:57
+#: assets/templates/assets/asset_group_detail.html:175
+#: assets/templates/assets/asset_group_list.html:56
+#: assets/templates/assets/asset_list.html:132
+#: assets/templates/assets/asset_tag_detail.html:224
+#: assets/templates/assets/asset_tags_list.html:100
+#: assets/templates/assets/idc_list.html:56
+#: assets/templates/assets/system_user_asset.html:257
+#: assets/templates/assets/system_user_list.html:59
+#: ops/templates/ops/task_list.html:72
+#: perms/templates/perms/asset_permission_list.html:47
+#: users/templates/users/user_group_list.html:52
+#: users/templates/users/user_list.html:79
+msgid "Delete"
+msgstr "删除"
 
-#: assets/forms.py:59
+#: applications/templates/applications/terminal_list.html:77
+msgid "Accept"
+msgstr "接受"
+
+#: applications/templates/applications/terminal_list.html:79
+msgid "Reject"
+msgstr "拒绝"
+
+#: applications/templates/applications/terminal_modal_accept.html:5
+msgid "Accept terminal registration"
+msgstr "接受终端注册请求"
+
+#: applications/templates/applications/terminal_update.html:33
+msgid "Info"
+msgstr "信息"
+
+#: applications/templates/applications/terminal_update.html:40
+#: assets/templates/assets/_system_user.html:70
+#: assets/templates/assets/asset_create.html:31
+#: assets/templates/assets/asset_update.html:46
+#: perms/templates/perms/asset_permission_create_update.html:45
+msgid "Other"
+msgstr "其它"
+
+#: applications/templates/applications/terminal_update.html:45
+#: assets/templates/assets/_system_user.html:76
+#: assets/templates/assets/admin_user_create_update.html:46
+#: assets/templates/assets/admin_user_detail.html:151
+#: assets/templates/assets/asset_create.html:39
+#: assets/templates/assets/asset_modal_update.html:78
+#: assets/templates/assets/asset_update.html:56
+#: assets/templates/assets/idc_create_update.html:51
+#: assets/templates/assets/system_user_detail.html:145
+#: perms/templates/perms/asset_permission_create_update.html:67
+#: users/templates/users/_user.html:49
+#: users/templates/users/user_detail.html:158
+#: users/templates/users/user_detail.html:166
+msgid "Reset"
+msgstr "重置"
+
+#: applications/templates/applications/terminal_update.html:46
+#: assets/templates/assets/_system_user.html:77
+#: assets/templates/assets/admin_user_create_update.html:47
+#: assets/templates/assets/admin_user_list.html:33
+#: assets/templates/assets/asset_create.html:40
+#: assets/templates/assets/asset_group_list.html:32
+#: assets/templates/assets/asset_list.html:78
+#: assets/templates/assets/asset_modal_update.html:79
+#: assets/templates/assets/asset_tags_list.html:79
+#: assets/templates/assets/asset_update.html:57
+#: assets/templates/assets/idc_assets.html:72
+#: assets/templates/assets/idc_create_update.html:52
+#: assets/templates/assets/idc_list.html:36
+#: assets/templates/assets/system_user_list.html:36
+#: audits/templates/audits/proxy_log_online_list.html:124
+#: perms/templates/perms/asset_permission_create_update.html:68
+#: users/templates/users/_user.html:50
+#: users/templates/users/forgot_password.html:44
+#: users/templates/users/user_asset_permission.html:100
+#: users/templates/users/user_group_asset_permission.html:100
+#: users/templates/users/user_group_list.html:26
+#: users/templates/users/user_list.html:46
+msgid "Submit"
+msgstr "提交"
+
+#: applications/views.py:23 audits/models.py:47
+#: audits/templates/audits/proxy_log_offline_list.html:67
+#: audits/templates/audits/proxy_log_online_list.html:67 templates/_nav.html:42
+msgid "Terminal"
+msgstr "终端"
+
+#: applications/views.py:24
+msgid "Terminal list"
+msgstr "终端列表"
+
+#: applications/views.py:38 applications/views.py:50 templates/_nav.html:39
+msgid "Applications"
+msgstr "应用程序"
+
+#: applications/views.py:38
 #, fuzzy
-#| msgid "Select assets"
+msgid "Update terminal"
+msgstr "更新terminal"
+
+#: assets/forms.py:15
+msgid "Select admin user"
+msgstr "选择管理用户"
+
+#: assets/forms.py:26 assets/forms.py:47
+#: assets/templates/assets/admin_user_detail.html:198 perms/forms.py:30
+#: perms/templates/perms/asset_permission_asset.html:137 users/forms.py:102
+#: users/forms.py:129
+msgid "Select asset groups"
+msgstr "添加到资产组"
+
+#: assets/forms.py:27 assets/forms.py:48
 msgid "Select asset admin user"
-msgstr "选择资产"
+msgstr "选择资产管理用户"
 
-#: assets/forms.py:71 assets/forms.py:107 assets/forms.py:140
-#: assets/forms.py:198 assets/forms.py:270
+#: assets/forms.py:32 assets/forms.py:53
+msgid ""
+"System user will be granted for user to login assets (using ansible create "
+"automatic)"
+msgstr "系统用户会被授权给用户用来登录资产, ansible会自动创建"
+
+#: assets/forms.py:33 assets/forms.py:54
+msgid ""
+"Admin user should be exist on asset already, And have sudo ALL permission"
+msgstr "管理用户应该已经在资产上存在, 可以是root或者其他拥有 sudo ALL 权限的用户"
+
+#: assets/forms.py:62 assets/forms.py:98 assets/forms.py:136
+#: assets/templates/assets/asset_group_list.html:16
+#: assets/templates/assets/system_user_list.html:19 audits/models.py:41
+#: audits/templates/audits/command_log_list.html:35
+#: audits/templates/audits/proxy_log_offline_list.html:34
+#: audits/templates/audits/proxy_log_offline_list.html:65
+#: audits/templates/audits/proxy_log_online_list.html:34
+#: audits/templates/audits/proxy_log_online_list.html:65
+#: ops/templates/ops/task_list.html:40
 #: perms/templates/perms/asset_permission_create_update.html:40
-#: templates/_nav.html:21
+#: perms/templates/perms/asset_permission_list.html:14 templates/_nav.html:21
+#: users/templates/users/user_asset_permission.html:55
+#: users/templates/users/user_granted_asset.html:89
+#: users/templates/users/user_group_asset_permission.html:55
+#: users/templates/users/user_group_granted_asset.html:89
 msgid "Asset"
 msgstr "资产"
 
-#: assets/forms.py:74 assets/forms.py:110 assets/forms.py:143
-#: assets/forms.py:201 assets/forms.py:273 perms/forms.py:25 users/forms.py:122
+#: assets/forms.py:65 assets/forms.py:101 assets/forms.py:139
+#: assets/templates/assets/asset_group_detail.html:86 perms/forms.py:27
+#: users/forms.py:99 users/forms.py:126
 msgid "Select assets"
 msgstr "选择资产"
 
-#: assets/forms.py:96
+#: assets/forms.py:87
 #, fuzzy
 #| msgid "System user"
 msgid "Select asset system user"
 msgstr "系统"
 
-#: assets/forms.py:129 assets/forms.py:186 assets/forms.py:258
-#: assets/models.py:15 assets/models.py:94 assets/models.py:159
-#: assets/models.py:243 assets/templates/assets/admin_user_detail.html:46
-#: assets/templates/assets/admin_user_list.html:10
-#: assets/templates/assets/asset_group_detail.html:46
-#: assets/templates/assets/asset_group_list.html:12
-#: assets/templates/assets/idc_list.html:12
-#: assets/templates/assets/system_user_asset_group.html:53
-#: assets/templates/assets/system_user_detail.html:51
-#: assets/templates/assets/system_user_list.html:10 ops/models.py:18
-#: ops/models.py:36 ops/models.py:48 ops/models.py:65 ops/models.py:397
-#: ops/templates/cron/list.html:26 ops/templates/sudo/list.html:26
-#: perms/models.py:19
-#: perms/templates/perms/asset_permission_create_update.html:33
-#: perms/templates/perms/asset_permission_detail.html:56
-#: perms/templates/perms/asset_permission_list.html:12
-#: perms/templates/perms/asset_permission_user.html:66 users/models.py:23
-#: users/models.py:75 users/templates/users/_select_user_modal.html:13
-#: users/templates/users/user_asset_permission.html:66
-#: users/templates/users/user_detail.html:58
-#: users/templates/users/user_granted_asset.html:129
-#: users/templates/users/user_group_detail.html:90
-#: users/templates/users/user_group_list.html:25
-#: users/templates/users/user_list.html:26
-msgid "Name"
-msgstr "名称"
-
-#: assets/forms.py:148 assets/forms.py:213
+#: assets/forms.py:145
 msgid "If also set private key, use that first"
 msgstr "如果设置私钥，则优先使用私钥"
 
-#: assets/forms.py:187 assets/forms.py:259 assets/models.py:95
-#: assets/models.py:160 assets/templates/assets/admin_user_detail.html:50
-#: assets/templates/assets/admin_user_list.html:11
-#: assets/templates/assets/system_user_detail.html:55
-#: assets/templates/assets/system_user_list.html:11
-#: ops/templates/cron/list.html:27 ops/templates/sudo/list.html:27
-#: perms/templates/perms/asset_permission_user.html:67 users/forms.py:13
-#: users/models.py:74 users/templates/users/_select_user_modal.html:14
+#: assets/forms.py:184
+#, fuzzy
+#| msgid "SSH private key"
+msgid "Invalid private key"
+msgstr "ssh密钥"
+
+#: assets/forms.py:194
+msgid "Password and private key file must be input one"
+msgstr "密码和私钥, 必须输入一个"
+
+#: assets/forms.py:202 assets/forms.py:270 assets/models/user.py:35
+#: assets/models/user.py:137 assets/templates/assets/admin_user_detail.html:56
+#: assets/templates/assets/admin_user_list.html:16
+#: assets/templates/assets/system_user_detail.html:56
+#: assets/templates/assets/system_user_list.html:18 audits/models.py:17
+#: audits/templates/audits/login_log_list.html:48
+#: perms/templates/perms/asset_permission_user.html:65 users/forms.py:14
+#: users/models/user.py:31 users/templates/users/_select_user_modal.html:14
 #: users/templates/users/login.html:53
-#: users/templates/users/user_detail.html:62
-#: users/templates/users/user_list.html:27
-#: users/templates/users/user_update.html:6
+#: users/templates/users/user_detail.html:69
+#: users/templates/users/user_list.html:26
 msgid "Username"
 msgstr "用户名"
 
-#: assets/forms.py:204 templates/_nav.html:22
-msgid "Asset group"
-msgstr "资产组"
+#: assets/forms.py:247
+msgid "Private key required"
+msgstr "密钥不能为空"
 
-#: assets/models.py:16
-msgid "Bandwidth"
-msgstr "带宽"
+#: assets/forms.py:252
+msgid "Private key invalid"
+msgstr "密钥不合法"
 
-#: assets/models.py:17 assets/templates/assets/idc_list.html:14
-msgid "Contact"
-msgstr "联系人"
+#: assets/forms.py:258
+msgid "Password required"
+msgstr "密码不能为空"
 
-#: assets/models.py:18 assets/templates/assets/idc_list.html:15
-#: users/models.py:81 users/templates/users/user_detail.html:71
-msgid "Phone"
-msgstr "手机"
+#: assets/models/asset.py:23
+#, fuzzy
+#| msgid "Admin user"
+msgid "In use"
+msgstr "管理用户"
 
-#: assets/models.py:19
-msgid "Address"
-msgstr "地址"
+#: assets/models/asset.py:24
+#, fuzzy
+#| msgid "Auto push"
+msgid "Out of use"
+msgstr "自动推送"
 
-#: assets/models.py:20
-msgid "Intranet"
-msgstr ""
+#: assets/models/asset.py:27
+#: assets/templates/assets/_asset_bulk_update_modal.html:24
+msgid "Server"
+msgstr "物理机"
 
-#: assets/models.py:21
-msgid "Extranet"
-msgstr ""
+#: assets/models/asset.py:28
+#: assets/templates/assets/_asset_bulk_update_modal.html:25
+msgid "VM"
+msgstr "虚拟机"
 
-#: assets/models.py:22 assets/models.py:246 assets/models.py:324
-msgid "Date added"
-msgstr "加入日期"
+#: assets/models/asset.py:29
+#: assets/templates/assets/_asset_bulk_update_modal.html:26
+msgid "Switch"
+msgstr "交换机"
 
-#: assets/models.py:23
-msgid "Operator"
-msgstr "运营商"
+#: assets/models/asset.py:30
+#: assets/templates/assets/_asset_bulk_update_modal.html:28
+msgid "Router"
+msgstr "路由器"
 
-#: assets/models.py:24 assets/models.py:64 assets/models.py:102
-#: assets/models.py:173 assets/models.py:245 assets/models.py:322
-#: assets/models.py:370 assets/templates/assets/admin_user_detail.html:58
-#: assets/templates/assets/asset_detail.html:114
-#: assets/templates/assets/asset_group_detail.html:54
-#: assets/templates/assets/asset_tag_detail.html:49
-#: assets/templates/assets/system_user_detail.html:101 perms/models.py:29
-#: perms/templates/perms/asset_permission_detail.html:88 users/models.py:90
-#: users/templates/users/user_detail.html:90
-msgid "Created by"
-msgstr "创建者"
+#: assets/models/asset.py:31
+#: assets/templates/assets/_asset_bulk_update_modal.html:29
+msgid "Firewall"
+msgstr "防火墙"
 
-#: assets/models.py:25 assets/models.py:66 assets/models.py:100
-#: assets/models.py:174 assets/models.py:247 assets/models.py:325
-#: assets/templates/assets/admin_user_detail.html:62
-#: assets/templates/assets/admin_user_list.html:14
-#: assets/templates/assets/asset_detail.html:122
-#: assets/templates/assets/asset_group_detail.html:58
-#: assets/templates/assets/asset_group_list.html:14
-#: assets/templates/assets/system_user_asset_group.html:56
-#: assets/templates/assets/system_user_detail.html:105
-#: assets/templates/assets/system_user_list.html:15 perms/models.py:31
-#: perms/templates/perms/asset_permission_detail.html:92 users/models.py:24
-#: users/models.py:86 users/templates/users/user_detail.html:102
-#: users/templates/users/user_group_detail.html:94
-#: users/templates/users/user_group_list.html:28
-msgid "Comment"
-msgstr "备注"
+#: assets/models/asset.py:32
+#: assets/templates/assets/_asset_bulk_update_modal.html:27
+msgid "Storage"
+msgstr "存储"
+
+#: assets/models/asset.py:42 assets/templates/assets/admin_user_detail.html:97
+#: assets/templates/assets/asset_detail.html:49
+#: assets/templates/assets/asset_group_detail.html:45
+#: assets/templates/assets/asset_list.html:54
+#: assets/templates/assets/asset_tag_detail.html:81
+#: assets/templates/assets/idc_assets.html:54
+#: assets/templates/assets/system_user_asset.html:47
+#: perms/templates/perms/asset_permission_asset.html:64
+#: users/templates/users/user_granted_asset.html:52
+#: users/templates/users/user_group_granted_asset.html:52
+msgid "Hostname"
+msgstr "主机名"
 
-#: assets/models.py:32 assets/models.py:257
-#, fuzzy
-#| msgid "As default"
-msgid "Default"
-msgstr "默认使用"
+#: assets/models/asset.py:43 assets/templates/assets/admin_user_detail.html:99
+#: assets/templates/assets/asset_detail.html:73
+#: assets/templates/assets/asset_group_detail.html:47
+#: assets/templates/assets/asset_list.html:56
+#: assets/templates/assets/asset_tag_detail.html:83
+#: assets/templates/assets/idc_assets.html:56
+#: assets/templates/assets/system_user_asset.html:49
+#: perms/templates/perms/asset_permission_asset.html:66
+#: users/templates/users/user_granted_asset.html:54
+#: users/templates/users/user_group_granted_asset.html:54
+msgid "Port"
+msgstr "端口"
 
-#: assets/models.py:32 users/models.py:224
-msgid "System"
-msgstr "系统"
+#: assets/models/asset.py:44 assets/templates/assets/asset_detail.html:191
+msgid "Asset groups"
+msgstr "用户组"
 
-#: assets/models.py:32
-#, fuzzy
-#| msgid "As default"
-msgid "Default IDC"
-msgstr "默认使用"
+#: assets/models/asset.py:46 assets/templates/assets/asset_detail.html:57
+#: templates/_nav.html:24
+msgid "Admin user"
+msgstr "管理用户"
 
-#: assets/models.py:62
-msgid "KEY"
-msgstr "KEY"
+#: assets/models/asset.py:47
+msgid "System User"
+msgstr "系统用户"
 
-#: assets/models.py:63
-msgid "VALUE"
-msgstr "VALUE"
+#: assets/models/asset.py:49 templates/_nav.html:23
+msgid "IDC"
+msgstr "机房"
 
-#: assets/models.py:74 assets/models.py:75
-msgid "status"
-msgstr "状态"
+#: assets/models/asset.py:50 assets/templates/assets/asset_detail.html:101
+msgid "Is active"
+msgstr "是否激活"
 
-#: assets/models.py:74
-#, fuzzy
-#| msgid "Admin user"
-msgid "In use"
-msgstr "管理用户"
+#: assets/models/asset.py:52 assets/templates/assets/asset_detail.html:105
+msgid "Asset type"
+msgstr "系统类型"
+
+#: assets/models/asset.py:54 assets/templates/assets/asset_detail.html:109
+msgid "Asset environment"
+msgstr "资产环境"
+
+#: assets/models/asset.py:56 assets/templates/assets/asset_detail.html:97
+msgid "Asset status"
+msgstr "资产状态"
+
+#: assets/models/asset.py:59
+msgid "Public IP"
+msgstr "公网IP"
+
+#: assets/models/asset.py:60
+msgid "Remote control card IP"
+msgstr "远控卡IP"
 
-#: assets/models.py:75
+#: assets/models/asset.py:61
+msgid "Cabinet number"
+msgstr "机柜编号"
+
+#: assets/models/asset.py:62
+msgid "Cabinet position"
+msgstr "机柜层号"
+
+#: assets/models/asset.py:63 assets/templates/assets/asset_detail.html:117
+msgid "Asset number"
+msgstr "资产编号"
+
+#: assets/models/asset.py:66
+msgid "Vendor"
+msgstr "制造商"
+
+#: assets/models/asset.py:67
+msgid "Model"
+msgstr "型号"
+
+#: assets/models/asset.py:68 assets/templates/assets/asset_detail.html:113
+msgid "Serial number"
+msgstr "序列号"
+
+#: assets/models/asset.py:70
+msgid "CPU model"
+msgstr "CPU型号"
+
+#: assets/models/asset.py:71
 #, fuzzy
-#| msgid "Auto push"
-msgid "Out of use"
-msgstr "自动推送"
+#| msgid "User group"
+msgid "CPU count"
+msgstr "CPU数量"
 
-#: assets/models.py:76 assets/models.py:77 assets/models.py:78
-#: assets/models.py:79 assets/models.py:80 assets/models.py:81
-msgid "type"
-msgstr ""
+#: assets/models/asset.py:72
+msgid "CPU cores"
+msgstr "CPU核数"
 
-#: assets/models.py:76
-msgid "Server"
-msgstr ""
+#: assets/models/asset.py:73 assets/templates/assets/asset_detail.html:85
+msgid "Memory"
+msgstr "内存"
 
-#: assets/models.py:77
-msgid "VM"
-msgstr ""
+#: assets/models/asset.py:74
+msgid "Disk total"
+msgstr "硬盘大小"
 
-#: assets/models.py:78
-msgid "Switch"
-msgstr ""
+#: assets/models/asset.py:75
+msgid "Disk info"
+msgstr "硬盘信息"
+
+#: assets/models/asset.py:78 assets/templates/assets/asset_detail.html:93
+msgid "OS"
+msgstr "操作系统"
 
-#: assets/models.py:79
+#: assets/models/asset.py:79
+msgid "OS Version"
+msgstr "系统版本"
+
+#: assets/models/asset.py:80
+msgid "OS Arch"
+msgstr "系统架构"
+
+#: assets/models/asset.py:81
 #, fuzzy
-#| msgid "Role"
-msgid "Router"
-msgstr "角色"
+msgid "Hostname raw"
+msgstr "主机名原始"
 
-#: assets/models.py:80
-msgid "Firewall"
-msgstr ""
+#: assets/models/asset.py:83 assets/models/group.py:20 assets/models/idc.py:34
+#: assets/models/user.py:49 assets/models/user.py:155
+#: assets/templates/assets/admin_user_detail.html:64
+#: assets/templates/assets/asset_detail.html:121
+#: assets/templates/assets/asset_tag_detail.html:47
+#: assets/templates/assets/idc_detail.html:93
+#: assets/templates/assets/system_user_detail.html:102 perms/models.py:37
+#: perms/templates/perms/asset_permission_detail.html:94
+#: users/models/user.py:47 users/templates/users/user_detail.html:97
+msgid "Created by"
+msgstr "创建者"
 
-#: assets/models.py:81
-msgid "Storage"
-msgstr ""
+#: assets/models/asset.py:84 assets/models/group.py:21 assets/models/idc.py:30
+msgid "Date added"
+msgstr "加入日期"
 
-#: assets/models.py:82 assets/models.py:83 assets/models.py:84
-msgid "env"
-msgstr ""
+#: assets/models/group.py:32 assets/models/idc.py:42
+#, fuzzy
+msgid "Default"
+msgstr "默认"
 
-#: assets/models.py:82
-msgid "Production"
-msgstr ""
+#: assets/models/group.py:32
+#, fuzzy
+msgid "Default asset group"
+msgstr "默认资产组"
 
-#: assets/models.py:83
-msgid "Development"
-msgstr ""
+#: assets/models/idc.py:20 assets/templates/assets/idc_detail.html:61
+msgid "Bandwidth"
+msgstr "带宽"
+
+#: assets/models/idc.py:22 assets/templates/assets/idc_detail.html:65
+#: assets/templates/assets/idc_list.html:20
+msgid "Contact"
+msgstr "联系人"
+
+#: assets/models/idc.py:24 assets/templates/assets/idc_detail.html:69
+#: assets/templates/assets/idc_list.html:21 users/models/user.py:38
+#: users/templates/users/user_detail.html:78
+msgid "Phone"
+msgstr "手机"
+
+#: assets/models/idc.py:26 assets/templates/assets/idc_detail.html:73
+msgid "Address"
+msgstr "地址"
 
-#: assets/models.py:84
+#: assets/models/idc.py:27 assets/templates/assets/idc_detail.html:77
+msgid "Intranet"
+msgstr "内网"
+
+#: assets/models/idc.py:28 assets/templates/assets/idc_detail.html:81
+msgid "Extranet"
+msgstr "外网"
+
+#: assets/models/idc.py:32 assets/templates/assets/idc_detail.html:85
+#: assets/templates/assets/idc_list.html:22
+msgid "Operator"
+msgstr "运营商"
+#: assets/models/idc.py:42 users/models/user.py:242
+msgid "System"
+msgstr "系统"
+
+#: assets/models/idc.py:42
 #, fuzzy
-msgid "Testing"
-msgstr "设置"
+#| msgid "As default"
+msgid "Default IDC"
+msgstr "默认使用"
+
+#: assets/models/user.py:24
+#, python-format
+msgid "%(value)s is not an even number"
+msgstr ""
 
-#: assets/models.py:96 assets/models.py:161 users/forms.py:15
+#: assets/models/user.py:37 assets/models/user.py:139 users/forms.py:16
 #: users/templates/users/login.html:56
 #: users/templates/users/reset_password.html:52
 #: users/templates/users/user_create.html:9
 #: users/templates/users/user_create.html:11
-#: users/templates/users/user_update.html:13
-#: users/templates/users/user_update.html:15
+#: users/templates/users/user_update.html:5
+#: users/templates/users/user_update.html:7
 msgid "Password"
 msgstr "密码"
 
-#: assets/models.py:97 assets/models.py:163
+#: assets/models/user.py:38 assets/models/user.py:143
 msgid "SSH private key"
 msgstr "ssh密钥"
 
-#: assets/models.py:98 assets/models.py:164
+#: assets/models/user.py:45 assets/models/user.py:145
 msgid "SSH public key"
 msgstr "ssh公钥"
 
-#: assets/models.py:99 assets/models.py:165
-#: assets/templates/assets/admin_user_create_update.html:43
-#: assets/templates/assets/system_user_create_update.html:44
-#: assets/templates/assets/system_user_detail.html:71
-msgid "As default"
-msgstr "默认使用"
-
-#: assets/models.py:162 assets/templates/assets/system_user_detail.html:59
+#: assets/models/user.py:141 assets/templates/assets/system_user_detail.html:60
 msgid "Protocol"
 msgstr "协议"
 
-#: assets/models.py:166
-#: assets/templates/assets/system_user_create_update.html:50
-#: assets/templates/assets/system_user_detail.html:63
+#: assets/models/user.py:147
+msgid "Auth method"
+msgstr "认证方式"
+
+#: assets/models/user.py:148 assets/templates/assets/_system_user.html:65
+#: assets/templates/assets/system_user_detail.html:64
 msgid "Auto push"
 msgstr "自动推送"
 
-#: assets/models.py:167
-msgid "Auto update pass/key"
-msgstr "自动更新密码/密钥"
-
-#: assets/models.py:168 assets/templates/assets/system_user_detail.html:75
-#: templates/_nav.html:46
+#: assets/models/user.py:150 assets/templates/assets/system_user_detail.html:76
 msgid "Sudo"
 msgstr "Sudo"
 
-#: assets/models.py:169 assets/templates/assets/system_user_detail.html:80
+#: assets/models/user.py:152 assets/templates/assets/system_user_detail.html:81
 msgid "Shell"
 msgstr "Shell"
 
-#: assets/models.py:170 assets/templates/assets/system_user_detail.html:86
-#: templates/_header_bar.html:41 templates/_nav.html:4
-msgid "Home"
-msgstr "仪表盘"
-
-#: assets/models.py:171 assets/templates/assets/system_user_detail.html:92
-msgid "Uid"
-msgstr "Uid"
-
-#: assets/models.py:257
+#: assets/templates/assets/_asset_bulk_update_modal.html:5
 #, fuzzy
-#| msgid "Create asset group"
-msgid "Default asset group"
-msgstr "创建资产组"
-
-#: assets/models.py:291 assets/templates/assets/admin_user_detail.html:92
-#: assets/templates/assets/asset_detail.html:54
-#: assets/templates/assets/asset_group_detail.html:88
-#: assets/templates/assets/asset_list.html:58
-#: assets/templates/assets/asset_tag_detail.html:84
-#: assets/templates/assets/system_user_asset.html:50
-#: perms/templates/perms/asset_permission_asset.html:67
-#: users/templates/users/user_granted_asset.html:67
-msgid "IP"
-msgstr "IP"
-
-#: assets/models.py:292 assets/templates/assets/asset_detail.html:58
-msgid "Other IP"
-msgstr "其它IP"
-
-#: assets/models.py:293 assets/templates/assets/asset_detail.html:62
-msgid "Remote card IP"
-msgstr "远控卡IP"
+#| msgid "Update user"
+msgid "Update Asset"
+msgstr "编辑用户"
 
-#: assets/models.py:294 assets/templates/assets/admin_user_detail.html:91
-#: assets/templates/assets/asset_detail.html:50
-#: assets/templates/assets/asset_group_detail.html:87
-#: assets/templates/assets/asset_list.html:57
-#: assets/templates/assets/asset_tag_detail.html:83
-#: assets/templates/assets/system_user_asset.html:49
-#: perms/templates/perms/asset_permission_asset.html:66
-#: users/templates/users/user_granted_asset.html:66
-msgid "Hostname"
-msgstr "主机名"
+#: assets/templates/assets/_asset_bulk_update_modal.html:8
+#: assets/templates/assets/_asset_group_bulk_update_modal.html:8
+#: users/templates/users/_user_bulk_update_modal.html:6
+msgid "Hint: only change the field you want to update."
+msgstr ""
 
-#: assets/models.py:295 assets/templates/assets/admin_user_detail.html:93
-#: assets/templates/assets/asset_detail.html:66
-#: assets/templates/assets/asset_group_detail.html:89
-#: assets/templates/assets/asset_list.html:59
-#: assets/templates/assets/asset_tag_detail.html:85
-#: assets/templates/assets/system_user_asset.html:51
-#: perms/templates/perms/asset_permission_asset.html:68
-#: users/templates/users/user_granted_asset.html:68
-msgid "Port"
-msgstr "端口"
+#: assets/templates/assets/_asset_bulk_update_modal.html:20
+#, fuzzy
+#| msgid "System User"
+msgid "System Type"
+msgstr "系统用户"
 
-#: assets/models.py:296 assets/templates/assets/asset_detail.html:184
-msgid "Asset groups"
+#: assets/templates/assets/_asset_bulk_update_modal.html:35
+#, fuzzy
+#| msgid "Asset groups"
+msgid "Asset Groups"
 msgstr "用户组"
 
-#: assets/models.py:298 templates/_nav.html:24
-msgid "Admin user"
-msgstr "管理用户"
+#: assets/templates/assets/_asset_bulk_update_modal.html:37
+#: users/templates/users/_user_bulk_update_modal.html:21
+#, fuzzy
+#| msgid "Select asset groups"
+msgid "Select Group"
+msgstr "添加到资产组"
 
-#: assets/models.py:299
-msgid "System User"
+#: assets/templates/assets/_asset_bulk_update_modal.html:46
+#: assets/templates/assets/_asset_group_bulk_update_modal.html:22
+#, fuzzy
+#| msgid "System User"
+msgid "System Users"
 msgstr "系统用户"
 
-#: assets/models.py:301 templates/_nav.html:23
-msgid "IDC"
-msgstr "机房"
-
-#: assets/models.py:303 assets/templates/assets/asset_detail.html:70
-msgid "Mac address"
-msgstr "Mac地址"
-
-#: assets/models.py:304
-msgid "Brand"
-msgstr "品牌"
-
-#: assets/models.py:305 assets/templates/assets/asset_detail.html:74
-msgid "CPU"
-msgstr "CPU"
-
-#: assets/models.py:306 assets/templates/assets/asset_detail.html:78
-msgid "Memory"
-msgstr "内存"
-
-#: assets/models.py:307 assets/templates/assets/asset_detail.html:82
-msgid "Disk"
-msgstr "硬盘"
-
-#: assets/models.py:308 assets/templates/assets/asset_detail.html:86
-msgid "OS"
-msgstr "操作系统"
+#: assets/templates/assets/_asset_bulk_update_modal.html:48
+#: assets/templates/assets/_asset_group_bulk_update_modal.html:24
+#, fuzzy
+#| msgid "System user"
+msgid "Select System Users"
+msgstr "选择系统用户"
 
-#: assets/models.py:309
-msgid "Cabinet number"
-msgstr "机柜编号"
+#: assets/templates/assets/_asset_bulk_update_modal.html:59
+#: assets/templates/assets/_asset_group_bulk_update_modal.html:35
+#: users/templates/users/_user_bulk_update_modal.html:31
+#, fuzzy
+#| msgid "Enable OTP"
+msgid "Enable-OTP"
+msgstr "二次验证"
 
-#: assets/models.py:310
-msgid "Cabinet position"
-msgstr "机柜层号"
+#: assets/templates/assets/_asset_group_bulk_update_modal.html:5
+msgid "Update Asset Group"
+msgstr "编辑资产组"
 
-#: assets/models.py:311 assets/templates/assets/asset_detail.html:110
-msgid "Asset number"
-msgstr "资产编号"
+#: assets/templates/assets/_asset_group_bulk_update_modal.html:12
+#: assets/views.py:191 assets/views.py:214 assets/views.py:234
+#: assets/views.py:259 assets/views.py:280 assets/views.py:345
+#: assets/views.py:368 assets/views.py:465 assets/views.py:484
+#: assets/views.py:511 assets/views.py:529 templates/_nav.html:18
+msgid "Assets"
+msgstr "资产管理"
 
-#: assets/models.py:313 assets/templates/assets/asset_detail.html:90
-msgid "Asset status"
-msgstr "资产状态"
+#: assets/templates/assets/_asset_group_bulk_update_modal.html:14
+#, fuzzy
+msgid "Select Asset"
+msgstr "选择资产"
 
-#: assets/models.py:316 assets/templates/assets/asset_detail.html:98
-msgid "Asset type"
-msgstr "系统类型"
+#: assets/templates/assets/_asset_import_modal.html:4
+#, fuzzy
+msgid "Import asset"
+msgstr "导入资产"
 
-#: assets/models.py:319 assets/templates/assets/asset_detail.html:102
-msgid "Asset environment"
-msgstr "资产环境"
+#: assets/templates/assets/_asset_import_modal.html:6
+#: users/templates/users/_user_import_modal.html:6
+msgid "Download template or use export excel format"
+msgstr "下载模板"
 
-#: assets/models.py:321 assets/templates/assets/asset_detail.html:106
-msgid "Serial number"
-msgstr "序列号"
+#: assets/templates/assets/_asset_import_modal.html:10
+#: users/templates/users/_user_import_modal.html:10
+msgid "Template"
+msgstr "模板"
 
-#: assets/models.py:323 assets/templates/assets/asset_detail.html:94
-msgid "Is active"
-msgstr "是否激活"
+#: assets/templates/assets/_asset_import_modal.html:11
+#: users/templates/users/_user_import_modal.html:11
+msgid "Download"
+msgstr "下载"
 
-#: assets/templates/assets/admin_user_create_update.html:16
-#: assets/templates/assets/admin_user_list.html:5
+#: assets/templates/assets/_asset_import_modal.html:14
 #, fuzzy
-#| msgid "Create user"
-msgid "Create admin user"
-msgstr "创建用户"
+#| msgid "Asset group list"
+msgid "Asset excel file"
+msgstr "资产组列表"
 
-#: assets/templates/assets/admin_user_create_update.html:35
-#: assets/templates/assets/system_user_create_update.html:36
+#: assets/templates/assets/_system_user.html:16
+#: assets/templates/assets/system_user_list.html:9 assets/views.py:485
 #, fuzzy
-#| msgid "Auto update pass/key"
-msgid "Auto generate key"
-msgstr "自动更新密码/密钥"
-
-#: assets/templates/assets/admin_user_create_update.html:53
-#: assets/templates/assets/admin_user_detail.html:144
-#: assets/templates/assets/asset_create.html:33
-#: assets/templates/assets/asset_update.html:61
-#: assets/templates/assets/system_user_create_update.html:71
-#: assets/templates/assets/system_user_detail.html:144
-#: perms/templates/perms/asset_permission_create_update.html:67
-#: users/templates/users/_user.html:70
-#: users/templates/users/user_detail.html:151
-#: users/templates/users/user_detail.html:159
-msgid "Reset"
-msgstr "重置"
-
-#: assets/templates/assets/admin_user_create_update.html:54
-#: assets/templates/assets/asset_create.html:34
-#: assets/templates/assets/asset_group_list.html:51
-#: assets/templates/assets/asset_list.html:105
-#: assets/templates/assets/asset_tags_list.html:50
-#: assets/templates/assets/asset_update.html:62
-#: assets/templates/assets/system_user_create_update.html:72
-#: ops/templates/cron/list.html:47 ops/templates/sudo/list.html:47
-#: perms/templates/perms/asset_permission_create_update.html:68
-#: perms/templates/perms/asset_permission_list.html:65
-#: users/templates/users/_user.html:71
-#: users/templates/users/forgot_password.html:44
-#: users/templates/users/user_asset_permission.html:144
-#: users/templates/users/user_group_list.html:40
-#: users/templates/users/user_list.html:47
-msgid "Submit"
-msgstr "提交"
+msgid "Create system user"
+msgstr "创建系统用户"
 
-#: assets/templates/assets/admin_user_detail.html:19
-#: assets/templates/assets/asset_group_detail.html:18
-#: assets/templates/assets/asset_tag_detail.html:18
-#: assets/templates/assets/system_user_asset.html:19
-#: assets/templates/assets/system_user_asset_group.html:19
-#: assets/templates/assets/system_user_detail.html:19
-#: perms/templates/perms/asset_permission_asset.html:20
-#: perms/templates/perms/asset_permission_detail.html:20
-#: perms/templates/perms/asset_permission_user.html:20
-msgid "Detail"
-msgstr ""
+#: assets/templates/assets/_system_user.html:42
+#: assets/templates/assets/asset_create.html:14
+#: assets/templates/assets/asset_update.html:19
+msgid "Basic"
+msgstr "基本"
 
-#: assets/templates/assets/admin_user_detail.html:54
-#: assets/templates/assets/asset_group_detail.html:50
-#: assets/templates/assets/asset_tag_detail.html:53
-#: assets/templates/assets/system_user_detail.html:97 perms/models.py:30
-#: perms/templates/perms/asset_permission_detail.html:84
-#, fuzzy
-#| msgid "Date added"
-msgid "Date created"
-msgstr "加入日期"
+#: assets/templates/assets/_system_user.html:46
+msgid "Auth"
+msgstr "认证"
 
-#: assets/templates/assets/admin_user_detail.html:72
-#: assets/templates/assets/asset_group_detail.html:68
-#: assets/templates/assets/asset_tag_detail.html:64
-#: assets/templates/assets/system_user_asset_group.html:34
-#: perms/templates/perms/asset_permission_asset.html:47
+#: assets/templates/assets/_system_user.html:54
 #, fuzzy
-#| msgid "Asset group list"
-msgid "Asset list of "
-msgstr "资产组列表"
+msgid "Auto generate key"
+msgstr "自动生成秘钥"
 
-#: assets/templates/assets/admin_user_detail.html:94
-#: assets/templates/assets/asset_group_detail.html:90
-#: assets/templates/assets/asset_tag_detail.html:86
-#, fuzzy
-msgid "Alive"
-msgstr "激活"
+#: assets/templates/assets/admin_user_create_update.html:16
+#: assets/templates/assets/admin_user_list.html:7
+msgid "Create admin user"
+msgstr "创建管理用户"
+
+#: assets/templates/assets/admin_user_detail.html:17
+#: assets/templates/assets/asset_group_detail.html:16
+#: assets/templates/assets/asset_tag_detail.html:16
+#: assets/templates/assets/idc_assets.html:20
+#: assets/templates/assets/idc_detail.html:17
+#: assets/templates/assets/system_user_asset.html:17
+#: assets/templates/assets/system_user_asset_group.html:17
+#: assets/templates/assets/system_user_detail.html:17
+#: perms/templates/perms/asset_permission_asset.html:18
+#: perms/templates/perms/asset_permission_detail.html:18
+#: perms/templates/perms/asset_permission_user.html:18
+msgid "Detail"
+msgstr "详情"
+
+#: assets/templates/assets/admin_user_detail.html:78
+#: assets/templates/assets/asset_group_detail.html:26
+#: assets/templates/assets/asset_tag_detail.html:62
+#: assets/templates/assets/system_user_asset_group.html:32
+#: perms/templates/perms/asset_permission_asset.html:45
+msgid "Asset list of "
+msgstr "资产列表"
 
-#: assets/templates/assets/admin_user_detail.html:117
-#: assets/templates/assets/system_user_detail.html:117
-#: perms/templates/perms/asset_permission_detail.html:104
+#: assets/templates/assets/admin_user_detail.html:124
+#: assets/templates/assets/system_user_detail.html:118
+#: perms/templates/perms/asset_permission_detail.html:110
 msgid "Quick update"
-msgstr ""
+msgstr "快速更新"
 
-#: assets/templates/assets/admin_user_detail.html:123
+#: assets/templates/assets/admin_user_detail.html:130
 msgid "Get install script"
-msgstr ""
+msgstr "获得安装脚本"
 
-#: assets/templates/assets/admin_user_detail.html:126
-#: assets/templates/assets/system_user_detail.html:126
+#: assets/templates/assets/admin_user_detail.html:133
+#: assets/templates/assets/system_user_detail.html:127
 msgid "Get"
 msgstr ""
 
-#: assets/templates/assets/admin_user_detail.html:132
-#: assets/templates/assets/system_user_detail.html:132
-#: perms/templates/perms/asset_permission_detail.html:124
+#: assets/templates/assets/admin_user_detail.html:139
+#: assets/templates/assets/system_user_detail.html:133
+#: perms/templates/perms/asset_permission_detail.html:130
 msgid "Retest asset connectivity"
-msgstr ""
+msgstr "重置资产连接性"
 
-#: assets/templates/assets/admin_user_detail.html:135
-#: assets/templates/assets/system_user_detail.html:135
-#: perms/templates/perms/asset_permission_detail.html:127
+#: assets/templates/assets/admin_user_detail.html:142
+#: assets/templates/assets/system_user_detail.html:136
+#: perms/templates/perms/asset_permission_detail.html:133
 msgid "Start"
-msgstr ""
+msgstr "开始"
 
-#: assets/templates/assets/admin_user_detail.html:141
-#: assets/templates/assets/system_user_detail.html:141
-#, fuzzy
-#| msgid "ssh private key"
+#: assets/templates/assets/admin_user_detail.html:148
+#: assets/templates/assets/system_user_detail.html:142
 msgid "Reset private key"
-msgstr "ssh密钥"
+msgstr "重置密钥"
 
-#: assets/templates/assets/admin_user_detail.html:155
+#: assets/templates/assets/admin_user_detail.html:162
 msgid "Replace asset admin user with this"
-msgstr ""
+msgstr "替换资产管理用户"
 
-#: assets/templates/assets/admin_user_detail.html:163
-#: assets/templates/assets/system_user_asset.html:89
-#, fuzzy
-#| msgid "Select assets"
+#: assets/templates/assets/admin_user_detail.html:170
+#: assets/templates/assets/asset_tag_detail.html:106
+#: assets/templates/assets/idc_assets.html:92
+#: assets/templates/assets/system_user_asset.html:87
 msgid "Select asset"
 msgstr "选择资产"
 
-#: assets/templates/assets/admin_user_detail.html:172
-#: assets/templates/assets/admin_user_detail.html:200
+#: assets/templates/assets/admin_user_detail.html:179
+#: assets/templates/assets/admin_user_detail.html:207
 msgid "Replace"
-msgstr ""
+msgstr "替换"
 
-#: assets/templates/assets/admin_user_detail.html:183
+#: assets/templates/assets/admin_user_detail.html:190
 msgid "Replace asset admin user with this admin user"
-msgstr ""
+msgstr "替换资产管理用户"
 
-#: assets/templates/assets/admin_user_list.html:9
-#: assets/templates/assets/system_user_list.html:9
-#, fuzzy
-#| msgid "IDC"
-msgid "ID"
-msgstr "机房"
+#: assets/templates/assets/admin_user_detail.html:306
+#: assets/templates/assets/asset_group_detail.html:301
+msgid "Remove"
+msgstr "移除"
 
-#: assets/templates/assets/admin_user_list.html:12
-#: assets/templates/assets/asset_group_list.html:13
-#: assets/templates/assets/asset_tags_list.html:13
-#: assets/templates/assets/idc_list.html:13
-#: assets/templates/assets/system_user_asset_group.html:54
-#: assets/templates/assets/system_user_list.html:12
-#: ops/templates/cron/list.html:30 ops/templates/sudo/list.html:30
+#: assets/templates/assets/admin_user_list.html:17
+#: assets/templates/assets/asset_tags_list.html:64
+#: assets/templates/assets/idc_list.html:19
+#: assets/templates/assets/system_user_asset_group.html:52
 #: users/templates/users/_select_user_modal.html:17
-#: users/templates/users/user_list.html:30
 msgid "Asset num"
 msgstr "资产数量"
 
-#: assets/templates/assets/admin_user_list.html:13
+#: assets/templates/assets/admin_user_list.html:18
 msgid "Lost connection"
-msgstr ""
+msgstr "丢失连接"
 
-#: assets/templates/assets/admin_user_list.html:33
-#: assets/templates/assets/system_user_list.html:35
-msgid "Script"
-msgstr ""
+#: assets/templates/assets/admin_user_list.html:29
+#: assets/templates/assets/asset_group_list.html:27
+#: assets/templates/assets/asset_list.html:71
+#: assets/templates/assets/asset_tags_list.html:74
+#: assets/templates/assets/idc_assets.html:68
+#: assets/templates/assets/idc_list.html:32
+#: assets/templates/assets/system_user_list.html:31
+#: users/templates/users/user_group_list.html:22
+#: users/templates/users/user_list.html:39
+msgid "Delete selected"
+msgstr "批量删除"
 
-#: assets/templates/assets/admin_user_list.html:35
-#: assets/templates/assets/asset_detail.html:156
-#: assets/templates/assets/system_user_list.html:37
-msgid "Refresh"
-msgstr ""
+#: assets/templates/assets/admin_user_list.html:96
+#: assets/templates/assets/asset_group_list.html:95
+#: assets/templates/assets/asset_list.html:223
+#: assets/templates/assets/idc_assets.html:259
+#: assets/templates/assets/idc_list.html:93
+#: assets/templates/assets/system_user_list.html:97
+#: users/templates/users/user_detail.html:332
+#: users/templates/users/user_detail.html:357
+#: users/templates/users/user_group_list.html:86
+#: users/templates/users/user_list.html:166
+msgid "Are you sure?"
+msgstr "确认吗?"
+
+#: assets/templates/assets/admin_user_list.html:97
+msgid "This will delete the selected Admin Users !!!"
+msgstr "这将删除选择的管理用户"
+
+#: assets/templates/assets/admin_user_list.html:101
+#: assets/templates/assets/asset_group_list.html:100
+#: assets/templates/assets/asset_list.html:228
+#: assets/templates/assets/idc_assets.html:264
+#: assets/templates/assets/idc_list.html:98
+#: assets/templates/assets/system_user_list.html:102 templates/_modal.html:16
+#: users/templates/users/user_detail.html:337
+#: users/templates/users/user_detail.html:362
+#: users/templates/users/user_detail.html:385
+#: users/templates/users/user_group_list.html:91
+#: users/templates/users/user_list.html:171
+#: users/templates/users/user_profile.html:138
+#, fuzzy
+#| msgid "Confirm delete"
+msgid "Confirm"
+msgstr "确认删除"
 
-#: assets/templates/assets/admin_user_list.html:36
-#: assets/templates/assets/asset_group_list.html:32
-#: assets/templates/assets/asset_list.html:83
-#: assets/templates/assets/asset_tags_list.html:31
-#: assets/templates/assets/idc_list.html:32
-#: assets/templates/assets/system_user_list.html:38
-#: ops/templates/cron/list.html:79 ops/templates/sudo/list.html:79
-#: perms/templates/perms/asset_permission_list.html:46
-#: users/templates/users/user_detail.html:167
-#: users/templates/users/user_group_list.html:64
-#: users/templates/users/user_list.html:79
-msgid "Update"
-msgstr "更新"
+# msgid "Deleted!"
+# msgstr "删除"
+#: assets/templates/assets/admin_user_list.html:105
+msgid "Admin Users Deleted."
+msgstr "已被删除"
 
-#: assets/templates/assets/admin_user_list.html:37
-#: assets/templates/assets/asset_group_list.html:33
-#: assets/templates/assets/asset_list.html:84
-#: assets/templates/assets/asset_tags_list.html:32
-#: assets/templates/assets/idc_list.html:33
-#: assets/templates/assets/system_user_list.html:39
-#: ops/templates/cron/list.html:80 ops/templates/sudo/list.html:80
-#: perms/templates/perms/asset_permission_list.html:47
-#: users/templates/users/user_group_detail.html:129
-#: users/templates/users/user_group_detail.html:132
-#: users/templates/users/user_group_list.html:65
-#: users/templates/users/user_list.html:80
-msgid "Delete"
+#: assets/templates/assets/admin_user_list.html:106
+#: assets/templates/assets/admin_user_list.html:111
+msgid "Admin Users Delete"
 msgstr "删除"
 
-#: assets/templates/assets/asset_create.html:9
-#: assets/templates/assets/asset_update.html:14
-msgid "Basic"
-msgstr ""
+#: assets/templates/assets/admin_user_list.html:110
+#, fuzzy
+msgid "Admin Users Deleting failed."
+msgstr "用户删除失败"
 
-#: assets/templates/assets/asset_create.html:16
-#: assets/templates/assets/asset_update.html:21
+#: assets/templates/assets/asset_create.html:22
+#: assets/templates/assets/asset_update.html:27
 msgid "Group"
-msgstr ""
+msgstr "组"
 
-#: assets/templates/assets/asset_create.html:21
-#: assets/templates/assets/asset_update.html:26
-#, fuzzy
-#| msgid "Asset number"
+#: assets/templates/assets/asset_create.html:27
+#: assets/templates/assets/asset_update.html:32
 msgid "Asset user"
-msgstr "资产编号"
+msgstr "资产用户"
 
-#: assets/templates/assets/asset_create.html:26
-#: assets/templates/assets/asset_update.html:52
-#: perms/templates/perms/asset_permission_create_update.html:45
+#: assets/templates/assets/asset_detail.html:19 assets/views.py:346
 #, fuzzy
-#| msgid "Other IP"
-msgid "Other"
+msgid "Asset detail"
+msgstr "资产详情"
+
+#: assets/templates/assets/asset_detail.html:65
+msgid "Other IP"
 msgstr "其它IP"
 
-#: assets/templates/assets/asset_detail.html:20
-#, fuzzy
-#| msgid "Asset group list"
-msgid "Asset detail"
-msgstr "资产组列表"
+#: assets/templates/assets/asset_detail.html:69
+msgid "Remote card IP"
+msgstr "远控卡IP"
 
-#: assets/templates/assets/asset_detail.html:23
-#, fuzzy
-#| msgid "Asset group list"
-msgid "Asset login log"
-msgstr "资产组列表"
+#: assets/templates/assets/asset_detail.html:77
+msgid "Mac address"
+msgstr "Mac地址"
 
-#: assets/templates/assets/asset_detail.html:118
-#: users/templates/users/user_detail.html:94
+#: assets/templates/assets/asset_detail.html:81
+msgid "CPU"
+msgstr "CPU"
+
+#: assets/templates/assets/asset_detail.html:89
+msgid "Disk"
+msgstr "硬盘"
+
+#: assets/templates/assets/asset_detail.html:125
+#: users/templates/users/user_detail.html:101
 msgid "Date joined"
 msgstr "创建日期"
 
-#: assets/templates/assets/asset_detail.html:133
-#: users/templates/users/user_detail.html:113
-#: users/templates/users/user_group_detail.html:115
+#: assets/templates/assets/asset_detail.html:140
+#: users/templates/users/user_detail.html:120
 msgid "Quick modify"
 msgstr "快速修改"
 
-#: assets/templates/assets/asset_detail.html:139
-#: ops/templates/cron/list.html:31 ops/templates/sudo/list.html:31
-#: perms/models.py:27
-#: perms/templates/perms/asset_permission_create_update.html:47
-#: users/templates/users/_select_user_modal.html:18
-#: users/templates/users/user_detail.html:119
-#: users/templates/users/user_list.html:31
-#, fuzzy
-msgid "Active"
-msgstr "激活"
-
-#: assets/templates/assets/asset_detail.html:153
+#: assets/templates/assets/asset_detail.html:160
 msgid "Rrefresh hardware"
-msgstr ""
+msgstr "更新硬件信息"
 
-#: assets/templates/assets/asset_detail.html:161
-#, fuzzy
-#| msgid "Create user"
+#: assets/templates/assets/asset_detail.html:163
+msgid "Refresh"
+msgstr "刷新"
+
+#: assets/templates/assets/asset_detail.html:168
 msgid "Test admin user"
-msgstr "创建用户"
+msgstr "测试管理用户"
 
-#: assets/templates/assets/asset_detail.html:164
-#: assets/templates/assets/asset_detail.html:172
-#, fuzzy
+#: assets/templates/assets/asset_detail.html:171
+#: assets/templates/assets/asset_detail.html:179
 msgid "Test"
-msgstr "设置"
+msgstr "测试"
 
-#: assets/templates/assets/asset_detail.html:169
-#, fuzzy
-#| msgid "System user"
-msgid "Test system users"
-msgstr "系统"
+#: assets/templates/assets/asset_detail.html:176
+msgid "Test system ping"
+msgstr "测试系统用户"
 
-#: assets/templates/assets/asset_detail.html:192
-#, fuzzy
-#| msgid "Join user groups"
+#: assets/templates/assets/asset_detail.html:199
 msgid "Join asset groups"
-msgstr "添加到用户组"
+msgstr "添加到资产组"
 
-#: assets/templates/assets/asset_detail.html:201
-#: perms/templates/perms/asset_permission_asset.html:148
-#: perms/templates/perms/asset_permission_detail.html:164
-#: perms/templates/perms/asset_permission_user.html:148
-#: users/templates/users/user_detail.html:195
+#: assets/templates/assets/asset_detail.html:208
+#: perms/templates/perms/asset_permission_asset.html:146
+#: perms/templates/perms/asset_permission_detail.html:170
+#: users/templates/users/user_detail.html:194
 msgid "Join"
 msgstr "加入"
 
-#: assets/templates/assets/asset_group_detail.html:20
-#, fuzzy
-#| msgid "Asset group"
-msgid "Asset group perm"
-msgstr "资产组"
+#: assets/templates/assets/asset_detail.html:309
+#: users/templates/users/user_detail.html:271
+#: users/templates/users/user_detail.html:284
+msgid "Update Successfully!"
+msgstr "更新成功"
 
-#: assets/templates/assets/asset_group_detail.html:113
-#: assets/templates/assets/asset_tag_detail.html:109
-#, fuzzy
-#| msgid "System user"
-msgid "Associate system user"
-msgstr "系统"
+#: assets/templates/assets/asset_group_detail.html:78
+msgid "Add asset to this group"
+msgstr "添加资产到该组"
 
-#: assets/templates/assets/asset_group_detail.html:119
+#: assets/templates/assets/asset_group_detail.html:95
 #: assets/templates/assets/asset_tag_detail.html:115
-#, fuzzy
-#| msgid "System user"
-msgid "repush system user"
-msgstr "系统"
+#: assets/templates/assets/system_user_asset_group.html:94
+#: perms/templates/perms/asset_permission_asset.html:118
+#: perms/templates/perms/asset_permission_user.html:118
+#: perms/templates/perms/asset_permission_user.html:146
+#: users/templates/users/user_group_detail.html:98
+msgid "Add"
+msgstr "添加"
 
-#: assets/templates/assets/asset_group_detail.html:129
-#: assets/templates/assets/asset_tag_detail.html:125
+#: assets/templates/assets/asset_group_detail.html:106
 #, fuzzy
-#| msgid "System user"
+msgid "Associate system user"
+msgstr "关联系统用户"
+
+#: assets/templates/assets/asset_group_detail.html:114
 msgid "Select system user"
-msgstr "系统"
+msgstr "选择系统用户"
 
-#: assets/templates/assets/asset_group_detail.html:138
-#: assets/templates/assets/asset_tag_detail.html:134
+#: assets/templates/assets/asset_group_detail.html:123
 msgid "Associate"
-msgstr ""
-
-#: assets/templates/assets/asset_group_detail.html:157
-#: assets/templates/assets/asset_tag_detail.html:153
-#, fuzzy
-#| msgid "Asset group"
-msgid "Add asset to this group"
-msgstr "资产组"
-
-#: assets/templates/assets/asset_group_detail.html:165
-#: assets/templates/assets/asset_tag_detail.html:161
-#, fuzzy
-#| msgid "Select assets"
-msgid "Select asset user"
-msgstr "选择资产"
-
-#: assets/templates/assets/asset_group_detail.html:174
-#: assets/templates/assets/asset_tag_detail.html:170
-#: assets/templates/assets/system_user_asset_group.html:96
-#: perms/templates/perms/asset_permission_asset.html:120
-#: perms/templates/perms/asset_permission_user.html:120
-#: users/templates/users/user_group_detail.html:124
-#, fuzzy
-#| msgid "Address"
-msgid "Add"
-msgstr "地址"
+msgstr "关联"
 
-#: assets/templates/assets/asset_group_list.html:5 assets/views.py:157
-#: assets/views.py:234
+#: assets/templates/assets/asset_group_list.html:7 assets/views.py:192
+#: assets/views.py:260
 msgid "Create asset group"
 msgstr "创建资产组"
 
-#: assets/templates/assets/asset_group_list.html:43
-#: assets/templates/assets/asset_list.html:98
-#: assets/templates/assets/asset_tags_list.html:42
-#: ops/templates/cron/list.html:41 ops/templates/sudo/list.html:41
-#: perms/templates/perms/asset_permission_list.html:57
-#: users/templates/users/user_group_list.html:36
-#: users/templates/users/user_list.html:41
-msgid "Delete selected"
-msgstr "批量删除"
-
-#: assets/templates/assets/asset_group_list.html:44
-#: assets/templates/assets/asset_list.html:99
-#: assets/templates/assets/asset_tags_list.html:43
-#: ops/templates/cron/list.html:42 ops/templates/sudo/list.html:42
-#: perms/templates/perms/asset_permission_list.html:58
-#: users/templates/users/user_list.html:42
+#: assets/templates/assets/asset_group_list.html:28
+#: assets/templates/assets/asset_list.html:72
+#: assets/templates/assets/asset_tags_list.html:75
+#: assets/templates/assets/system_user_list.html:32
+#: users/templates/users/user_list.html:40
 msgid "Update selected"
 msgstr "批量更新"
 
-#: assets/templates/assets/asset_group_list.html:45
-#: assets/templates/assets/asset_list.html:100
-#: assets/templates/assets/asset_tags_list.html:44
-#: ops/templates/cron/list.html:43 ops/templates/sudo/list.html:43
-#: perms/templates/perms/asset_permission_list.html:59
-#: users/templates/users/user_list.html:43
-msgid "Deactive selected"
-msgstr "禁用所选"
+#: assets/templates/assets/asset_group_list.html:96
+#: users/templates/users/user_group_list.html:87
+msgid "This will delete the selected groups !!!"
+msgstr "删除选择组"
+
+#: assets/templates/assets/asset_group_list.html:104
+msgid "Group Deleted."
+msgstr "组已被删除"
+
+#: assets/templates/assets/asset_group_list.html:105
+#: assets/templates/assets/asset_group_list.html:110
+msgid "Group Delete"
+msgstr "删除"
 
-#: assets/templates/assets/asset_group_list.html:46
-#: assets/templates/assets/asset_list.html:101
-#: assets/templates/assets/asset_tags_list.html:45
-#: perms/templates/perms/asset_permission_list.html:60
-msgid "Export selected"
-msgstr "批量导出"
+#: assets/templates/assets/asset_group_list.html:109
+msgid "Group Deleting failed."
+msgstr "删除失败"
+
+#: assets/templates/assets/asset_group_list.html:172
+msgid "The selected asset groups has been updated successfully."
+msgstr "更新成功"
+
+#: assets/templates/assets/asset_group_list.html:173
+msgid "AssetGroup Updated"
+msgstr "资产组更新"
 
 #: assets/templates/assets/asset_list.html:21
+#: users/templates/users/user_list.html:7
+msgid "Import"
+msgstr "导入用户"
+
+#: assets/templates/assets/asset_list.html:24
+#: users/templates/users/user_list.html:10
+msgid "Export"
+msgstr "导出"
+
+#: assets/templates/assets/asset_list.html:49
 msgid "Create asset"
 msgstr "创建资产"
 
-#: assets/templates/assets/asset_list.html:60
-msgid "Type"
-msgstr ""
+#: assets/templates/assets/asset_list.html:58
+msgid "Env"
+msgstr "环境"
 
-#: assets/templates/assets/asset_list.html:61
-#: assets/templates/assets/asset_update.html:31
+#: assets/templates/assets/asset_list.html:59
 msgid "Hardware"
-msgstr ""
+msgstr "硬件"
 
-#: assets/templates/assets/asset_list.html:62
+#: assets/templates/assets/asset_list.html:60
+#: assets/templates/assets/asset_tag_detail.html:85
+#: assets/templates/assets/idc_assets.html:58
+#: users/templates/users/user_asset_permission.html:58
+#: users/templates/users/user_granted_asset.html:56
+#: users/templates/users/user_group_asset_permission.html:58
+#: users/templates/users/user_group_granted_asset.html:56
 msgid "Valid"
-msgstr ""
+msgstr "可用"
 
-#: assets/templates/assets/asset_tag_detail.html:45
-#: assets/templates/assets/asset_tags_list.html:12
-#, fuzzy
-#| msgid "Name"
+#: assets/templates/assets/asset_list.html:73
+#: users/templates/users/user_list.html:41
+msgid "Deactive selected"
+msgstr "禁用所选"
+
+#: assets/templates/assets/asset_list.html:224
+#: assets/templates/assets/idc_assets.html:260
+msgid "This will delete the selected assets !!!"
+msgstr "删除选择资产"
+
+# msgid "Deleted!"
+# msgstr "删除"
+#: assets/templates/assets/asset_list.html:232
+#: assets/templates/assets/idc_assets.html:268
+msgid "Asset Deleted."
+msgstr "已被删除"
+
+#: assets/templates/assets/asset_list.html:233
+#: assets/templates/assets/asset_list.html:238
+#: assets/templates/assets/idc_assets.html:269
+#: assets/templates/assets/idc_assets.html:274
+msgid "Asset Delete"
+msgstr "删除"
+
+#: assets/templates/assets/asset_list.html:237
+#: assets/templates/assets/idc_assets.html:273
+msgid "Asset Deleting failed."
+msgstr "删除失败"
+
+#: assets/templates/assets/asset_list.html:315
+#: assets/templates/assets/idc_assets.html:351
+msgid "The selected assets has been updated successfully."
+msgstr "选择资产更新成功"
+
+#: assets/templates/assets/asset_list.html:316
+#: assets/templates/assets/idc_assets.html:352
+msgid "Asset Updated"
+msgstr "更新"
+
+#: assets/templates/assets/asset_tag_detail.html:43
 msgid "Tag Name"
 msgstr "名称"
 
-#: assets/templates/assets/asset_tags_list.html:5
+#: assets/templates/assets/asset_tag_detail.html:98
+msgid "Add asset to this tag"
+msgstr "添加标签"
+
+#: assets/templates/assets/asset_tags_list.html:57
 #, fuzzy
 #| msgid "Create asset"
-msgid "Create tag"
-msgstr "创建资产"
+msgid "Create Tag"
+msgstr "创建标签"
+
+#: assets/templates/assets/asset_tags_list.html:63
+msgid "TagName"
+msgstr "名称"
 
-#: assets/templates/assets/asset_update.html:40
+#: assets/templates/assets/asset_update.html:36
 #, fuzzy
 #| msgid "Confirm delete"
 msgid "Configuration"
-msgstr "确认删除"
+msgstr "配置"
 
-#: assets/templates/assets/asset_update.html:47
+#: assets/templates/assets/asset_update.html:41
 #, fuzzy
 msgid "Location"
-msgstr "激活"
+msgstr "位置"
 
 #: assets/templates/assets/delete_confirm.html:6
 #: perms/templates/perms/delete_confirm.html:6
@@ -875,478 +1199,511 @@ msgstr "激活"
 msgid "Confirm delete"
 msgstr "确认删除"
 
-#: assets/templates/assets/idc_list.html:5 assets/views.py:287
+#: assets/templates/assets/delete_confirm.html:11
+msgid "Are you sure delete"
+msgstr "确定删除"
+
+#: assets/templates/assets/idc_assets.html:23
+#: assets/templates/assets/idc_assets.html:31
+#: assets/templates/assets/idc_detail.html:21
+#, fuzzy
+#| msgid "Assets"
+msgid "IDC assets"
+msgstr "IDC资产"
+
+#: assets/templates/assets/idc_assets.html:84
+#, fuzzy
+#| msgid "User assets"
+msgid "Attach assets to IDC "
+msgstr "添加资产到IDC"
+
+#: assets/templates/assets/idc_assets.html:101
+#, fuzzy
+#| msgid "User assets"
+msgid "Attach Assets"
+msgstr "添加资产"
+
+#: assets/templates/assets/idc_list.html:10 assets/views.py:297
 #, fuzzy
 #| msgid "Created by"
 msgid "Create IDC"
 msgstr "创建者"
 
-#: assets/templates/assets/idc_list.html:16
+#: assets/templates/assets/idc_list.html:94
+msgid "This will delete the selected idc !!!"
+msgstr "删除选择IDC"
+
+# msgid "Deleted!"
+# msgstr "删除"
+#: assets/templates/assets/idc_list.html:102
 #, fuzzy
-#| msgid "Operator"
-msgid "operation"
-msgstr "运营商"
+#| msgid "has been deleted."
+msgid "IDC Deleted."
+msgstr "已被删除"
 
-#: assets/templates/assets/system_user_asset.html:22
-#: assets/templates/assets/system_user_detail.html:23
+#: assets/templates/assets/idc_list.html:103
+#: assets/templates/assets/idc_list.html:108
 #, fuzzy
-#| msgid "Create asset group"
+#| msgid "Delete"
+msgid "IDC Delete"
+msgstr "删除"
+
+#: assets/templates/assets/idc_list.html:107
+#, fuzzy
+#| msgid "User detail"
+msgid "IDC Deleting failed."
+msgstr "IDC删除失败"
+
+#: assets/templates/assets/system_user_asset.html:20
+#: assets/templates/assets/system_user_detail.html:21
 msgid "Associate assets and asset groups"
-msgstr "创建资产组"
+msgstr "关联资产和资产组"
 
-#: assets/templates/assets/system_user_asset.html:30
+#: assets/templates/assets/system_user_asset.html:28
 #, fuzzy
 #| msgid "Asset group list"
 msgid "Assets attached of "
-msgstr "资产组列表"
+msgstr "关联资产"
 
-#: assets/templates/assets/system_user_asset.html:52
+#: assets/templates/assets/system_user_asset.html:50
 msgid "Reachable"
-msgstr ""
+msgstr "可连接"
 
-#: assets/templates/assets/system_user_asset.html:81
+#: assets/templates/assets/system_user_asset.html:79
 #, fuzzy
 #| msgid "User assets"
 msgid "Attach to assets "
-msgstr "用户资产"
+msgstr "关联资产"
 
-#: assets/templates/assets/system_user_asset.html:98
-#: assets/templates/assets/system_user_asset.html:126
-msgid "Attach"
-msgstr ""
+#: assets/templates/assets/system_user_asset.html:96
+msgid "Attach Asset"
+msgstr "关联资产"
 
-#: assets/templates/assets/system_user_asset.html:109
+#: assets/templates/assets/system_user_asset.html:107
 #, fuzzy
 #| msgid "Select asset groups"
 msgid "Attach to asset groups"
-msgstr "添加到资产组"
+msgstr "关联资产组"
 
-#: assets/templates/assets/system_user_asset.html:117
-#, fuzzy
-#| msgid "Asset group"
+#: assets/templates/assets/system_user_asset.html:115
 msgid "Add asset group"
 msgstr "资产组"
 
-#: assets/templates/assets/system_user_asset_group.html:22
+#: assets/templates/assets/system_user_asset.html:124
+#, fuzzy
+#| msgid "Select asset groups"
+msgid "Attach AssetGroup"
+msgstr "添加到资产组"
+
+#: assets/templates/assets/system_user_asset_group.html:20
 #, fuzzy
 #| msgid "User assets"
 msgid "Associate assets"
 msgstr "用户资产"
 
-#: assets/templates/assets/system_user_asset_group.html:26
+#: assets/templates/assets/system_user_asset_group.html:24
 #, fuzzy
 #| msgid "Create asset group"
 msgid "Associate asset groups"
 msgstr "创建资产组"
 
-#: assets/templates/assets/system_user_asset_group.html:55
+#: assets/templates/assets/system_user_asset_group.html:53
 msgid "Unavailable num"
-msgstr ""
+msgstr "不可连接数量"
 
-#: assets/templates/assets/system_user_asset_group.html:79
+#: assets/templates/assets/system_user_asset_group.html:77
 #, fuzzy
 #| msgid "Asset group list"
 msgid "Add asset group to this system user"
 msgstr "资产组列表"
 
-#: assets/templates/assets/system_user_asset_group.html:87
+#: assets/templates/assets/system_user_asset_group.html:85
 #, fuzzy
 #| msgid "Select asset groups"
 msgid "Select asset group"
 msgstr "添加到资产组"
 
-#: assets/templates/assets/system_user_create_update.html:16
-#: assets/templates/assets/system_user_list.html:5 assets/views.py:469
-#, fuzzy
-#| msgid "Create user"
-msgid "Create system user"
-msgstr "创建用户"
-
-#: assets/templates/assets/system_user_create_update.html:56
-#: assets/templates/assets/system_user_detail.html:67
+#: assets/templates/assets/system_user_detail.html:68
 #, fuzzy
 #| msgid "Auto update pass/key"
 msgid "Auto update"
 msgstr "自动更新密码/密钥"
 
-#: assets/templates/assets/system_user_detail.html:123
+#: assets/templates/assets/system_user_detail.html:72
+msgid "As default"
+msgstr "默认使用"
+
+#: assets/templates/assets/system_user_detail.html:87
+#: templates/_header_bar.html:41 templates/_nav.html:4
+msgid "Home"
+msgstr "仪表盘"
+
+#: assets/templates/assets/system_user_detail.html:93
+msgid "Uid"
+msgstr "Uid"
+
+#: assets/templates/assets/system_user_detail.html:124
 msgid "Get mannual install script"
-msgstr ""
+msgstr "获得手动安装脚本"
+
+#: assets/templates/assets/system_user_list.html:20
+msgid "Unreachable"
+msgstr "不可达"
+
+#: assets/templates/assets/system_user_list.html:98
+msgid "This will delete the selected System Users !!!"
+msgstr "删除选择系统用户"
 
-#: assets/templates/assets/system_user_list.html:13
+# msgid "Deleted!"
+# msgstr "删除"
+#: assets/templates/assets/system_user_list.html:106
 #, fuzzy
-#| msgid "Asset group"
-msgid "Asset group num"
-msgstr "资产组"
+#| msgid "has been deleted."
+msgid "System Users Deleted."
+msgstr "已被删除"
 
-#: assets/templates/assets/system_user_list.html:14 ops/models.py:69
-msgid "Unreachable"
-msgstr ""
+#: assets/templates/assets/system_user_list.html:107
+#: assets/templates/assets/system_user_list.html:112
+#, fuzzy
+#| msgid "System user"
+msgid "System Users Delete"
+msgstr "系统"
 
-#: assets/views.py:156 assets/views.py:182 assets/views.py:214
-#: assets/views.py:233 assets/views.py:257 assets/views.py:339
-#: assets/views.py:438 assets/views.py:468 assets/views.py:491
-#: assets/views.py:509 templates/_nav.html:18
-msgid "Assets"
-msgstr "资产管理"
+#: assets/templates/assets/system_user_list.html:111
+#, fuzzy
+#| msgid "User detail"
+msgid "System Users Deleting failed."
+msgstr "用户详情"
 
-#: assets/views.py:183
+#: assets/views.py:215
 msgid "Asset group list"
 msgstr "资产组列表"
 
-#: assets/views.py:215
+#: assets/views.py:235
 #, fuzzy
 #| msgid "Asset group list"
 msgid "Asset group detail"
 msgstr "资产组列表"
 
-#: assets/views.py:258
+#: assets/views.py:281
 msgid "IDC list"
-msgstr ""
+msgstr "IDC列表"
 
-#: assets/views.py:286 assets/views.py:313
+#: assets/views.py:296 assets/views.py:323
 #, fuzzy
 #| msgid "Assets"
 msgid "assets"
 msgstr "资产管理"
 
-#: assets/views.py:314
+#: assets/views.py:324
 #, fuzzy
 #| msgid "Update"
 msgid "Update IDC"
 msgstr "更新"
 
-#: assets/views.py:340
+#: assets/views.py:369
 #, fuzzy
 #| msgid "Admin user"
 msgid "Admin user list"
-msgstr "管理用户"
+msgstr "管理用户列表"
 
-#: assets/views.py:376
+#: assets/views.py:393
 #, fuzzy, python-format
 #| msgid "Create user <a href=\"%s\">%s</a> success."
 msgid "Create admin user <a href=\"%s\">%s</a> successfully."
-msgstr "创建用户 <a href=\"%s\">%s</a> 成功"
+msgstr "创建管理用户 <a href=\"%s\">%s</a> 成功"
 
-#: assets/views.py:439
+#: assets/views.py:466
 #, fuzzy
 #| msgid "System user"
 msgid "System user list"
-msgstr "系统"
+msgstr "系统用户列表"
 
-#: assets/views.py:475
+#: assets/views.py:495
 #, fuzzy, python-format
 #| msgid "Create user <a href=\"%s\">%s</a> success."
 msgid "Create system user <a href=\"%s\">%s</a> successfully."
-msgstr "创建用户 <a href=\"%s\">%s</a> 成功"
+msgstr "创建系统用户 <a href=\"%s\">%s</a> 成功"
 
-#: assets/views.py:492
+#: assets/views.py:512
 #, fuzzy
 #| msgid "Update user"
 msgid "Update system user"
 msgstr "编辑用户"
 
-#: assets/views.py:510
+#: assets/views.py:530
 #, fuzzy
 #| msgid "System user"
 msgid "System user detail"
-msgstr "系统"
+msgstr "系统用户详情"
 
-#: assets/views.py:601 assets/views.py:619 assets/views.py:648
-#: assets/views.py:667
-msgid "Tag"
-msgstr ""
-
-#: assets/views.py:602 assets/views.py:620
+#: audits/models.py:20 audits/models.py:45
 #, fuzzy
-#| msgid "Asset group list"
-msgid "Asset Tags list"
-msgstr "资产组列表"
+#| msgid "Login"
+msgid "Login type"
+msgstr "登录方式"
 
-#: assets/views.py:649 assets/views.py:668
+#: audits/models.py:21
 #, fuzzy
-#| msgid "Asset group list"
-msgid "Asset Tags detail"
-msgstr "资产组列表"
+#| msgid "Login"
+msgid "Login ip"
+msgstr "登录IP"
 
-#: common/mixins.py:28
-msgid "is discard"
-msgstr ""
+#: audits/models.py:23
+#, fuzzy
+#| msgid "Login"
+msgid "Login city"
+msgstr "登录城市"
 
-#: common/mixins.py:29
-msgid "discard time"
-msgstr ""
+#: audits/models.py:25
+#, fuzzy
+#| msgid "User assets"
+msgid "User agent"
+msgstr "Agent"
 
-#: ops/api/exc.py:10
-msgid "Service temporarily unavailable, try again later."
-msgstr ""
+#: audits/models.py:27
+#, fuzzy
+#| msgid "Last login"
+msgid "Date login"
+msgstr "登录日期"
+
+#: audits/models.py:40 audits/templates/audits/command_log_list.html:27
+#: audits/templates/audits/proxy_log_offline_list.html:26
+#: audits/templates/audits/proxy_log_offline_list.html:64
+#: audits/templates/audits/proxy_log_online_list.html:26
+#: audits/templates/audits/proxy_log_online_list.html:64
+#: perms/templates/perms/asset_permission_create_update.html:36
+#: perms/templates/perms/asset_permission_list.html:12 templates/_nav.html:12
+#: templates/_user_profile.html:14 users/models/user.py:27
+#: users/templates/users/_user_bulk_update_modal.html:14
+#: users/templates/users/user_group_detail.html:81
+msgid "User"
+msgstr "用户"
 
-#: ops/api/exc.py:15
-msgid "This service maybe implemented in the future, but now not implemented!"
-msgstr ""
+#: audits/models.py:42 audits/templates/audits/command_log_list.html:43
+#: audits/templates/audits/proxy_log_offline_list.html:42
+#: audits/templates/audits/proxy_log_offline_list.html:66
+#: audits/templates/audits/proxy_log_online_list.html:42
+#: audits/templates/audits/proxy_log_online_list.html:66
+#: perms/templates/perms/asset_permission_detail.html:153
+#: perms/templates/perms/asset_permission_list.html:16 templates/_nav.html:25
+#: users/templates/users/user_asset_permission.html:57
+#: users/templates/users/user_granted_asset.html:55
+#: users/templates/users/user_group_asset_permission.html:57
+#: users/templates/users/user_group_granted_asset.html:55
+msgid "System user"
+msgstr "系统用户"
 
-#: ops/models.py:17 ops/models.py:35 ops/models.py:47
-msgid "UUID"
-msgstr ""
+#: audits/models.py:49
+msgid "Did connect failed"
+msgstr "连接失败"
 
-#: ops/models.py:19
-msgid "Start Time"
-msgstr ""
+#: audits/models.py:51 ops/models.py:23 ops/templates/ops/task_detail.html:66
+msgid "Is finished"
+msgstr "结束"
 
-#: ops/models.py:20
-msgid "End Time"
-msgstr ""
+#: audits/models.py:53 audits/templates/audits/proxy_log_offline_list.html:72
+#: audits/templates/audits/proxy_log_online_list.html:72
+#: ops/templates/ops/task_detail.html:54 ops/templates/ops/task_list.html:43
+#, fuzzy
+#| msgid "Date added"
+msgid "Date start"
+msgstr "开始日期"
 
-#: ops/models.py:21
-msgid "Exit Code"
-msgstr ""
+#: audits/models.py:55 ops/templates/ops/task_detail.html:58
+#, fuzzy
+#| msgid "Date joined"
+msgid "Date finished"
+msgstr "结束日期"
 
-#: ops/models.py:22
-msgid "Is Completed"
-msgstr ""
+#: audits/models.py:87
+msgid "Output"
+msgstr "输出"
 
-#: ops/models.py:23
+#: audits/templates/audits/login_log_list.html:27
+#: perms/templates/perms/asset_permission_user.html:109
 #, fuzzy
-#| msgid "Hostname"
-msgid "Hosts"
-msgstr "主机名"
+#| msgid "Select assets"
+msgid "Select user"
+msgstr "选择用户"
 
-#: ops/models.py:66
-msgid "Success"
-msgstr ""
+#: audits/templates/audits/login_log_list.html:47
+#: audits/templates/audits/proxy_log_offline_list.html:63
+#: audits/templates/audits/proxy_log_online_list.html:63
+#: perms/templates/perms/asset_permission_list.html:10
+#, fuzzy
+#| msgid "IDC"
+msgid "ID"
+msgstr "ID"
 
-#: ops/models.py:67
-msgid "Skipped"
-msgstr ""
+#: audits/templates/audits/login_log_list.html:51
+msgid "UA"
+msgstr "Agent"
 
-#: ops/models.py:68
-msgid "Failed"
-msgstr ""
+#: audits/templates/audits/login_log_list.html:53
+msgid "City"
+msgstr "城市"
 
-#: ops/models.py:70
-msgid "NoHost"
-msgstr ""
+#: audits/templates/audits/login_log_list.html:54
+msgid "Date"
+msgstr "日期"
 
-#: ops/models.py:217
-msgid "Host_Alias"
-msgstr ""
+#: audits/templates/audits/proxy_log_detail.html:17
+msgid "Proxy log detail"
+msgstr "Proxy log详情"
 
-#: ops/models.py:218 ops/models.py:226 ops/models.py:234 ops/models.py:242
-msgid "Host_Items"
-msgstr ""
+#: audits/templates/audits/proxy_log_detail.html:25 audits/views.py:210
+msgid "Command log list"
+msgstr "命令记录列表"
 
-#: ops/models.py:225
+#: audits/templates/audits/proxy_log_offline_list.html:68
+#: audits/templates/audits/proxy_log_online_list.html:68
 #, fuzzy
-#| msgid "User list"
-msgid "User_Alias"
-msgstr "用户列表"
+#| msgid "Comment"
+msgid "Command"
+msgstr "命令"
 
-#: ops/models.py:233
-msgid "Command_Alias"
-msgstr ""
+#: audits/templates/audits/proxy_log_offline_list.html:69
+#: audits/templates/audits/proxy_log_online_list.html:69
+#: ops/templates/ops/task_list.html:41
+msgid "Success"
+msgstr "成功"
 
-#: ops/models.py:241
-msgid "Runas_Alias"
-msgstr ""
+#: audits/templates/audits/proxy_log_offline_list.html:70
+#: audits/templates/audits/proxy_log_online_list.html:70
+#: ops/templates/ops/task_list.html:42
+msgid "Finished"
+msgstr "完成"
+
+#: audits/templates/audits/proxy_log_offline_list.html:71
+msgid "Play"
+msgstr "播放"
+
+#: audits/templates/audits/proxy_log_offline_list.html:73
+#: audits/templates/audits/proxy_log_online_list.html:73 ops/models.py:22
+#: ops/templates/ops/task_list.html:44
+msgid "Time"
+msgstr "时间"
 
-#: ops/models.py:253
+#: audits/templates/audits/proxy_log_online_list.html:71
+msgid "Monitor"
+msgstr "监控"
+
+#: audits/templates/audits/proxy_log_online_list.html:120
 #, fuzzy
-#| msgid "Password"
-msgid "Is_NoPassword"
-msgstr "密码"
+#| msgid "Deactive selected"
+msgid "Terminate selected"
+msgstr "终止所选"
 
-#: ops/models.py:267
-msgid "Extra_Item"
-msgstr ""
+#: audits/views.py:72 audits/views.py:209 audits/views.py:263
+#: templates/_nav.html:56
+msgid "Audits"
+msgstr "审计"
 
-#: ops/models.py:398
-msgid "Description of a crontab entry"
-msgstr ""
+#: audits/views.py:73 audits/views.py:264
+msgid "Proxy log list"
+msgstr "Session列表"
 
-#: ops/models.py:399
-msgid "Month"
-msgstr ""
+#: audits/views.py:101
+msgid "Proxy log offline list"
+msgstr "离线session列表"
 
-#: ops/models.py:400
-msgid "Month of the year the job should run ( 1-12, *, */2, etc )"
-msgstr ""
+#: audits/views.py:117
+msgid "Proxy log online list"
+msgstr "在线session列表"
 
-#: ops/models.py:401
-msgid "WeekDay"
+#: common/mixins.py:28
+msgid "is discard"
 msgstr ""
 
-#: ops/models.py:402
-msgid ""
-"Day of the week that the job should run ( 0-6 for Sunday-Saturday, *, etc )"
+#: common/mixins.py:29
+msgid "discard time"
 msgstr ""
 
-#: ops/models.py:404
-msgid "Day"
+#: ops/models.py:18 ops/templates/ops/task_detail.html:46
+msgid "UUID"
 msgstr ""
 
-#: ops/models.py:405
-msgid "Day of the month the job should run ( 1-31, *, */2, etc )"
-msgstr ""
+#: ops/models.py:20
+msgid "Start time"
+msgstr "开始时间"
 
-#: ops/models.py:406
-msgid "Hour"
-msgstr ""
+#: ops/models.py:21
+msgid "End time"
+msgstr "完成时间"
 
-#: ops/models.py:407
-msgid "Hour when the job should run ( 0-23, *, */2, etc )"
-msgstr ""
+#: ops/models.py:24
+#, fuzzy
+#| msgid "Logout success"
+msgid "Is success"
+msgstr "是否成功"
 
-#: ops/models.py:408
-msgid "Minute"
-msgstr ""
+#: ops/models.py:25
+#, fuzzy
+#| msgid "Asset group list"
+msgid "Assets for id"
+msgstr "资产组列表"
 
-#: ops/models.py:409
-msgid "Minute when the job should run ( 0-59, *, */2, etc )"
+#: ops/models.py:26
+msgid "Task module and args json format"
 msgstr ""
 
-#: ops/models.py:410
-msgid "Job"
+#: ops/models.py:27
+msgid "Task run pattern"
 msgstr ""
 
-#: ops/models.py:411
-msgid ""
-"The command to execute or, if env is set, the value of environment variable. "
-"Required if state=present."
+#: ops/models.py:28
+msgid "Task raw result"
 msgstr ""
 
-#: ops/models.py:413
-#: perms/templates/perms/asset_permission_create_update.html:36
-#: templates/_nav.html:12 templates/_user_profile.html:14 users/models.py:71
-#: users/templates/users/_user_bulk_update_modal.html:14
-msgid "User"
-msgstr "用户"
-
-#: ops/models.py:414
-msgid "The specific user whose crontab should be modified."
+#: ops/models.py:29
+msgid "Task summary"
 msgstr ""
 
-#: ops/templates/cron/list.html:18 ops/templates/sudo/list.html:18
-#: users/templates/users/user_list.html:18
-#, fuzzy
-#| msgid "Create user"
-msgid "Import user"
-msgstr "创建用户"
-
-#: ops/templates/cron/list.html:19 ops/templates/sudo/list.html:19
-#: users/templates/users/_user.html:17 users/templates/users/user_create.html:4
-#: users/templates/users/user_list.html:19 users/views.py:102
-msgid "Create user"
-msgstr "创建用户"
-
-#: ops/templates/cron/list.html:28 ops/templates/sudo/list.html:28
-#: users/models.py:78 users/templates/users/_select_user_modal.html:15
-#: users/templates/users/_user_bulk_update_modal.html:9
-#: users/templates/users/user_detail.html:82
-#: users/templates/users/user_list.html:28
-msgid "Role"
-msgstr "角色"
-
-#: ops/templates/cron/list.html:29 ops/templates/sudo/list.html:29
-#: templates/_nav.html:13 users/models.py:77
-#: users/templates/users/_select_user_modal.html:16
-#: users/templates/users/user_detail.html:178
-#: users/templates/users/user_list.html:29
-msgid "User group"
-msgstr "用户组"
-
-#: ops/templates/cron/list.html:32 ops/templates/sudo/list.html:32
-#: users/templates/users/user_group_list.html:29
-#: users/templates/users/user_list.html:32
+#: ops/templates/ops/task_detail.html:19
 #, fuzzy
-msgid "Action"
-msgstr "激活"
-
-#: ops/templates/cron/list.html:116 ops/templates/cron/list.html:178
-#: ops/templates/sudo/list.html:116 ops/templates/sudo/list.html:178
-#: users/templates/users/user_detail.html:329
-#: users/templates/users/user_detail.html:354
-#: users/templates/users/user_group_detail.html:169
-#: users/templates/users/user_group_list.html:102
-#: users/templates/users/user_group_list.html:125
-#: users/templates/users/user_list.html:116
-#: users/templates/users/user_list.html:178
-msgid "Are you sure?"
-msgstr ""
+#| msgid "User detail"
+msgid "Task record detail"
+msgstr "用户详情"
 
-#: ops/templates/cron/list.html:117 ops/templates/sudo/list.html:117
-#: users/templates/users/user_list.html:117
-msgid "This will delete the selected users !!!"
+#: ops/templates/ops/task_detail.html:62
+msgid "Time delta"
 msgstr ""
 
-#: ops/templates/cron/list.html:121 ops/templates/cron/list.html:183
-#: ops/templates/sudo/list.html:121 ops/templates/sudo/list.html:183
-#: templates/_modal.html:16 users/templates/users/user_detail.html:334
-#: users/templates/users/user_detail.html:359
-#: users/templates/users/user_detail.html:383
-#: users/templates/users/user_group_detail.html:174
-#: users/templates/users/user_group_list.html:107
-#: users/templates/users/user_group_list.html:130
-#: users/templates/users/user_list.html:121
-#: users/templates/users/user_list.html:183
+#: ops/templates/ops/task_detail.html:70
 #, fuzzy
-#| msgid "Confirm delete"
-msgid "Confirm"
-msgstr "确认删除"
+#| msgid "Logout success"
+msgid "Is success "
+msgstr "退出登录成功"
 
-# msgid "Deleted!"
-# msgstr "删除"
-#: ops/templates/cron/list.html:125 ops/templates/cron/list.html:161
-#: ops/templates/sudo/list.html:125 ops/templates/sudo/list.html:161
-#: users/templates/users/user_list.html:125
-#: users/templates/users/user_list.html:161
+#: ops/templates/ops/task_detail.html:84
 #, fuzzy
-#| msgid "has been deleted."
-msgid "User Deleted."
-msgstr "已被删除"
+#| msgid "Assets"
+msgid "Assets "
+msgstr "资产管理"
 
-#: ops/templates/cron/list.html:126 ops/templates/cron/list.html:131
-#: ops/templates/cron/list.html:162 ops/templates/cron/list.html:167
-#: ops/templates/sudo/list.html:126 ops/templates/sudo/list.html:131
-#: ops/templates/sudo/list.html:162 ops/templates/sudo/list.html:167
-#: users/templates/users/user_list.html:126
-#: users/templates/users/user_list.html:131
-#: users/templates/users/user_list.html:162
-#: users/templates/users/user_list.html:167
+#: ops/templates/ops/task_detail.html:126
 #, fuzzy
-#| msgid "Delete"
-msgid "User Delete"
-msgstr "删除"
+#| msgid "Select assets"
+msgid "Failed assets"
+msgstr "选择资产"
 
-#: ops/templates/cron/list.html:130 ops/templates/cron/list.html:166
-#: ops/templates/sudo/list.html:130 ops/templates/sudo/list.html:166
-#: users/templates/users/user_list.html:130
-#: users/templates/users/user_list.html:166
+#: ops/templates/ops/task_detail.html:142
+#: ops/templates/ops/task_detail.html:167
 #, fuzzy
-#| msgid "User detail"
-msgid "User Deleting failed."
-msgstr "用户详情"
-
-#: ops/templates/cron/list.html:179 ops/templates/sudo/list.html:179
-#: users/templates/users/user_list.html:179
-msgid "This will delete the selected user."
-msgstr ""
-
-#: ops/templates/cron/list.html:215 ops/templates/sudo/list.html:215
-#: users/templates/users/user_list.html:215
-msgid "The selected users has been updated successfully."
-msgstr ""
+#| msgid "Assets"
+msgid "No assets"
+msgstr "资产管理"
 
-#: ops/templates/cron/list.html:216 ops/templates/sudo/list.html:216
-#: users/templates/users/user_list.html:216
+#: ops/templates/ops/task_detail.html:152
 #, fuzzy
-#| msgid "Update"
-msgid "User Updated"
-msgstr "更新"
+#| msgid "Select assets"
+msgid "Success assets"
+msgstr "选择资产"
 
-#: ops/templates/cron/list.html:232 ops/templates/sudo/list.html:232
-#: users/templates/users/user_list.html:232
-msgid "Import User Success."
-msgstr ""
+#: ops/templates/ops/task_list.html:71
+msgid "Run again"
+msgstr "再次执行"
 
 #: perms/forms.py:21
 #, fuzzy
@@ -1354,67 +1711,59 @@ msgstr ""
 msgid "Select users"
 msgstr "选择资产"
 
-#: perms/forms.py:23 perms/templates/perms/asset_permission_user.html:139
+#: perms/forms.py:24 perms/templates/perms/asset_permission_user.html:137
 #, fuzzy
 #| msgid "Select asset groups"
 msgid "Select user groups"
 msgstr "添加到资产组"
 
-#: perms/forms.py:29 perms/templates/perms/asset_permission_detail.html:155
-#: users/forms.py:126
+#: perms/forms.py:33 perms/templates/perms/asset_permission_detail.html:161
+#: users/forms.py:105 users/forms.py:132
 #, fuzzy
 #| msgid "System user"
 msgid "Select system users"
 msgstr "系统"
 
-#: perms/models.py:26
-#, fuzzy
-#| msgid "SSH private key"
-msgid "Private for"
-msgstr "ssh密钥"
-
-#: perms/models.py:28 perms/templates/perms/asset_permission_detail.html:80
-#: users/models.py:89 users/templates/users/user_detail.html:86
+#: perms/models.py:35 perms/templates/perms/asset_permission_detail.html:86
+#: users/models/user.py:46 users/templates/users/user_detail.html:93
 msgid "Date expired"
 msgstr "失效日期"
 
-#: perms/templates/perms/asset_permission_asset.html:24
-#: perms/templates/perms/asset_permission_detail.html:24
-#: perms/templates/perms/asset_permission_user.html:24
+#: perms/templates/perms/asset_permission_asset.html:22
+#: perms/templates/perms/asset_permission_detail.html:22
+#: perms/templates/perms/asset_permission_user.html:22
 #, fuzzy
 #| msgid "Join user groups"
 msgid "Users and user groups"
 msgstr "添加到用户组"
 
-#: perms/templates/perms/asset_permission_asset.html:29
-#: perms/templates/perms/asset_permission_detail.html:29
-#: perms/templates/perms/asset_permission_user.html:29
+#: perms/templates/perms/asset_permission_asset.html:27
+#: perms/templates/perms/asset_permission_detail.html:27
+#: perms/templates/perms/asset_permission_user.html:27
 #, fuzzy
 #| msgid "Select asset groups"
 msgid "Assets and asset groups"
 msgstr "添加到资产组"
 
-#: perms/templates/perms/asset_permission_asset.html:69
-#: perms/templates/perms/asset_permission_list.html:18
-#: perms/templates/perms/asset_permission_user.html:69
-#: users/templates/users/user_asset_permission.html:73
-#: users/templates/users/user_granted_asset.html:71
+#: perms/templates/perms/asset_permission_asset.html:67
+#: perms/templates/perms/asset_permission_list.html:17
+#: perms/templates/perms/asset_permission_user.html:67
 msgid "Is valid"
 msgstr ""
 
-#: perms/templates/perms/asset_permission_asset.html:103
+#: perms/templates/perms/asset_permission_asset.html:101
 msgid "Add asset to this permission"
-msgstr ""
+msgstr "添加资产"
 
-#: perms/templates/perms/asset_permission_asset.html:111
+#: perms/templates/perms/asset_permission_asset.html:109
 #, fuzzy
 #| msgid "Select assets"
 msgid "Select asset "
 msgstr "选择资产"
 
-#: perms/templates/perms/asset_permission_asset.html:131
+#: perms/templates/perms/asset_permission_asset.html:129
 msgid "Add asset group to this permission"
-msgstr ""
+msgstr "添加资产组"
 
 #: perms/templates/perms/asset_permission_create_update.html:17
 #, fuzzy
@@ -1422,57 +1771,45 @@ msgstr ""
 msgid "Create asset permission "
 msgstr "创建资产组"
 
-#: perms/templates/perms/asset_permission_detail.html:60
-#: perms/templates/perms/asset_permission_list.html:13
+#: perms/templates/perms/asset_permission_detail.html:66
 #, fuzzy
 #| msgid "User group"
 msgid "User count"
 msgstr "用户组"
 
-#: perms/templates/perms/asset_permission_detail.html:64
-#: perms/templates/perms/asset_permission_list.html:14
+#: perms/templates/perms/asset_permission_detail.html:70
 #, fuzzy
 #| msgid "User group list"
 msgid "User group count"
 msgstr "用户组列表"
 
-#: perms/templates/perms/asset_permission_detail.html:68
-#: perms/templates/perms/asset_permission_list.html:15
-#: users/templates/users/user_granted_asset.html:130
+#: perms/templates/perms/asset_permission_detail.html:74
 #, fuzzy
 #| msgid "Asset group"
 msgid "Asset count"
 msgstr "资产组"
 
-#: perms/templates/perms/asset_permission_detail.html:72
-#: perms/templates/perms/asset_permission_list.html:16
+#: perms/templates/perms/asset_permission_detail.html:78
 #, fuzzy
 #| msgid "Asset group list"
 msgid "Asset group count"
 msgstr "资产组列表"
 
-#: perms/templates/perms/asset_permission_detail.html:76
-#: perms/templates/perms/asset_permission_list.html:17
+#: perms/templates/perms/asset_permission_detail.html:82
 #, fuzzy
 #| msgid "System user"
 msgid "System user count"
-msgstr "系统"
+msgstr "系统用户"
 
-#: perms/templates/perms/asset_permission_detail.html:133
+#: perms/templates/perms/asset_permission_detail.html:139
 #, fuzzy
 #| msgid "System user"
 msgid "Repush system user"
-msgstr "系统"
+msgstr "重新推送系统"
 
-#: perms/templates/perms/asset_permission_detail.html:136
+#: perms/templates/perms/asset_permission_detail.html:142
 msgid "Push"
-msgstr ""
-
-#: perms/templates/perms/asset_permission_detail.html:147
-#: templates/_nav.html:25 users/templates/users/user_granted_asset.html:69
-#: users/templates/users/user_granted_asset.html:131
-msgid "System user"
-msgstr "系统"
+msgstr "推送"
 
 #: perms/templates/perms/asset_permission_list.html:5
 #, fuzzy
@@ -1480,83 +1817,79 @@ msgstr "系统"
 msgid "Create permission"
 msgstr "创建权限"
 
-#: perms/templates/perms/asset_permission_user.html:47
+#: perms/templates/perms/asset_permission_list.html:13 templates/_nav.html:13
+#: users/models/user.py:34 users/templates/users/_select_user_modal.html:16
+#: users/templates/users/user_detail.html:177
+#: users/templates/users/user_list.html:28
+msgid "User group"
+msgstr "用户组"
+
+#: perms/templates/perms/asset_permission_list.html:15 templates/_nav.html:22
+#: users/templates/users/user_asset_permission.html:56
+#: users/templates/users/user_group_asset_permission.html:56
+msgid "Asset group"
+msgstr "资产组"
+
+#: perms/templates/perms/asset_permission_user.html:45
 #, fuzzy
 #| msgid "User list"
 msgid "User list of "
 msgstr "用户列表"
 
-#: perms/templates/perms/asset_permission_user.html:68 users/models.py:76
-#: users/templates/users/user_detail.html:66
+#: perms/templates/perms/asset_permission_user.html:66 users/models/user.py:33
+#: users/templates/users/user_detail.html:73
 msgid "Email"
 msgstr "邮件"
 
-#: perms/templates/perms/asset_permission_user.html:103
+#: perms/templates/perms/asset_permission_user.html:101
 msgid "Add user to asset permission"
 msgstr ""
 
-#: perms/templates/perms/asset_permission_user.html:111
-#, fuzzy
-#| msgid "Select assets"
-msgid "Select user"
-msgstr "选择资产"
-
-#: perms/templates/perms/asset_permission_user.html:131
+#: perms/templates/perms/asset_permission_user.html:129
 #, fuzzy
 #| msgid "Asset group list"
 msgid "Add user group to asset permission"
 msgstr "资产组列表"
 
-#: perms/views.py:29 perms/views.py:66 perms/views.py:89 perms/views.py:107
-#: perms/views.py:146 perms/views.py:181 templates/_nav.html:30
+#: perms/views.py:33 perms/views.py:76 perms/views.py:110 perms/views.py:136
+#: perms/views.py:180 perms/views.py:222 templates/_nav.html:29
 msgid "Perms"
 msgstr "权限管理"
 
-#: perms/views.py:30
+#: perms/views.py:34
 #, fuzzy
-#| msgid "Asset group list"
 msgid "Asset permission list"
-msgstr "资产组列表"
+msgstr "资产授权列表"
 
-#: perms/views.py:67
-#, fuzzy
-#| msgid "Create asset group"
+#: perms/views.py:77
 msgid "Create asset permission"
-msgstr "创建资产组"
+msgstr "创建资产权限"
 
-#: perms/views.py:73
-#, fuzzy, python-format
-#| msgid "Create user <a href=\"%s\">%s</a> success."
+#: perms/views.py:84
 msgid "Create asset permission <a href=\"%s\"> %s </a> successfully."
-msgstr "创建用户 <a href=\"%s\">%s</a> 成功"
+msgstr "创建授权 <a href=\"%s\">%s</a> 成功"
 
-#: perms/views.py:85
-#, fuzzy, python-format
-#| msgid "Create user <a href=\"%s\">%s</a> success."
+#: perms/views.py:105
 msgid "Update asset permission <a href=\"%s\"> %s </a> successfully."
-msgstr "创建用户 <a href=\"%s\">%s</a> 成功"
+msgstr "更新授权 <a href=\"%s\">%s</a> 成功"
 
-#: perms/views.py:90
+#: perms/views.py:111
 msgid "Update asset permission"
-msgstr ""
+msgstr "更新资产授权"
 
-#: perms/views.py:108
+#: perms/views.py:137
 #, fuzzy
 #| msgid "Asset environment"
 msgid "Asset permission detail"
-msgstr "资产环境"
+msgstr "资产权限详情"
 
-#: perms/views.py:147
-#, fuzzy
-#| msgid "Asset group list"
+#: perms/views.py:181
 msgid "Asset permission user list"
-msgstr "资产组列表"
+msgstr "资产授权包含用户"
 
-#: perms/views.py:182
-#, fuzzy
-#| msgid "Asset group list"
+#: perms/views.py:223
 msgid "Asset permission asset list"
-msgstr "资产组列表"
+msgstr "资产组授权包含资产"
 
 #: templates/_header_bar.html:8
 msgid "Search"
@@ -1581,77 +1914,67 @@ msgstr "登录"
 
 #: templates/_modal.html:15
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
-#: templates/_nav.html:9 users/templates/users/user_group_create.html:24
-#: users/templates/users/user_group_detail.html:102 users/views.py:89
-#: users/views.py:102 users/views.py:138 users/views.py:149 users/views.py:159
-#: users/views.py:172 users/views.py:197 users/views.py:219 users/views.py:320
+#: templates/_nav.html:9 users/templates/users/user_group_create_update.html:28
+#: users/views/group.py:30 users/views/group.py:43 users/views/group.py:70
+#: users/views/group.py:95 users/views/login.py:180 users/views/user.py:50
+#: users/views/user.py:66 users/views/user.py:102 users/views/user.py:114
 msgid "Users"
 msgstr "用户管理"
 
-#: templates/_nav.html:26
-msgid "Label"
-msgstr "标签"
-
-#: templates/_nav.html:33 users/templates/users/user_asset_permission.html:23
-#: users/templates/users/user_detail.html:24
-#: users/templates/users/user_granted_asset.html:23
-#, fuzzy
-#| msgid "Asset type"
+#: templates/_nav.html:32 users/templates/users/user_asset_permission.html:21
+#: users/templates/users/user_detail.html:22
+#: users/templates/users/user_granted_asset.html:21
+#: users/templates/users/user_group_asset_permission.html:21
+#: users/templates/users/user_group_detail.html:25
+#: users/templates/users/user_group_granted_asset.html:21
 msgid "Asset permission"
-msgstr "系统类型"
+msgstr "资产授权"
 
-#: templates/_nav.html:43
+#: templates/_nav.html:48
 msgid "Job Center"
 msgstr "作业中心"
 
-#: templates/_nav.html:47
-msgid "Cron"
-msgstr "Cron"
-
-#: templates/_nav.html:53
-msgid "Audits"
-msgstr "审计"
-
-#: templates/_nav.html:58
-msgid "File"
-msgstr "文件"
-
-#: templates/_nav.html:61
-msgid "File upload"
-msgstr "文件上传"
+#: templates/_nav.html:51
+msgid "Task"
+msgstr "任务"
 
 #: templates/_nav.html:62
-msgid "File download"
-msgstr "文件下载"
+msgid "Session history"
+msgstr "Session历史"
 
-#: templates/_nav.html:67
-msgid "Settings"
-msgstr "设置"
+#: templates/_nav.html:65
+msgid "Command log"
+msgstr "命令记录"
 
-#: templates/_nav.html:72
+#: templates/_nav.html:68
+msgid "Login log"
+msgstr "登录日志"
+
+#: templates/_nav.html:92
 msgid "Visit us"
 msgstr "访问官网"
 
-#: templates/_user_profile.html:19 users/templates/users/_user.html:63
+#: templates/_user_profile.html:19 users/templates/users/_user.html:42
 msgid "Profile"
 msgstr "个人信息"
 
-#: templates/base.html:27
+#: templates/base.html:28
 #, python-format
 msgid ""
 "\n"
 "                Your information was incomplete. Please click <a href="
-"\"%(the_url)s\"> this link </a>to complete your information.\n"
+"\"%(first_login_url)s\"> this link </a>to complete your information.\n"
 "                "
 msgstr ""
 
-#: templates/base.html:36
+#: templates/base.html:38
+#, python-format
 msgid ""
 "\n"
 "                Your ssh-public-key has been expired. Please click <a href="
-"\"#\"> this link </a>to  update your ssh-public-key.\n"
+"\"%(profile_url)s\"> this link </a>to update your ssh-public-key.\n"
 "                "
 msgstr ""
 
@@ -1668,86 +1991,155 @@ msgstr "验证码"
 msgid "Filters"
 msgstr "过滤"
 
-#: users/forms.py:33 users/forms.py:58
-#: users/templates/users/user_detail.html:186
+#: users/authentication.py:57
+msgid "Invalid signature header. No credentials provided."
+msgstr ""
+
+#: users/authentication.py:60
+msgid "Invalid signature header. Signature string should not contain spaces."
+msgstr ""
+
+#: users/authentication.py:67
+msgid "Invalid signature header. Format like AccessKeyId:Signature"
+msgstr ""
+
+#: users/authentication.py:71
+msgid ""
+"Invalid signature header. Signature string should not contain invalid "
+"characters."
+msgstr ""
+
+#: users/authentication.py:90 users/authentication.py:106
+msgid "Invalid signature."
+msgstr ""
+
+#: users/authentication.py:97
+msgid "HTTP header: Date not provide or not %a, %d %b %Y %H:%M:%S GMT"
+msgstr ""
+
+#: users/authentication.py:102
+msgid "Expired, more than 15 minutes"
+msgstr ""
+
+#: users/authentication.py:109
+#, fuzzy
+#| msgid "Update"
+msgid "User disabled."
+msgstr "更新"
+
+#: users/authentication.py:124
+msgid "Invalid token header. No credentials provided."
+msgstr ""
+
+#: users/authentication.py:127
+msgid "Invalid token header. Sign string should not contain spaces."
+msgstr ""
+
+#: users/authentication.py:134
+msgid ""
+"Invalid token header. Sign string should not contain invalid characters."
+msgstr ""
+
+#: users/authentication.py:145
+msgid "Invalid token or cache refreshed."
+msgstr ""
+
+#: users/forms.py:36 users/templates/users/user_detail.html:185
 msgid "Join user groups"
 msgstr "添加到用户组"
 
-#: users/forms.py:75
+#: users/forms.py:58
 #, fuzzy
 #| msgid "Name"
 msgid "name"
 msgstr "名称"
 
-#: users/forms.py:76
+#: users/forms.py:59
 #, fuzzy
 #| msgid "Avatar"
 msgid "avatar"
 msgstr "头像"
 
-#: users/forms.py:77
+#: users/forms.py:60
 #, fuzzy
 #| msgid "Wechat"
 msgid "wechat"
 msgstr "微信"
 
-#: users/forms.py:78
+#: users/forms.py:61
 #, fuzzy
 #| msgid "Phone"
 msgid "phone"
 msgstr "手机"
 
-#: users/forms.py:79
+#: users/forms.py:62
 #, fuzzy
 #| msgid "Enable OTP"
 msgid "enable otp"
 msgstr "二次验证"
 
-#: users/forms.py:84 users/models.py:85
+#: users/forms.py:67 users/models/user.py:42
 msgid "ssh public key"
 msgstr "ssh公钥"
 
-#: users/forms.py:85
+#: users/forms.py:68
 msgid "ssh-rsa AAAA..."
 msgstr ""
 
-#: users/forms.py:86
-msgid "Paste your id_ras.pub here."
+#: users/forms.py:69
+msgid "Paste your id_rsa.pub here."
 msgstr ""
 
-#: users/forms.py:91
+#: users/forms.py:74
 msgid "Public key should not be the same as your old one."
 msgstr ""
 
-#: users/forms.py:99 users/forms.py:102 users/serializers.py:32
-#: users/serializers.py:35
+#: users/forms.py:78 users/serializers.py:41
 #, fuzzy
 #| msgid "ssh private key"
 msgid "Not a valid ssh public key"
 msgstr "ssh密钥"
 
-#: users/models.py:70 users/models.py:220
+#: users/models/authentication.py:38
+#, fuzzy
+#| msgid "SSH private key"
+msgid "Private Token"
+msgstr "ssh密钥"
+
+#: users/models/user.py:26 users/models/user.py:238
 msgid "Administrator"
 msgstr "管理员"
 
-#: users/models.py:79
+#: users/models/user.py:28
+#, fuzzy
+msgid "Application"
+msgstr "激活"
+
+#: users/models/user.py:35 users/templates/users/_select_user_modal.html:15
+#: users/templates/users/_user_bulk_update_modal.html:9
+#: users/templates/users/user_detail.html:89
+#: users/templates/users/user_list.html:27
+msgid "Role"
+msgstr "角色"
+
+#: users/models/user.py:36
 msgid "Avatar"
 msgstr "头像"
 
-#: users/models.py:80 users/templates/users/user_detail.html:77
+#: users/models/user.py:37 users/templates/users/user_detail.html:84
 msgid "Wechat"
 msgstr "微信"
 
-#: users/models.py:82 users/templates/users/_user.html:57
-#: users/templates/users/user_detail.html:133
+#: users/models/user.py:39 users/templates/users/_user.html:36
+#: users/templates/users/user_detail.html:140
 msgid "Enable OTP"
 msgstr "二次验证"
 
-#: users/models.py:84
+#: users/models/user.py:41
 msgid "ssh private key"
 msgstr "ssh密钥"
 
-#: users/models.py:223
+#: users/models/user.py:241
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
@@ -1757,11 +2149,11 @@ msgstr "Administrator是初始的超级管理员"
 msgid "Please Select User"
 msgstr "选择资产"
 
-#: users/templates/users/_user.html:33
+#: users/templates/users/_user.html:13
 msgid "Account"
 msgstr "账户"
 
-#: users/templates/users/_user.html:43
+#: users/templates/users/_user.html:23
 msgid "Security and Role"
 msgstr "角色安全"
 
@@ -1771,10 +2163,6 @@ msgstr "角色安全"
 msgid "Update User"
 msgstr "编辑用户"
 
-#: users/templates/users/_user_bulk_update_modal.html:6
-msgid "Hint: only change the field you want to update."
-msgstr ""
-
 #: users/templates/users/_user_bulk_update_modal.html:13
 #, fuzzy
 #| msgid "Admin user"
@@ -1785,39 +2173,17 @@ msgstr "管理用户"
 msgid "Groups"
 msgstr ""
 
-#: users/templates/users/_user_bulk_update_modal.html:21
+#: users/templates/users/_user_import_modal.html:4
 #, fuzzy
-#| msgid "Select asset groups"
-msgid "Select Group"
-msgstr "添加到资产组"
+#| msgid "Create user"
+msgid "Import user"
+msgstr "创建用户"
 
-#: users/templates/users/_user_bulk_update_modal.html:31
+#: users/templates/users/_user_import_modal.html:14
 #, fuzzy
-#| msgid "Enable OTP"
-msgid "Enable-OTP"
-msgstr "二次验证"
-
-#: users/templates/users/_user_import_modal.html:4
-msgid "Import User"
-msgstr ""
-
-#: users/templates/users/_user_import_modal.html:6
-msgid "Hint: your excel should organized in the following format."
-msgstr ""
-
-#: users/templates/users/_user_import_modal.html:7
-msgid "* You should have a very worksheet named `users`."
-msgstr ""
-
-#: users/templates/users/_user_import_modal.html:8
-msgid ""
-"* Rows in this worksheet: username, email, enable_opt(0, 1), role(one of "
-"['Admin', 'User'])"
-msgstr ""
-
-#: users/templates/users/_user_import_modal.html:12
-msgid "Excel"
-msgstr ""
+#| msgid "User detail"
+msgid "Users excel file"
+msgstr "用户详情"
 
 #: users/templates/users/_user_update_pk_modal.html:4
 #, fuzzy
@@ -1825,7 +2191,7 @@ msgstr ""
 msgid "Update User SSH Public Key"
 msgstr "ssh密钥"
 
-#: users/templates/users/first_login.html:18 users/views.py:320
+#: users/templates/users/first_login.html:18 users/views/login.py:180
 #, fuzzy
 #| msgid "Last login"
 msgid "First Login"
@@ -1865,7 +2231,7 @@ msgid "Captcha invalid"
 msgstr "验证码错误"
 
 #: users/templates/users/reset_password.html:45
-#: users/templates/users/user_detail.html:148 users/utils.py:99
+#: users/templates/users/user_detail.html:155 users/utils.py:71
 msgid "Reset password"
 msgstr "重置密码"
 
@@ -1878,276 +2244,255 @@ msgstr "再次输入密码"
 msgid "Setting"
 msgstr "设置"
 
-#: users/templates/users/user_asset_permission.html:20
-#: users/templates/users/user_detail.html:21
-#: users/templates/users/user_granted_asset.html:20 users/views.py:149
+#: users/templates/users/user_asset_permission.html:18
+#: users/templates/users/user_detail.html:19
+#: users/templates/users/user_granted_asset.html:18
+#: users/templates/users/user_group_asset_permission.html:18
+#: users/templates/users/user_group_granted_asset.html:18
+#: users/views/user.py:115
 msgid "User detail"
 msgstr "用户详情"
 
-#: users/templates/users/user_asset_permission.html:26
-#: users/templates/users/user_detail.html:26
-#: users/templates/users/user_granted_asset.html:26
+#: users/templates/users/user_asset_permission.html:24
+#: users/templates/users/user_detail.html:25
+#: users/templates/users/user_granted_asset.html:24
+#: users/templates/users/user_group_asset_permission.html:24
+#: users/templates/users/user_group_detail.html:28
+#: users/templates/users/user_group_granted_asset.html:24
 #, fuzzy
 #| msgid "Asset type"
 msgid "Asset granted"
 msgstr "系统类型"
 
-#: users/templates/users/user_asset_permission.html:29
-#: users/templates/users/user_detail.html:27
-#: users/templates/users/user_granted_asset.html:29
-msgid "Login history"
-msgstr ""
-
-#: users/templates/users/user_asset_permission.html:47
+#: users/templates/users/user_asset_permission.html:32
+#: users/templates/users/user_group_asset_permission.html:32
 #, fuzzy
 #| msgid "Asset type"
 msgid "Asset permission of "
 msgstr "系统类型"
 
-#: users/templates/users/user_asset_permission.html:67
-#, fuzzy
-#| msgid "User"
-msgid "User "
-msgstr "用户"
-
-#: users/templates/users/user_asset_permission.html:68
-#, fuzzy
-#| msgid "User group"
-msgid "User group "
-msgstr "用户组"
-
-#: users/templates/users/user_asset_permission.html:69
-#, fuzzy
-#| msgid "Asset"
-msgid "Asset "
-msgstr "资产"
-
-#: users/templates/users/user_asset_permission.html:70
-#, fuzzy
-#| msgid "Asset group"
-msgid "Asset group "
-msgstr "资产组"
-
 #: users/templates/users/user_asset_permission.html:71
 #, fuzzy
-#| msgid "System user"
-msgid "System user "
-msgstr "系统"
-
-#: users/templates/users/user_asset_permission.html:115
-#, fuzzy
 #| msgid "Create perm"
 msgid "Quick create permission for user"
 msgstr "创建权限"
 
+#: users/templates/users/user_asset_permission.html:178
+#: users/templates/users/user_group_asset_permission.html:174
+#, fuzzy
+#| msgid "Create account successfully"
+msgid "Revoke Successfully!"
+msgstr "创建账户成功"
+
+#: users/templates/users/user_create.html:4
+#: users/templates/users/user_list.html:16 users/views/user.py:66
+msgid "Create user"
+msgstr "创建用户"
+
 #: users/templates/users/user_create.html:13
 msgid "Reset link will be generated and sent to the user. "
 msgstr "生成重置密码连接，通过邮件发送给用户"
 
-#: users/templates/users/user_detail.html:98
+#: users/templates/users/user_detail.html:105
 msgid "Last login"
 msgstr "最后登录"
 
-#: users/templates/users/user_detail.html:156
+#: users/templates/users/user_detail.html:163
 msgid "Reset ssh key"
 msgstr "重置密钥"
 
-#: users/templates/users/user_detail.html:164
-#, fuzzy
-#| msgid "Update user"
-msgid "Update ssh key"
-msgstr "编辑用户"
-
-#: users/templates/users/user_detail.html:246
-msgid "UserGroup Update Success!"
-msgstr ""
-
-#: users/templates/users/user_detail.html:270
-#: users/templates/users/user_detail.html:282
-#, fuzzy
-#| msgid "Create account successfully"
-msgid "Update Successfully!"
-msgstr "创建账户成功"
-
-#: users/templates/users/user_detail.html:319
-msgid "E-mail sent successfully. An e-mail has been sent to the user\\"
+#: users/templates/users/user_detail.html:322
+msgid "An e-mail has been sent to the user\\'s mailbox."
 msgstr ""
 
-#: users/templates/users/user_detail.html:320
+#: users/templates/users/user_detail.html:323
 #, fuzzy
 #| msgid "Password"
 msgid "Password-Reset"
 msgstr "密码"
 
-#: users/templates/users/user_detail.html:330
-#: users/templates/users/user_detail.html:355
+#: users/templates/users/user_detail.html:333
+#: users/templates/users/user_detail.html:358
 msgid "This will reset the user\\"
 msgstr ""
 
-#: users/templates/users/user_detail.html:344
+#: users/templates/users/user_detail.html:347
 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:345
+#: users/templates/users/user_detail.html:348
 #, fuzzy
 #| msgid "SSH private key"
 msgid "SSH-Public-Key Reset"
 msgstr "ssh密钥"
 
-#: users/templates/users/user_detail.html:372
+#: users/templates/users/user_detail.html:375
+#: users/templates/users/user_profile.html:127
 msgid "Successfully updated the SSH public key."
 msgstr ""
 
-#: users/templates/users/user_detail.html:373
-#: users/templates/users/user_detail.html:378
+#: users/templates/users/user_detail.html:376
+#: users/templates/users/user_detail.html:380
+#: users/templates/users/user_profile.html:128
+#: users/templates/users/user_profile.html:133
 #, fuzzy
 #| msgid "SSH private key"
 msgid "User SSH Public Key Update"
 msgstr "ssh密钥"
 
-#: users/templates/users/user_detail.html:376
-msgid "Failed to update the user\\"
-msgstr ""
-
-#: users/templates/users/user_granted_asset.html:47
+#: users/templates/users/user_granted_asset.html:32
+#: users/templates/users/user_group_granted_asset.html:32
 #, fuzzy
-#| msgid "Create asset group"
-msgid "Granted assets of "
-msgstr "创建资产组"
+#| msgid "Asset group list"
+msgid "Assets granted of "
+msgstr "资产组列表"
 
-#: users/templates/users/user_granted_asset.html:110
+#: users/templates/users/user_granted_asset.html:68
+#: users/templates/users/user_group_granted_asset.html:68
 #, fuzzy
 #| msgid "Asset group list"
 msgid "Asset groups granted of "
 msgstr "资产组列表"
 
-#: users/templates/users/user_group_create.html:26
+#: users/templates/users/user_group_asset_permission.html:71
+#, fuzzy
+#| msgid "Create perm"
+msgid "Quick create permission for user group"
+msgstr "创建权限"
+
+#: users/templates/users/user_group_create_update.html:30
 #, fuzzy
 #| msgid "Select assets"
 msgid "Select User"
 msgstr "选择资产"
 
-#: users/templates/users/user_group_create.html:38
+#: users/templates/users/user_group_create_update.html:44
 msgid "Cancel"
 msgstr ""
 
-#: users/templates/users/user_group_create.html:39
+#: users/templates/users/user_group_create_update.html:45
 #, fuzzy
 #| msgid "Confirm delete"
 msgid "confirm"
 msgstr "确认删除"
 
-#: users/templates/users/user_group_detail.html:70 users/views.py:219
+#: users/templates/users/user_group_detail.html:22 users/views/group.py:96
 #, fuzzy
 #| msgid "Asset group list"
 msgid "User Group Detail"
 msgstr "资产组列表"
 
-#: users/templates/users/user_group_detail.html:98
+#: users/templates/users/user_group_detail.html:62
 #, fuzzy
-#| msgid "Create asset"
-msgid "Created at"
-msgstr "创建资产"
+#| msgid "Created by"
+msgid "Create by"
+msgstr "创建者"
 
-#: users/templates/users/user_group_detail.html:121
+#: users/templates/users/user_group_detail.html:89
 #, fuzzy
 #| msgid "User"
-msgid "Add User"
+msgid "Add user"
 msgstr "用户"
 
-#: users/templates/users/user_group_detail.html:170
-msgid "This will delete the current group, but will not delete any user of it."
-msgstr ""
-
-#: users/templates/users/user_group_detail.html:223
-msgid "The selected users has been added to current group."
-msgstr ""
-
-#: users/templates/users/user_group_list.html:18
+#: users/templates/users/user_group_list.html:5
 #, fuzzy
 #| msgid "Asset group"
 msgid "Add User Group"
 msgstr "资产组"
 
-#: users/templates/users/user_group_list.html:26
+#: users/templates/users/user_group_list.html:13
 #, fuzzy
 #| msgid "User group"
 msgid "User Amount"
 msgstr "用户组"
 
-#: users/templates/users/user_group_list.html:27
+#: users/templates/users/user_group_list.html:95
 #, fuzzy
-#| msgid "Asset group"
-msgid "Asset Amount"
-msgstr "资产组"
+#| msgid "User group list"
+msgid "UserGroups Deleted."
+msgstr "用户组列表"
 
-#: users/templates/users/user_group_list.html:85
+#: users/templates/users/user_group_list.html:96
+#: users/templates/users/user_group_list.html:101
 #, fuzzy
-#| msgid "Delete"
-msgid "Group Deleted."
-msgstr "删除"
+#| msgid "User group list"
+msgid "UserGroups Delete"
+msgstr "用户组列表"
 
-#: users/templates/users/user_group_list.html:86
-#: users/templates/users/user_group_list.html:91
+#: users/templates/users/user_group_list.html:100
+msgid "UserGroup Deleting failed."
+msgstr ""
+
+#: users/templates/users/user_list.html:42
+#, fuzzy
+#| msgid "Deactive selected"
+msgid "Active selected"
+msgstr "禁用所选"
+
+#: users/templates/users/user_list.html:167
+msgid "This will delete the selected users !!!"
+msgstr ""
+
+# msgid "Deleted!"
+# msgstr "删除"
+#: users/templates/users/user_list.html:175
+#, fuzzy
+#| msgid "has been deleted."
+msgid "User Deleted."
+msgstr "已被删除"
+
+#: users/templates/users/user_list.html:176
+#: users/templates/users/user_list.html:181
 #, fuzzy
 #| msgid "Delete"
-msgid "Group Delete"
+msgid "User Delete"
 msgstr "删除"
 
-#: users/templates/users/user_group_list.html:90
-msgid "Group Deleting failed."
-msgstr ""
+#: users/templates/users/user_list.html:180
+#, fuzzy
+#| msgid "User detail"
+msgid "User Deleting failed."
+msgstr "用户详情"
 
-#: users/templates/users/user_group_list.html:103
-msgid ""
-"This will delete the selected group, but will not remove any user in this "
-"group."
+#: users/templates/users/user_list.html:240
+msgid "The selected users has been updated successfully."
 msgstr ""
 
-#: users/templates/users/user_group_list.html:126
-msgid "This will delete the selected groups !!!"
-msgstr ""
+#: users/templates/users/user_list.html:241
+#, fuzzy
+#| msgid "Update"
+msgid "User Updated"
+msgstr "更新"
 
-#: users/templates/users/user_group_list.html:134
+#: users/templates/users/user_profile.html:98
 #, fuzzy
-#| msgid "User group list"
-msgid "UserGroups Deleted."
-msgstr "用户组列表"
+#| msgid "SSH private key"
+msgid "Update Public Key"
+msgstr "ssh密钥"
 
-#: users/templates/users/user_group_list.html:135
-#: users/templates/users/user_group_list.html:140
+#: users/templates/users/user_profile.html:109
 #, fuzzy
-#| msgid "User group list"
-msgid "UserGroups Delete"
-msgstr "用户组列表"
+#| msgid "SSH private key"
+msgid "Paste your SSH Public Key here"
+msgstr "ssh密钥"
 
-#: users/templates/users/user_group_list.html:139
-msgid "UserGroup Deleting failed."
-msgstr ""
+#: users/templates/users/user_profile.html:131
+#, fuzzy
+#| msgid "SSH private key"
+msgid "Failed to update SSH public key."
+msgstr "ssh密钥"
 
-#: users/templates/users/user_update.html:3 users/views.py:138
+#: users/templates/users/user_update.html:3 users/views/user.py:102
 msgid "Update user"
 msgstr "编辑用户"
 
-#: users/utils.py:48
-msgid "Begin to generate ssh private key ..."
-msgstr "开始生成ssh密钥"
-
-#: users/utils.py:60
-msgid "Finish to generate ssh private key ..."
-msgstr "生成ssh密钥成功"
-
-#: users/utils.py:64
-msgid "These is error when generate ssh key."
-msgstr "创建密钥失败"
-
-#: users/utils.py:68
+#: users/utils.py:40
 msgid "Create account successfully"
 msgstr "创建账户成功"
 
-#: users/utils.py:70
+#: users/utils.py:42
 #, python-format
 msgid ""
 "\n"
@@ -2188,8 +2533,29 @@ msgstr ""
 "    </br>\n"
 "    "
 
-#: users/utils.py:101
-#, python-format
+#: users/utils.py:73
+#, fuzzy, python-format
+#| msgid ""
+#| "\n"
+#| "    Hello %(name)s:\n"
+#| "    </br>\n"
+#| "    Please click the link below to reset your password, if not your "
+#| "request, concern your account security\n"
+#| "    </br>\n"
+#| "    <a href=\"%(rest_password_url)s?token=%(rest_password_token)s\">Click "
+#| "here reset password</a>\n"
+#| "    </br>\n"
+#| "    This link is valid for 1 hour. After it expires, <a href="
+#| "\"%(forget_password_url)s?email=%(email)s\">request new one<</a>\n"
+#| "\n"
+#| "    </br>\n"
+#| "    ---\n"
+#| "\n"
+#| "    </br>\n"
+#| "    <a href=\"%(login_url)s\">Login direct</a>\n"
+#| "\n"
+#| "    </br>\n"
+#| "    "
 msgid ""
 "\n"
 "    Hello %(name)s:\n"
@@ -2201,7 +2567,7 @@ msgid ""
 "here reset password</a>\n"
 "    </br>\n"
 "    This link is valid for 1 hour. After it expires, <a href="
-"\"%(forget_password_url)s?email=%(email)s\">request new one<</a>\n"
+"\"%(forget_password_url)s?email=%(email)s\">request new one</a>\n"
 "\n"
 "    </br>\n"
 "    ---\n"
@@ -2232,13 +2598,13 @@ msgstr ""
 "    </br>\n"
 "    "
 
-#: users/utils.py:132
+#: users/utils.py:104
 #, fuzzy
 #| msgid "SSH private key"
 msgid "SSH Key Reset"
 msgstr "ssh密钥"
 
-#: users/utils.py:134
+#: users/utils.py:106
 #, python-format
 msgid ""
 "\n"
@@ -2253,76 +2619,249 @@ msgid ""
 "    "
 msgstr ""
 
-#: users/views.py:75
-msgid "Logout success"
-msgstr "退出登录成功"
-
-#: users/views.py:76
-msgid "Logout success, return login page"
-msgstr "退出登录成功，返回到登录页面"
-
-#: users/views.py:89
-msgid "User list"
+#: users/utils.py:139
+#, fuzzy
+#| msgid "User list"
+msgid "User not exist"
 msgstr "用户列表"
 
-#: users/views.py:98
-#, fuzzy, python-format
-#| msgid "Create user <a href=\"%s\">%s</a> success."
-msgid "Create user <a href=\"%s\">%s</a> successfully."
-msgstr "创建用户 <a href=\"%s\">%s</a> 成功"
+#: users/utils.py:141
+#, fuzzy
+#| msgid "Date expired"
+msgid "Disabled or expired"
+msgstr "失效日期"
 
-#: users/views.py:159
+#: users/utils.py:154
+msgid "Password or SSH public key invalid"
+msgstr ""
+
+#: users/views/group.py:30
 msgid "User group list"
 msgstr "用户组列表"
 
-#: users/views.py:172
+#: users/views/group.py:43
 msgid "Create user group"
 msgstr "创建用户组"
 
-#: users/views.py:198
+#: users/views/group.py:71
 #, fuzzy
 #| msgid "Update user"
 msgid "Update User Group"
 msgstr "编辑用户"
 
-#: users/views.py:235
-msgid "Email address invalid, input again"
+#: users/views/login.py:74
+msgid "Logout success"
+msgstr "退出登录成功"
+
+#: users/views/login.py:75
+msgid "Logout success, return login page"
+msgstr "退出登录成功，返回到登录页面"
+
+#: users/views/login.py:90
+#, fuzzy
+#| msgid "Email address invalid, input again"
+msgid "Email address invalid, please input again"
 msgstr "邮箱地址错误，重新输入"
 
-#: users/views.py:246
+#: users/views/login.py:103
 msgid "Send reset password message"
 msgstr "发送重置密码邮件"
 
-#: users/views.py:247
+#: users/views/login.py:104
 msgid "Send reset password mail success, login your mail box and follow it "
 msgstr ""
 "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)"
 
-#: users/views.py:259
+#: users/views/login.py:118
 msgid "Reset password success"
 msgstr "重置密码成功"
 
-#: users/views.py:260
+#: users/views/login.py:119
 msgid "Reset password success, return to login page"
 msgstr "重置密码成功，返回到登录页面"
 
-#: users/views.py:276 users/views.py:289
+#: users/views/login.py:136 users/views/login.py:149
 msgid "Token invalid or expired"
 msgstr "Token错误或失效"
 
-#: users/views.py:285
+#: users/views/login.py:145
 msgid "Password not same"
 msgstr "密码不一致"
 
-#: users/views.py:447
+#: users/views/user.py:51
+msgid "User list"
+msgstr "用户列表"
+
+#: users/views/user.py:62
+#, fuzzy, python-format
+#| msgid "Create user <a href=\"%s\">%s</a> success."
+msgid "Create user <a href=\"%s\">%s</a> successfully."
+msgstr "创建用户 <a href=\"%s\">%s</a> 成功"
+
+#: users/views/user.py:171
 msgid "Invalid file."
 msgstr ""
 
-#: users/views.py:461
 #, fuzzy
-#| msgid "ssh private key"
-msgid "Not a valid Excel file."
-msgstr "ssh密钥"
+#~| msgid "Select assets"
+#~ msgid "Select asset tags"
+#~ msgstr "选择资产"
+
+#, fuzzy
+#~| msgid "System user"
+#~ msgid "Select asset system users"
+#~ msgstr "系统"
+
+#~ msgid "KEY"
+#~ msgstr "KEY"
+
+#~ msgid "VALUE"
+#~ msgstr "VALUE"
+
+#~ msgid "status"
+#~ msgstr "状态"
+
+#, fuzzy
+#~ msgid "Testing"
+#~ msgstr "设置"
+
+#~ msgid "Auto update pass/key"
+#~ msgstr "自动更新密码/密钥"
+
+#~ msgid "Brand"
+#~ msgstr "品牌"
+
+#, fuzzy
+#~| msgid "Asset group list"
+#~ msgid "Asset login log"
+#~ msgstr "资产组列表"
+
+#, fuzzy
+#~| msgid "Asset group"
+#~ msgid "Asset group perm"
+#~ msgstr "资产组"
+
+#, fuzzy
+#~| msgid "System user"
+#~ msgid "repush system user"
+#~ msgstr "系统"
+
+#, fuzzy
+#~| msgid "Select assets"
+#~ msgid "Select asset user"
+#~ msgstr "选择资产"
+
+#~ msgid "Export selected"
+#~ msgstr "批量导出"
+
+#, fuzzy
+#~| msgid "Operator"
+#~ msgid "operation"
+#~ msgstr "运营商"
+
+#, fuzzy
+#~| msgid "Asset group"
+#~ msgid "Asset group num"
+#~ msgstr "资产组"
+
+#, fuzzy
+#~| msgid "Asset group list"
+#~ msgid "Asset Tags list"
+#~ msgstr "资产组列表"
+
+#, fuzzy
+#~| msgid "Asset group list"
+#~ msgid "Asset Tags detail"
+#~ msgstr "资产组列表"
+
+#, fuzzy
+#~| msgid "Hostname"
+#~ msgid "Hosts"
+#~ msgstr "主机名"
+
+#, fuzzy
+#~| msgid "User list"
+#~ msgid "User_Alias"
+#~ msgstr "用户列表"
+
+#, fuzzy
+#~| msgid "Password"
+#~ msgid "Is_NoPassword"
+#~ msgstr "密码"
+
+#~ msgid "Label"
+#~ msgstr "标签"
+
+#~ msgid "Cron"
+#~ msgstr "Cron"
+
+#~ msgid "File"
+#~ msgstr "文件"
+
+#~ msgid "File upload"
+#~ msgstr "文件上传"
+
+#~ msgid "Settings"
+#~ msgstr "设置"
+
+#, fuzzy
+#~| msgid "User"
+#~ msgid "User "
+#~ msgstr "用户"
+
+#, fuzzy
+#~| msgid "User group"
+#~ msgid "User group "
+#~ msgstr "用户组"
+
+#, fuzzy
+#~| msgid "Asset"
+#~ msgid "Asset "
+#~ msgstr "资产"
+
+#, fuzzy
+#~| msgid "Asset group"
+#~ msgid "Asset group "
+#~ msgstr "资产组"
+
+#, fuzzy
+#~| msgid "System user"
+#~ msgid "System user "
+#~ msgstr "系统"
+
+#, fuzzy
+#~| msgid "Update user"
+#~ msgid "Update ssh key"
+#~ msgstr "编辑用户"
+
+#, fuzzy
+#~| msgid "Create asset group"
+#~ msgid "Granted assets of "
+#~ msgstr "创建资产组"
+
+#, fuzzy
+#~| msgid "Create asset"
+#~ msgid "Created at"
+#~ msgstr "创建资产"
+
+#, fuzzy
+#~| msgid "Asset group"
+#~ msgid "Asset Amount"
+#~ msgstr "资产组"
+
+#~ msgid "Begin to generate ssh private key ..."
+#~ msgstr "开始生成ssh密钥"
+
+#~ msgid "Finish to generate ssh private key ..."
+#~ msgstr "生成ssh密钥成功"
+
+#~ msgid "These is error when generate ssh key."
+#~ msgstr "创建密钥失败"
+
+#, fuzzy
+#~| msgid "ssh private key"
+#~ msgid "Not a valid Excel file."
+#~ msgstr "ssh密钥"
 
 #~ msgid "Network"
 #~ msgstr "网络"
@@ -2353,9 +2892,6 @@ msgstr "ssh密钥"
 #~ msgid "Create perm"
 #~ msgstr "创建权限"
 
-#~ msgid "User assets"
-#~ msgstr "用户资产"
-
 #~ msgid "User log"
 #~ msgstr "登录日志"