diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 422c31274..7f06fc7ba 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 89584ac35..0cbe59724 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: 2018-10-10 15:11+0800\n" +"POT-Creation-Date: 2018-10-10 19:30+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -36,7 +36,7 @@ msgstr "测试节点下资产是否可连接: {}" #: assets/forms/asset.py:27 assets/models/asset.py:82 assets/models/user.py:112 #: assets/templates/assets/asset_detail.html:183 #: assets/templates/assets/asset_detail.html:191 -#: assets/templates/assets/system_user_asset.html:94 perms/models.py:32 +#: assets/templates/assets/system_user_asset.html:95 perms/models.py:32 msgid "Nodes" msgstr "节点管理" @@ -99,7 +99,7 @@ msgstr "选择资产" #: assets/models/domain.py:48 assets/templates/assets/admin_user_assets.html:53 #: assets/templates/assets/asset_detail.html:69 #: assets/templates/assets/domain_gateway_list.html:58 -#: assets/templates/assets/system_user_asset.html:51 +#: assets/templates/assets/system_user_asset.html:52 #: assets/templates/assets/user_asset_list.html:163 msgid "Port" msgstr "端口" @@ -242,7 +242,7 @@ msgstr "如果选择手动登录模式,用户名和密码则不需要填写" #: assets/templates/assets/asset_detail.html:61 #: assets/templates/assets/asset_list.html:93 #: assets/templates/assets/domain_gateway_list.html:57 -#: assets/templates/assets/system_user_asset.html:50 +#: assets/templates/assets/system_user_asset.html:51 #: assets/templates/assets/user_asset_list.html:46 #: assets/templates/assets/user_asset_list.html:162 #: audits/templates/audits/login_log_list.html:52 common/forms.py:133 @@ -256,7 +256,7 @@ msgstr "IP" #: assets/templates/assets/admin_user_assets.html:51 #: assets/templates/assets/asset_detail.html:57 #: assets/templates/assets/asset_list.html:92 -#: assets/templates/assets/system_user_asset.html:49 +#: assets/templates/assets/system_user_asset.html:50 #: assets/templates/assets/user_asset_list.html:45 #: assets/templates/assets/user_asset_list.html:161 common/forms.py:132 #: perms/templates/perms/asset_permission_asset.html:54 @@ -360,7 +360,7 @@ msgstr "标签管理" #: assets/models/asset.py:126 assets/models/base.py:30 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:24 -#: assets/models/cmd_filter.py:54 assets/models/group.py:21 +#: assets/models/cmd_filter.py:53 assets/models/group.py:21 #: assets/templates/assets/admin_user_detail.html:68 #: assets/templates/assets/asset_detail.html:117 #: assets/templates/assets/cmd_filter_detail.html:77 @@ -389,7 +389,7 @@ msgstr "创建日期" #: assets/models/asset.py:131 assets/models/base.py:27 #: assets/models/cluster.py:29 assets/models/cmd_filter.py:21 -#: assets/models/cmd_filter.py:51 assets/models/domain.py:19 +#: assets/models/cmd_filter.py:50 assets/models/domain.py:19 #: assets/models/domain.py:51 assets/models/group.py:23 #: assets/models/label.py:22 assets/templates/assets/admin_user_detail.html:72 #: assets/templates/assets/admin_user_list.html:32 @@ -495,20 +495,19 @@ msgstr "正则表达式" msgid "Command" msgstr "命令" -#: assets/models/cmd_filter.py:41 +#: assets/models/cmd_filter.py:40 msgid "Deny" msgstr "拒绝" -#: assets/models/cmd_filter.py:42 -#: terminal/templates/terminal/terminal_list.html:76 -msgid "Accept" -msgstr "接受" +#: assets/models/cmd_filter.py:41 +msgid "Allow" +msgstr "允许" -#: assets/models/cmd_filter.py:46 +#: assets/models/cmd_filter.py:45 msgid "Filter" msgstr "过滤器" -#: assets/models/cmd_filter.py:47 +#: assets/models/cmd_filter.py:46 #: assets/templates/assets/cmd_filter_rule_list.html:58 #: audits/templates/audits/login_log_list.html:50 #: common/templates/common/terminal_setting.html:73 @@ -516,21 +515,21 @@ msgstr "过滤器" msgid "Type" msgstr "类型" -#: assets/models/cmd_filter.py:48 assets/models/user.py:114 +#: assets/models/cmd_filter.py:47 assets/models/user.py:114 #: assets/templates/assets/cmd_filter_rule_list.html:60 msgid "Priority" msgstr "优先级" -#: assets/models/cmd_filter.py:49 +#: assets/models/cmd_filter.py:48 #: assets/templates/assets/cmd_filter_rule_list.html:59 msgid "Content" msgstr "内容" -#: assets/models/cmd_filter.py:49 +#: assets/models/cmd_filter.py:48 msgid "One line one command" msgstr "每行一个命令" -#: assets/models/cmd_filter.py:50 +#: assets/models/cmd_filter.py:49 #: assets/templates/assets/admin_user_list.html:33 #: assets/templates/assets/asset_list.html:97 #: assets/templates/assets/cmd_filter_list.html:18 @@ -538,7 +537,7 @@ msgstr "每行一个命令" #: assets/templates/assets/domain_gateway_list.html:62 #: assets/templates/assets/domain_list.html:29 #: assets/templates/assets/label_list.html:17 -#: assets/templates/assets/system_user_asset.html:53 +#: assets/templates/assets/system_user_asset.html:54 #: assets/templates/assets/system_user_list.html:38 audits/models.py:37 #: audits/templates/audits/operate_log_list.html:41 #: audits/templates/audits/operate_log_list.html:67 @@ -618,7 +617,7 @@ msgstr "手动登录" #: assets/models/user.py:113 #: assets/templates/assets/_asset_group_bulk_update_modal.html:11 -#: assets/templates/assets/system_user_asset.html:21 +#: assets/templates/assets/system_user_asset.html:22 #: assets/templates/assets/system_user_detail.html:22 #: assets/views/admin_user.py:29 assets/views/admin_user.py:47 #: assets/views/admin_user.py:63 assets/views/admin_user.py:78 @@ -880,7 +879,7 @@ msgstr "关闭" #: assets/templates/assets/cmd_filter_rule_list.html:19 #: assets/templates/assets/domain_detail.html:18 #: assets/templates/assets/domain_gateway_list.html:18 -#: assets/templates/assets/system_user_asset.html:17 +#: assets/templates/assets/system_user_asset.html:18 #: assets/templates/assets/system_user_detail.html:18 #: ops/templates/ops/adhoc_history.html:130 #: ops/templates/ops/task_adhoc.html:116 @@ -903,14 +902,14 @@ msgstr "资产列表" #: assets/templates/assets/admin_user_assets.html:54 #: assets/templates/assets/admin_user_list.html:29 -#: assets/templates/assets/system_user_asset.html:52 +#: assets/templates/assets/system_user_asset.html:53 #: assets/templates/assets/system_user_list.html:34 #: users/templates/users/user_group_granted_asset.html:47 msgid "Reachable" msgstr "可连接" #: assets/templates/assets/admin_user_assets.html:66 -#: assets/templates/assets/system_user_asset.html:65 +#: assets/templates/assets/system_user_asset.html:66 #: assets/templates/assets/system_user_detail.html:116 #: perms/templates/perms/asset_permission_detail.html:114 msgid "Quick update" @@ -923,8 +922,8 @@ msgstr "测试可连接性" #: assets/templates/assets/admin_user_assets.html:75 #: assets/templates/assets/asset_detail.html:171 -#: assets/templates/assets/system_user_asset.html:74 -#: assets/templates/assets/system_user_asset.html:160 +#: assets/templates/assets/system_user_asset.html:75 +#: assets/templates/assets/system_user_asset.html:161 #: assets/templates/assets/system_user_detail.html:151 msgid "Test" msgstr "测试" @@ -1002,7 +1001,7 @@ msgstr "选择节点" #: assets/templates/assets/asset_detail.html:200 #: assets/templates/assets/asset_list.html:633 #: assets/templates/assets/cmd_filter_detail.html:106 -#: assets/templates/assets/system_user_asset.html:111 +#: assets/templates/assets/system_user_asset.html:112 #: assets/templates/assets/system_user_detail.html:182 #: assets/templates/assets/system_user_list.html:143 templates/_modal.html:22 #: terminal/templates/terminal/session_detail.html:108 @@ -1352,27 +1351,27 @@ msgstr "创建网域" msgid "Create label" msgstr "创建标签" -#: assets/templates/assets/system_user_asset.html:30 +#: assets/templates/assets/system_user_asset.html:31 msgid "Assets of " msgstr "资产" -#: assets/templates/assets/system_user_asset.html:71 +#: assets/templates/assets/system_user_asset.html:72 #: assets/templates/assets/system_user_detail.html:148 msgid "Test assets connective" msgstr "测试资产可连接性" -#: assets/templates/assets/system_user_asset.html:80 +#: assets/templates/assets/system_user_asset.html:81 #: assets/templates/assets/system_user_detail.html:139 msgid "Push system user now" msgstr "立刻推送系统" -#: assets/templates/assets/system_user_asset.html:83 -#: assets/templates/assets/system_user_asset.html:158 +#: assets/templates/assets/system_user_asset.html:84 +#: assets/templates/assets/system_user_asset.html:159 #: assets/templates/assets/system_user_detail.html:142 msgid "Push" msgstr "推送" -#: assets/templates/assets/system_user_asset.html:102 +#: assets/templates/assets/system_user_asset.html:103 msgid "Add to node" msgstr "添加到节点" @@ -1532,11 +1531,11 @@ msgstr "更新系统用户" msgid "System user detail" msgstr "系统用户详情" -#: assets/views/system_user.py:95 +#: assets/views/system_user.py:96 msgid "assets" msgstr "资产管理" -#: assets/views/system_user.py:96 +#: assets/views/system_user.py:97 msgid "System user asset" msgstr "系统用户集群资产" @@ -2868,6 +2867,10 @@ msgstr "地址" msgid "Alive" msgstr "在线" +#: terminal/templates/terminal/terminal_list.html:76 +msgid "Accept" +msgstr "接受" + #: terminal/templates/terminal/terminal_list.html:78 msgid "Reject" msgstr "拒绝"