Merge branch 'dev' of github.com:jumpserver/lina into dev

This commit is contained in:
ibuler
2020-06-08 15:23:03 +08:00
2 changed files with 5 additions and 3 deletions

View File

@@ -638,7 +638,9 @@
"consult": "咨询",
"ImportLicense": "导入许可证",
"AssetCount": "资产数量",
"ImportLicenseTip": "请导入许可证"
"ImportLicenseTip": "请导入许可证",
"all": "全部",
"auto": "自动"
},
"settings": {
"setting": ""

View File

@@ -629,8 +629,8 @@
"AssetCount": "Asset count",
"ImportLicenseTip": "Please Import License",
"ApiKeyList": "Api key list",
"DateCreated": "",
"Create": ""
"all": "All",
"auto": "Auto"
},
"settings": {
"setting": ""