Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue

nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue

@@ -106,7 +106,7 @@ export default {
             disabled: false
           }, {
             id: 17,
-            name: this.$t('config.terminallog.stat us'),
+            name: this.$t('config.terminallog.status'),
             type: 'terminalStatus',
             label: 'state',
             readonly: true,