From 666815b324ede1f24d96d5ecca46c81522bc4fa2 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 12 Oct 2018 15:04:01 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/forms/asset.py | 4 ++-- apps/locale/zh/LC_MESSAGES/django.mo | Bin 52759 -> 52902 bytes apps/locale/zh/LC_MESSAGES/django.po | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py index 8b132b350..28c78e981 100644 --- a/apps/assets/forms/asset.py +++ b/apps/assets/forms/asset.py @@ -48,7 +48,7 @@ class AssetCreateForm(OrgModelForm): 'root or other NOPASSWD sudo privilege user existed in asset,' 'If asset is windows or other set any one, more see admin user left menu' ), - # 'platform': _("* required Must set exact system platform, Windows, Linux ..."), + 'platform': _("Windows 2016 RDP protocol is different, If is window 2016, set it"), 'domain': _("If your have some network not connect with each other, you can set domain") } @@ -88,7 +88,7 @@ class AssetUpdateForm(OrgModelForm): 'root or other NOPASSWD sudo privilege user existed in asset,' 'If asset is windows or other set any one, more see admin user left menu' ), - # 'platform': _("* required Must set exact system platform, Windows, Linux ..."), + 'platform': _("Windows 2016 RDP protocol is different, If is window 2016, set it"), 'domain': _("If your have some network not connect with each other, you can set domain") } diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 79cfc7f2516894c300d85b4c497b1b0a1abe3861..41d58f1c13259e08ddb1cc1ecafefbf61261203a 100644 GIT binary patch delta 12150 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 RxxMvJ))!mT!%qL>`+xLs`?3H4 delta 12042 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\n" "Language-Team: Jumpserver team\n" @@ -84,6 +84,10 @@ msgstr "" "root或其他拥有NOPASSWD: ALL权限的用户, 如果是windows或其它硬件可以随意设置一" "个, 更多信息查看左侧 `管理用户` 菜单" +#: assets/forms/asset.py:51 assets/forms/asset.py:91 +msgid "Windows 2016 RDP protocol is different, If is window 2016, set it" +msgstr "Windows 2016的RDP协议与之前不同,如果是请设置" + #: assets/forms/asset.py:52 assets/forms/asset.py:92 msgid "" "If your have some network not connect with each other, you can set domain" @@ -1293,7 +1297,9 @@ msgid "When user login asset with this system user, then run a command," msgstr "当用户使用这个系统用户登录资产,然后执行一个命令" #: assets/templates/assets/cmd_filter_list.html:8 -msgid "The command will be filter by rules, higher priority(lower number) rule run first," +msgid "" +"The command will be filter by rules, higher priority(lower number) rule run " +"first," msgstr "这个命令需要被绑定过滤器的所有规则匹配,高优先级(数字越低)先被匹配," #: assets/templates/assets/cmd_filter_list.html:9