github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-19 17:54:37 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bai
2020-06-04 15:56:08 +08:00
parent aebc4856ee f09e34a02f
commit 2350e12699
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/i18n/langs/cn.json
View File

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

4
src/i18n/langs/en.json
View File

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

4
src/views/settings/Terminal.vue
View File

@@ -71,8 +71,8 @@ export default {
label: this.$t('setting.terminalAssetListPageSize'), label: this.$t('setting.terminalAssetListPageSize'),
type: 'select', type: 'select',
options: [ options: [
{ label: 'All', value: 'all' }, { label: this.$t('setting.all'), value: 'all' },
{ label: 'Auto', value: 'auto' }, { label: this.$t('setting.auto'), value: 'auto' },
{ label: '10', value: '10' }, { label: '10', value: '10' },
{ label: '15', value: '15' }, { label: '15', value: '15' },
{ label: '25', value: '25' }, { label: '25', value: '25' },