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

src/i18n/langs/cn.json

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

src/i18n/langs/en.json

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

src/views/settings/Terminal.vue

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