[Update] Merge branch master to local dev

pull/2790/head
BaiJiangJie 2019-06-12 17:57:58 +08:00
commit 9f9f22548f
3 changed files with 9 additions and 3 deletions

View File

@ -93,7 +93,7 @@ Jumpserver 采纳分布式架构,支持多机房跨区域部署,中心节点
</td>
</tr>
<tr class="subscription-level-tr-border">
<td class="features-first-td-background-style" rowspan="8">授权控制 Authorization</td>
<td class="features-first-td-background-style" rowspan="9">授权控制 Authorization</td>
<td class="features-second-td-background-style" rowspan="3">资产授权管理
</td>
<td class="features-third-td-background-style">资产树
@ -107,6 +107,12 @@ Jumpserver 采纳分布式架构,支持多机房跨区域部署,中心节点
<td class="features-third-td-background-style">节点内资产自动继承授权
</td>
</tr>
<tr class="subscription-level-tr-border">
<td class="features-outline-td-background-style">RemoteApp(X-PACK)
</td>
<td class="features-outline-td-background-style">实现更细粒度的应用级授权
</td>
</tr>
<tr class="subscription-level-tr-border">
<td class="features-outline-td-background-style">组织管理(X-PACK)
</td>

Binary file not shown.

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Jumpserver 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-06-12 16:59+0800\n"
"POT-Creation-Date: 2019-06-12 17:56+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"
@ -595,7 +595,7 @@ msgstr "远程应用详情"
msgid "My RemoteApp"
msgstr "我的远程应用"
#: assets/api/asset.py:126
#: assets/api/asset.py:128
msgid "Please select assets that need to be updated"
msgstr "请选择需要更新的资产"