diff --git a/src/locales/en.json b/src/locales/en.json index 98cd647c..8af017a7 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -275,7 +275,7 @@ "CPU Policy": "CPU Policy", "CPU Thread Policy": "CPU Thread Policy", "CPU Usage(%)": "CPU Usage(%)", - "CPU usage Num (Core)": "CPU usage Num (Core)", + "CPU Usages (Core)": "CPU Usages (Core)", "CPU value is { cpu }, NUMA CPU value is { totalCpu }, need to be equal. ": "CPU value is { cpu }, NUMA CPU value is { totalCpu }, need to be equal. ", "CPU(Core)": "CPU(Core)", "CPUs": "CPUs", @@ -1422,7 +1422,7 @@ "Memory Page": "Memory Page", "Memory Page Size": "Memory Page Size", "Memory Usage": "Memory Usage", - "Memory usage Num (GiB)": "Memory usage Num (GiB)", + "Memory Usages (GiB)": "Memory Usages (GiB)", "Mesos": "Mesos", "Message": "Message", "Message Details": "Message Details", @@ -1537,7 +1537,6 @@ "Node ID/Name": "Node ID/Name", "Node Info": "Node Info", "Node Name": "Node Name", - "Node Num": "Node Num", "Node Spec": "Node Spec", "Node Spec *": "Node Spec *", "Nodes": "Nodes", @@ -2448,7 +2447,6 @@ "Use an Existing Network": "Use an Existing Network", "Used": "Used", "Used IPs": "Used IPs", - "Used Resource": "Used Resource", "Used by tunnel(s): {names}. ID(s): {ids}": "Used by tunnel(s): {names}. ID(s): {ids}", "User": "User", "User Account": "User Account", @@ -2513,8 +2511,8 @@ "Virtual Adapters": "Virtual Adapters", "Virtual LAN": "Virtual LAN", "Virtual LANs": "Virtual LANs", - "Virtual Resource Num": "Virtual Resource Num", "Virtual Resource Overview": "Virtual Resource Overview", + "Virtual Resources Used": "Virtual Resources Used", "Virtual adapter mainly used for binding instance and other operations, occupying the quota of the port.": "Virtual adapter mainly used for binding instance and other operations, occupying the quota of the port.", "VirtualAdapter Mac": "VirtualAdapter Mac", "Visibility": "Visibility", diff --git a/src/locales/zh.json b/src/locales/zh.json index 1e1218c7..a84bc07f 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -275,7 +275,7 @@ "CPU Policy": "CPU策略", "CPU Thread Policy": "CPU线程策略", "CPU Usage(%)": "CPU使用率(%)", - "CPU usage Num (Core)": "CPU使用量 (核)", + "CPU Usages (Core)": "CPU用量 (核)", "CPU value is { cpu }, NUMA CPU value is { totalCpu }, need to be equal. ": "CPU核数是 { cpu },NUMA节点的CPU核数是{ totalCpu },需要一致。", "CPU(Core)": "CPU(核数)", "CPUs": "CPU", @@ -1422,7 +1422,7 @@ "Memory Page": "内存页", "Memory Page Size": "内存页大小", "Memory Usage": "内存使用量", - "Memory usage Num (GiB)": "内存用量 (GiB)", + "Memory Usages (GiB)": "内存用量 (GiB)", "Mesos": "Mesos", "Message": "消息", "Message Details": "消息详情", @@ -1537,7 +1537,6 @@ "Node ID/Name": "节点ID/名称", "Node Info": "节点信息", "Node Name": "节点名称", - "Node Num": "节点总数", "Node Spec": "节点规格", "Node Spec *": "节点规格 *", "Nodes": "节点", @@ -2448,7 +2447,6 @@ "Use an Existing Network": "使用现有网络", "Used": "已使用", "Used IPs": "已用IP", - "Used Resource": "已用", "Used by tunnel(s): {names}. ID(s): {ids}": "被隧道使用中:{names}。 ID:{ids}", "User": "用户", "User Account": "用户账户", @@ -2513,8 +2511,8 @@ "Virtual Adapters": "虚拟网卡", "Virtual LAN": "虚拟网卡", "Virtual LANs": "块虚拟网卡", - "Virtual Resource Num": "虚拟资源用量", "Virtual Resource Overview": "虚拟资源总览", + "Virtual Resources Used": "虚拟资源用量", "Virtual adapter mainly used for binding instance and other operations, occupying the quota of the port.": "虚拟网卡,主要用于绑定云主机等操作,占用端口的配额。", "VirtualAdapter Mac": "虚拟网卡的MAC", "Visibility": "可见性", diff --git a/src/pages/base/containers/AdminOverview/components/PlatformInfo.jsx b/src/pages/base/containers/AdminOverview/components/PlatformInfo.jsx index 6809c7cd..ce6aa2eb 100644 --- a/src/pages/base/containers/AdminOverview/components/PlatformInfo.jsx +++ b/src/pages/base/containers/AdminOverview/components/PlatformInfo.jsx @@ -27,21 +27,21 @@ import styles from '../style.less'; export const actions = [ { key: 'projectNum', - label: t('Project Num'), + label: t('Projects'), avatar: , color: '#000000', to: '/identity/project-admin', }, { key: 'userNum', - label: t('User Num'), + label: t('Users'), avatar: , color: '#000000', to: '/identity/user-admin', }, { key: 'nodeNum', - label: t('Node Num'), + label: t('Nodes'), avatar: , color: '#000000', to: '/compute/hypervisors-admin?tab=ComputeHost', diff --git a/src/pages/base/containers/AdminOverview/components/VirtualResource.jsx b/src/pages/base/containers/AdminOverview/components/VirtualResource.jsx index b8a304aa..6ef0b1b9 100644 --- a/src/pages/base/containers/AdminOverview/components/VirtualResource.jsx +++ b/src/pages/base/containers/AdminOverview/components/VirtualResource.jsx @@ -21,12 +21,12 @@ export const resourceCircle = [ { resource: 'vcpus', used: 'vcpus_used', - label: t('CPU usage Num (Core)'), + label: t('CPU Usages (Core)'), }, { resource: 'memory_mb', used: 'memory_mb_used', - label: t('Memory usage Num (GiB)'), + label: t('Memory Usages (GiB)'), }, ]; @@ -88,7 +88,7 @@ export class ResourceCircle extends Component { backgroundColor: circleColor, }} /> - {`${t('Used Resource')}: ${used}`} + {`${t('Used')}: ${used}`}