Merge remote-tracking branch 'origin/codeCheck' into codeCheck

# Conflicts:
#	nezha-fronted/src/components/common/header.vue
This commit is contained in:
wanghaoyu
2019-12-26 17:30:10 +08:00
31 changed files with 2851 additions and 3181 deletions

View File

@@ -18,17 +18,39 @@ const en = {
clearAll: "Clear All",
clear: "Clear",
name: 'Name',
cover: 'Cover'
cover: 'Cover',
signOut: 'Sign Out'
},
dashboard:{
title:'Dashboard',
panel:{
title:'Panel',
//侧滑框
createPanelTitle: "Create Panel",
createPanelTitleSec:"Create New Panel",
editPanelTitle: "Panel",
panelForm:{
panelName:"Panel Name",
panelId:"ID"
}
},
metricPreview:{
title:'MetricPreview',
}
},
search: {
searchTip: 'Press Enter or click to search'
searchTip: 'Press Enter or click to search',
recentSearch: 'Recent Searches',
noRecentSearch: 'No Recent Searches'
},
tip: {
confirmDelete: "Confirm Delete?",
yes: "Yes",
no: "No",
deleteSuccess: "Successfully Deleted",
saveSuccess: "Successfully Saved"
saveSuccess: "Successfully Saved",
coverSuccess: 'Successfully Covered'
},
asset:{
createAsset: "Create Asset",
@@ -141,7 +163,8 @@ const en = {
accountId: "Accound ID",
createAccount: "Create Account",
editAccount: "Edit Account",
notCurrentlySupport: 'Not currently supported'
notCurrentlySupport: 'Not currently supported',
password: 'Password'
},
promServer: {
promServerList: "Prometheus Server",