Merge "fix: update 'gigabytes' to 'capacity' in the titile"

src/locales/en.json

@@ -1002,7 +1002,6 @@
   "Get {name} error.": "Get {name} error.",
   "Ghana": "Ghana",
   "Gibraltar": "Gibraltar",
-  "Gigabytes (GiB)": "Gigabytes (GiB)",
   "Given IP": "Given IP",
   "Glance": "Glance",
   "Global Setting": "Global Setting",
@@ -1920,7 +1919,6 @@
   "Reset failed, please retry": "Reset failed, please retry",
   "Resize": "Resize",
   "Resize Cluster": "Resize Cluster",
-  "Resize Container": "Resize Container",
   "Resize Instance": "Resize Instance",
   "Resized": "Resized",
   "Resizing or Migrating": "Resizing or Migrating",
@@ -2046,9 +2044,9 @@
   "Set IP": "Set IP",
   "Seychelles": "Seychelles",
   "Share": "Share",
+  "Share Capacity (GiB)": "Share Capacity (GiB)",
   "Share Detail": "Share Detail",
   "Share File Storage": "Share File Storage",
-  "Share Gigabytes(GiB)": "Share Gigabytes(GiB)",
   "Share Group": "Share Group",
   "Share Group Detail": "Share Group Detail",
   "Share Group Type": "Share Group Type",
@@ -2104,7 +2102,6 @@
   "Singapore": "Singapore",
   "Size": "Size",
   "Size (GiB)": "Size (GiB)",
-  "Size(GiB)": "Size(GiB)",
   "Slovakia (Slovak Republic)": "Slovakia (Slovak Republic)",
   "Slovenia": "Slovenia",
   "Slow Query": "Slow Query",
@@ -2536,10 +2533,11 @@
   "Visualization Compute Optimized Type with GPU": "Visualization Compute Optimized Type with GPU",
   "Volume": "Volume",
   "Volume Backup": "Volume Backup",
+  "Volume Backup Capacity (GiB)": "Volume Backup Capacity (GiB)",
   "Volume Backup Detail": "Volume Backup Detail",
-  "Volume Backup Gigabytes (GiB)": "Volume Backup Gigabytes (GiB)",
   "Volume Backup Name": "Volume Backup Name",
   "Volume Backups": "Volume Backups",
+  "Volume Capacity (GiB)": "Volume Capacity (GiB)",
   "Volume Detail": "Volume Detail",
   "Volume Driver": "Volume Driver",
   "Volume ID": "Volume ID",
@@ -2725,7 +2723,6 @@
   "flavor": "flavor",
   "floating ip": "floating ip",
   "floating ips": "floating ips",
-  "gigabytes": "gigabytes",
   "heat services": "heat services",
   "host aggregates": "host aggregates",
   "hosts": "hosts",
@@ -2855,13 +2852,13 @@
   "volume": "volume",
   "volume backup": "volume backup",
   "volume backups": "volume backups",
-  "volume gigabytes": "volume gigabytes",
+  "volume capacity": "volume capacity",
   "volume snapshot": "volume snapshot",
   "volume snapshots": "volume snapshots",
   "volume type": "volume type",
   "volume type qos": "volume type qos",
   "volume type {type}": "volume type {type}",
-  "volume type {type} gigabytes": "volume type {type} gigabytes",
+  "volume type {type} capacity": "volume type {type} capacity",
   "volume types": "volume types",
   "volumes": "volumes",
   "vpn IKE policy": "vpn IKE policy",
@@ -2884,8 +2881,8 @@
   "{interval, plural, =1 {one week} other {# weeks} } later delete": "{interval, plural, =1 {one week} other {# weeks} } later delete",
   "{minutes} minutes {leftSeconds} seconds": "{minutes} minutes {leftSeconds} seconds",
   "{name} type": "{name} type",
-  "{name} type gigabytes": "{name} type gigabytes",
+  "{name} type capacity": "{name} type capacity",
-  "{name} type gigabytes(GiB)": "{name} type gigabytes(GiB)",
+  "{name} type capacity (GiB)": "{name} type capacity (GiB)",
   "{name} type snapshots": "{name} type snapshots",
   "{name} {id} could not be found.": "{name} {id} could not be found.",
   "{number} port forwarding rules": "{number} port forwarding rules",

src/locales/zh.json

@@ -866,7 +866,7 @@
   "Environment": "环境",
   "Environment Variable": "环境变量",
   "Environment Variables": "环境变量",
-  "Ephemeral Disk(GiB)": "本地临时卷（GiB）",
+  "Ephemeral Disk (GiB)": "本地临时卷 (GiB)",
   "Equatorial Guinea": "赤道几内亚",
   "Eritrea": "厄立特里亚国",
   "Error": "错误",
@@ -1002,7 +1002,6 @@
   "Get {name} error.": "获取{name}失败。",
   "Ghana": "加纳",
   "Gibraltar": "直布罗陀",
-  "Gigabytes (GiB)": "容量 (GiB)",
   "Given IP": "指定IP",
   "Glance": "",
   "Global Setting": "平台配置",
@@ -1855,7 +1854,7 @@
   "Quota: Insufficient { name } quota to create resources.": "配额：{ name } 配额不足，无法创建资源。",
   "Quota: Project quotas sufficient resources can be created": "配额：项目配额充足，可创建资源",
   "RAM": "内存",
-  "RAM(MiB)": "内存（MiB）",
+  "RAM (MiB)": "内存 (MiB)",
   "RAW - Raw disk image format": "RAW - 原始磁盘映像格式",
   "RESTORE COMPLETE": "恢复完成",
   "RESUME COMPLETE": "恢复完成",
@@ -1866,7 +1865,7 @@
   "ROUND_ROBIN": "轮询算法",
   "RSVP": "",
   "Raid Interface": "Raid接口",
-  "Ram Size(GiB)": "内存容量（GiB）",
+  "Ram Size (GiB)": "内存容量 (GiB)",
   "Ram value is { ram }, NUMA RAM value is { totalRam }, need to be equal. ": "内存是 { ram }MiB，NUMA节点的内存是{ totalRam }MiB，需要一致。",
   "Ramdisk ID": "内存盘ID",
   "Ramdisk Image": "Ramdisk镜像",
@@ -1920,7 +1919,6 @@
   "Reset failed, please retry": "重置失败，请重试",
   "Resize": "修改配置",
   "Resize Cluster": "调整集群大小",
-  "Resize Container": "修改容器配置",
   "Resize Instance": "修改配置",
   "Resized": "已修改配置",
   "Resizing or Migrating": "正在修改配置/迁移",
@@ -2046,9 +2044,9 @@
   "Set IP": "设置IP",
   "Seychelles": "塞舌尔",
   "Share": "共享",
+  "Share Capacity (GiB)": "共享容量 (GiB)",
   "Share Detail": "共享详情",
   "Share File Storage": "文件存储",
-  "Share Gigabytes(GiB)": "共享容量(GiB)",
   "Share Group": "共享组",
   "Share Group Detail": "共享组详情",
   "Share Group Type": "共享组类型",
@@ -2104,7 +2102,6 @@
   "Singapore": "新加坡",
   "Size": "容量",
   "Size (GiB)": "容量 (GiB)",
-  "Size(GiB)": "大小(GiB)",
   "Slovakia (Slovak Republic)": "斯洛伐克",
   "Slovenia": "斯洛文尼亚",
   "Slow Query": "",
@@ -2536,10 +2533,11 @@
   "Visualization Compute Optimized Type with GPU": "GPU虚拟化型",
   "Volume": "云硬盘",
   "Volume Backup": "云硬盘备份",
+  "Volume Backup Capacity (GiB)": "云硬盘备份容量 (GiB)",
   "Volume Backup Detail": "云硬盘备份详情",
-  "Volume Backup Gigabytes (GiB)": "云硬盘备份容量 (GiB)",
   "Volume Backup Name": "云硬盘备份名称",
   "Volume Backups": "云硬盘备份",
+  "Volume Capacity (GiB)": "云硬盘容量 (GiB)",
   "Volume Detail": "云硬盘详情",
   "Volume Driver": "云硬盘驱动",
   "Volume ID": "云硬盘ID",
@@ -2725,7 +2723,6 @@
   "flavor": "云主机类型",
   "floating ip": "浮动IP",
   "floating ips": "浮动IP",
-  "gigabytes": "容量",
   "heat services": "编排服务",
   "host aggregates": "主机集合",
   "hosts": "主机",
@@ -2855,13 +2852,13 @@
   "volume": "云硬盘",
   "volume backup": "云硬盘备份",
   "volume backups": "云硬盘备份",
-  "volume gigabytes": "云硬盘容量",
+  "volume capacity": "云硬盘容量",
   "volume snapshot": "云硬盘快照",
   "volume snapshots": "云硬盘快照",
   "volume type": "云硬盘类型",
   "volume type qos": "云硬盘类型Qos",
   "volume type {type}": "云硬盘类型 {type} ",
-  "volume type {type} gigabytes": "云硬盘类型 {type} 容量 ",
+  "volume type {type} capacity": "云硬盘类型 {type} 容量",
   "volume types": "云硬盘类型",
   "volumes": "云硬盘",
   "vpn IKE policy": "VPN IKE策略",
@@ -2884,8 +2881,8 @@
   "{interval, plural, =1 {one week} other {# weeks} } later delete": "{interval}周后删除",
   "{minutes} minutes {leftSeconds} seconds": "{minutes}分{leftSeconds}秒",
   "{name} type": "{name} 类型",
-  "{name} type gigabytes": "{name} 类型容量",
+  "{name} type capacity": "{name} 类型容量",
-  "{name} type gigabytes(GiB)": "{name} 类型容量(GiB)",
+  "{name} type capacity (GiB)": "{name} 类型容量 (GiB)",
   "{name} type snapshots": "{name} 类型快照",
   "{name} {id} could not be found.": "您查看的资源{name} {id} 无法获取",
   "{number} port forwarding rules": "{number}个端口转发规则",

src/pages/base/containers/Overview/components/QuotaOverview.jsx

@@ -58,7 +58,7 @@ export const quotaCardList = [
         key: 'volumes',
       },
       {
-        text: t('Gigabytes (GiB)'),
+        text: t('Volume Capacity (GiB)'),
         key: 'gigabytes',
       },
       {
@@ -70,7 +70,7 @@ export const quotaCardList = [
         key: 'backups',
       },
       {
-        text: t('Volume Backup Gigabytes (GiB)'),
+        text: t('Volume Backup Capacity (GiB)'),
         key: 'backup_gigabytes',
       },
     ],
@@ -96,7 +96,7 @@ export const shareQuotaCard = {
   value: [
     { text: t('Shares'), key: 'shares' },
     {
-      text: t('Share Gigabytes(GiB)'),
+      text: t('Share Capacity (GiB)'),
       key: 'share_gigabytes',
     },
     { text: t('Share Networks'), key: 'share_networks' },
@@ -128,7 +128,7 @@ export const getVolumeTypeCards = (data) => {
           key: `volumes_${item.name}`,
         },
         {
-          text: t('{name} type gigabytes(GiB)', { name: item.name }),
+          text: t('{name} type capacity (GiB)', { name: item.name }),
           key: `gigabytes_${item.name}`,
         },
         {

src/pages/compute/containers/Instance/actions/StepCreate/index.jsx

@@ -217,7 +217,7 @@ export class StepCreate extends StepAction {
       ...volumeQuota.gigabytes,
       add: quotaError ? 0 : totalNewSize,
       name: 'volumeSize',
-      title: t('Volume Size'),
+      title: t('Volume Capacity (GiB)'),
       type: 'line',
     };
     const serverGroupQuota = this.getServerGroupQuota();
@@ -363,7 +363,7 @@ export class StepCreate extends StepAction {
     const totalSizeMsg = this.getQuotaMessage(
       totalNewSize,
       quotaAll.gigabytes,
-      t('volume gigabytes')
+      t('volume capacity')
     );
     if (totalSizeMsg) {
       return totalSizeMsg;
@@ -385,7 +385,7 @@ export class StepCreate extends StepAction {
       const sizeMsg = this.getQuotaMessage(
         newSizeMap[key],
         quotaAll[`gigabytes_${key}`],
-        t('volume type {type} gigabytes', { type: key })
+        t('volume type {type} capacity', { type: key })
       );
       if (sizeMsg) {
         msg = sizeMsg;

src/pages/database/containers/Instances/index.jsx

@@ -101,7 +101,7 @@ export class Instances extends Base {
         isHideable: true,
       },
       {
-        title: t('Volume Size'),
+        title: t('Volume Capacity (GiB)'),
         dataIndex: 'size',
         isHideable: true,
         render: (value) => (value ? `${value}GiB` : '-'),

src/resources/cinder/backup.jsx

@@ -196,7 +196,7 @@ export const getQuotaInfo = (self) => {
     ...gigabytes,
     add: addSize,
     name: 'gigabytes',
-    title: t('Volume Backup Gigabytes (GiB)'),
+    title: t('Volume Backup Capacity (GiB)'),
     type: 'line',
   };
   return [backupData, sizeData];

src/resources/cinder/volume.jsx

@@ -451,7 +451,7 @@ export const getAdd = (cinderQuota, withCountCheck = true) => {
   }
   if ((sizeLimit !== -1 && sizeLeft < totalSize) || sizeLeft === 0) {
     const error = getErrorMessage({
-      name: t('gigabytes'),
+      name: t('volume capacity'),
       left: sizeLeft,
       input: totalSize,
     });
@@ -473,7 +473,7 @@ export const getAdd = (cinderQuota, withCountCheck = true) => {
     typeSizeLeft === 0
   ) {
     const error = getErrorMessage({
-      name: t('{name} type gigabytes', { name: type }),
+      name: t('{name} type capacity', { name: type }),
       left: typeSizeLeft,
       input: totalSize,
     });
@@ -505,7 +505,7 @@ export const getQuotaInfo = (self, withCountCheck = true) => {
     ...gigabytes,
     add: addSize,
     name: 'gigabytes',
-    title: t('Gigabytes (GiB)'),
+    title: t('Volume Capacity (GiB)'),
     type: 'line',
   };
   if (!name) {
@@ -522,7 +522,7 @@ export const getQuotaInfo = (self, withCountCheck = true) => {
     ...typeSizeQuota,
     add: addSize,
     name: 'typeSize',
-    title: t('{name} type gigabytes', { name }),
+    title: t('{name} type capacity', { name }),
     type: 'line',
   };
   return [volumeData, sizeData, typeData, typeSizeData];

src/resources/manila/share.js

@@ -132,7 +132,7 @@ export const getAdd = (
 
 const titleMap = {
   shares: t('Share'),
-  gigabytes: t('Share Gigabytes(GiB)'),
+  gigabytes: t('Share Capacity (GiB)'),
   share_networks: t('Share Network'),
   share_groups: t('Share Group'),
 };