Merge branch 'zsv-6@@2' into 'zsv_4.10.28'

<chore>[conf]: update i18n json for mevoco module

See merge request zstackio/zstack!9056

Author: gitlab

conf/i18n/messages_en_US.properties

@@ -157,15 +157,6 @@
     ],
     "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageApiInterceptor.java"
   },
-  {
-    "raw": "Unexpected VM state: %s",
-    "en_US": "Unexpected VM state: {0}",
-    "zh_CN": "意外的VM状态：{0}",
-    "arguments": [
-      "state"
-    ],
-    "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageApiInterceptor.java"
-  },
   {
     "raw": "Backup storage not found[uuid: %s]",
     "en_US": "Backup storage not found[uuid: {0}]",
@@ -202,15 +193,6 @@
     ],
     "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageApiInterceptor.java"
   },
-  {
-    "raw": "unexpected task type: %s",
-    "en_US": "unexpected task type: {0}",
-    "zh_CN": "意外的任务类型：{0}",
-    "arguments": [
-      "msg.getTaskType()"
-    ],
-    "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageApiInterceptor.java"
-  },
   {
     "raw": "\u0027%s\u0027(%d) should be larger than \u0027%s\u0027(%d)",
     "en_US": "\u0027{0}\u0027({1}) should be larger than \u0027{2}\u0027({3})",
@@ -294,15 +276,6 @@
     ],
     "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageImpl.java"
   },
-  {
-    "raw": "%s",
-    "en_US": "{0}",
-    "zh_CN": "{0}",
-    "arguments": [
-      "ret.getError()"
-    ],
-    "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageImpl.java"
-  },
   {
     "raw": "hostname not found for backup storage[uuid: %s]",
     "en_US": "hostname not found for backup storage[uuid: {0}]",
@@ -339,6 +312,15 @@
     "arguments": [],
     "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageManagerImpl.java"
   },
+  {
+    "raw": "%s",
+    "en_US": "{0}",
+    "zh_CN": "{0}",
+    "arguments": [
+      "vo.getJobResult()"
+    ],
+    "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageManagerImpl.java"
+  },
   {
     "raw": "create-vm job cancelled",
     "en_US": "create-vm job cancelled",
@@ -391,6 +373,15 @@
     ],
     "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageManagerImpl.java"
   },
+  {
+    "raw": "Unexpected VM state: %s",
+    "en_US": "Unexpected VM state: {0}",
+    "zh_CN": "意外的VM状态：{0}",
+    "arguments": [
+      "state"
+    ],
+    "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageManagerImpl.java"
+  },
   {
     "raw": "No CDP task found for VM: %s",
     "en_US": "No CDP task found for VM: {0}",
@@ -436,6 +427,15 @@
     ],
     "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageManagerImpl.java"
   },
+  {
+    "raw": "unexpected task type: %s",
+    "en_US": "unexpected task type: {0}",
+    "zh_CN": "意外的任务类型：{0}",
+    "arguments": [
+      "taskVO.getTaskType()"
+    ],
+    "fileName": "src/main/java/org/zstack/storage/cdp/CdpBackupStorageManagerImpl.java"
+  },
   {
     "raw": "The VM[%s] for volume[%s] is running CDP, cannot resize now.",
     "en_US": "The VM[{0}] for volume[{1}] is running CDP, cannot resize now.",
@@ -464,16 +464,6 @@
     ],
     "fileName": "src/main/java/org/zstack/storage/cdp/CreateVmFromCdpBackupLongJob.java"
   },
-  {
-    "raw": "waiting host[uuid:%s] and backupStorage[uuid:%s] to be Connected...",
-    "en_US": "waiting host[uuid:{0}] and backupStorage[uuid:{1}] to be Connected...",
-    "zh_CN": "正在等待要连接的主机[uuid：{0}]和备份存储[uuid：{1}]..",
-    "arguments": [
-      "hostUuid",
-      "bsUuid"
-    ],
-    "fileName": "src/main/java/org/zstack/storage/cdp/CreateVmFromCdpBackupLongJob.java"
-  },
   {
     "raw": "failed to find cdp task[uuid:%s] ",
     "en_US": "failed to find cdp task[uuid:{0}] ",
@@ -501,6 +491,13 @@
     ],
     "fileName": "src/main/java/org/zstack/storage/cdp/KvmCdpVmLiveCreateFlowChain.java"
   },
+  {
+    "raw": "no volume records found from VM backup",
+    "en_US": "no volume records found from VM backup",
+    "zh_CN": "未从虚拟机备份中找到卷记录",
+    "arguments": [],
+    "fileName": "src/main/java/org/zstack/storage/cdp/KvmCdpVmLiveCreateFlowChain.java"
+  },
   {
     "raw": "multiple root volumes found from CDP backup %s:%d",
     "en_US": "multiple root volumes found from CDP backup {0}:{1}",
@@ -550,13 +547,6 @@
     ],
     "fileName": "src/main/java/org/zstack/storage/cdp/KvmCdpVmLiveRestoreFlowChain.java"
   },
-  {
-    "raw": "no volume records found from VM backup",
-    "en_US": "no volume records found from VM backup",
-    "zh_CN": "未从虚拟机备份中找到卷记录",
-    "arguments": [],
-    "fileName": "src/main/java/org/zstack/storage/cdp/KvmCdpVmLiveRestoreFlowChain.java"
-  },
   {
     "raw": "no root volume found from VM backup",
     "en_US": "no root volume found from VM backup",
@@ -636,6 +626,16 @@
     ],
     "fileName": "src/main/java/org/zstack/storage/cdp/RevertVmFromCdpBackupMsgLongJob.java"
   },
+  {
+    "raw": "waiting host[uuid:%s] and backupStorage[uuid:%s] to be Connected...",
+    "en_US": "waiting host[uuid:{0}] and backupStorage[uuid:{1}] to be Connected...",
+    "zh_CN": "正在等待要连接的主机[uuid：{0}]和备份存储[uuid：{1}]..",
+    "arguments": [
+      "apiMessage.getHostUuid()",
+      "apiMessage.getBackupStorageUuid()"
+    ],
+    "fileName": "src/main/java/org/zstack/storage/cdp/RevertVmFromCdpBackupMsgLongJob.java"
+  },
   {
     "raw": "No CDP task found for VM[uuid: %s]",
     "en_US": "No CDP task found for VM[uuid: {0}]",

conf/i18n/messages_zh_CN.properties

@@ -1840,6 +1840,16 @@
     ],
     "fileName": "src/main/java/org/zstack/compute/vm/VmInstanceHelper.java"
   },
+  {
+    "raw": "host[uuid:%s] is specified but it is not in zone[uuid:%s], can not create vm from it",
+    "en_US": "host[uuid:{0}] is specified but it is not in zone[uuid:{1}], can not create vm from it",
+    "zh_CN": "",
+    "arguments": [
+      "msg.getHostUuid()",
+      "expectZoneUuid"
+    ],
+    "fileName": "src/main/java/org/zstack/compute/vm/VmInstanceHelper.java"
+  },
   {
     "raw": "host[uuid:%s] is specified but it\u0027s Disabled, can not create vm from it",
     "en_US": "host[uuid:{0}] is specified but it\u0027s Disabled, can not create vm from it",

conf/i18n_json/i18n_cdp.json

@@ -15,15 +15,6 @@
     "arguments": [],
     "fileName": "src/main/java/org/zstack/core/Platform.java"
   },
-  {
-    "raw": "fail to create new File[%s]",
-    "en_US": "fail to create new File[{0}]",
-    "zh_CN": "无法创建新文件[{0}]",
-    "arguments": [
-      "invFile"
-    ],
-    "fileName": "src/main/java/org/zstack/core/ansible/AnsibleFacadeImpl.java"
-  },
   {
     "raw": "failed to run ansible: failed to find target host",
     "en_US": "failed to run ansible: failed to find target host",
@@ -45,6 +36,15 @@
     "arguments": [],
     "fileName": "src/main/java/org/zstack/core/ansible/AnsibleRunner.java"
   },
+  {
+    "raw": "fail to create new File[%s]",
+    "en_US": "fail to create new File[{0}]",
+    "zh_CN": "无法创建新文件[{0}]",
+    "arguments": [
+      "hostsFile"
+    ],
+    "fileName": "src/main/java/org/zstack/core/ansible/PrepareAnsible.java"
+  },
   {
     "raw": "cannot check md5sum of files in the folder[%s]",
     "en_US": "cannot check md5sum of files in the folder[{0}]",

conf/i18n_json/i18n_compute.json

@@ -1,11 +1,4 @@
 [
-  {
-    "raw": "the identity authentication does not specify the resource pool to provide the service",
-    "en_US": "the identity authentication does not specify the resource pool to provide the service",
-    "zh_CN": "身份认证未指定提供服务的资源池",
-    "arguments": [],
-    "fileName": "src/main/java/org/zstack/crypto/auth/AbstractCryptoAuthenticationFacade.java"
-  },
   {
     "raw": "failed to find model for secretResourcePool [%s]",
     "en_US": "failed to find model for secretResourcePool [{0}]",
@@ -25,13 +18,6 @@
     ],
     "fileName": "src/main/java/org/zstack/crypto/auth/AbstractCryptoAuthenticationFacade.java"
   },
-  {
-    "raw": "failed to connect remote crypto server",
-    "en_US": "failed to connect remote crypto server",
-    "zh_CN": "连接到远程密钥（密评）服务器失败",
-    "arguments": [],
-    "fileName": "src/main/java/org/zstack/crypto/auth/AbstractCryptoAuthenticationFacade.java"
-  },
   {
     "raw": "parseCertificate failed: %s",
     "en_US": "parseCertificate failed: {0}",
@@ -41,20 +27,6 @@
     ],
     "fileName": "src/main/java/org/zstack/crypto/auth/AbstractCryptoAuthenticationFacade.java"
   },
-  {
-    "raw": "additional authentication server raise an error",
-    "en_US": "additional authentication server raise an error",
-    "zh_CN": "",
-    "arguments": [],
-    "fileName": "src/main/java/org/zstack/crypto/auth/AbstractCryptoAuthenticationFacade.java"
-  },
-  {
-    "raw": "additional authentication failed",
-    "en_US": "additional authentication failed",
-    "zh_CN": "",
-    "arguments": [],
-    "fileName": "src/main/java/org/zstack/crypto/auth/AbstractCryptoAuthenticationFacade.java"
-  },
   {
     "raw": "failed to parse certificate",
     "en_US": "failed to parse certificate",
@@ -89,6 +61,34 @@
     ],
     "fileName": "src/main/java/org/zstack/crypto/auth/CryptoAuthenticationHelper.java"
   },
+  {
+    "raw": "the identity authentication does not specify the resource pool to provide the service",
+    "en_US": "the identity authentication does not specify the resource pool to provide the service",
+    "zh_CN": "身份认证未指定提供服务的资源池",
+    "arguments": [],
+    "fileName": "src/main/java/org/zstack/crypto/auth/CryptoAuthenticationManagerImpl.java"
+  },
+  {
+    "raw": "failed to connect remote crypto server",
+    "en_US": "failed to connect remote crypto server",
+    "zh_CN": "连接到远程密钥（密评）服务器失败",
+    "arguments": [],
+    "fileName": "src/main/java/org/zstack/crypto/auth/CryptoAuthenticationManagerImpl.java"
+  },
+  {
+    "raw": "additional authentication server raise an error",
+    "en_US": "additional authentication server raise an error",
+    "zh_CN": "",
+    "arguments": [],
+    "fileName": "src/main/java/org/zstack/crypto/auth/CryptoAuthenticationManagerImpl.java"
+  },
+  {
+    "raw": "additional authentication failed",
+    "en_US": "additional authentication failed",
+    "zh_CN": "",
+    "arguments": [],
+    "fileName": "src/main/java/org/zstack/crypto/auth/CryptoAuthenticationManagerImpl.java"
+  },
   {
     "raw": "failed to generate credential",
     "en_US": "failed to generate credential",

conf/i18n_json/i18n_core.json

@@ -550,15 +550,6 @@
     ],
     "fileName": "src/main/java/org/zstack/compute/host/MevocoHostBase.java"
   },
-  {
-    "raw": "host[uuid:%s] can not find",
-    "en_US": "host[uuid:{0}] can not find",
-    "zh_CN": "找不到主机[uuid：{0}]",
-    "arguments": [
-      "msg.getHostUuid()"
-    ],
-    "fileName": "src/main/java/org/zstack/compute/host/MevocoHostBase.java"
-  },
   {
     "raw": "kvm host[uuid:%s, name:%s, ip:%s] doesn\u0027t not support live snapshot. please stop vm[uuid:%s] and try again",
     "en_US": "kvm host[uuid:{0}, name:{1}, ip:{2}] doesn\u0027t not support live snapshot. please stop vm[uuid:{3}] and try again",
@@ -761,6 +752,15 @@
     ],
     "fileName": "src/main/java/org/zstack/compute/host/MevocoHostManagerImpl.java"
   },
+  {
+    "raw": "host[uuid:%s] can not find",
+    "en_US": "host[uuid:{0}] can not find",
+    "zh_CN": "找不到主机[uuid：{0}]",
+    "arguments": [
+      "msg.getHostUuid()"
+    ],
+    "fileName": "src/main/java/org/zstack/compute/host/MevocoHostManagerImpl.java"
+  },
   {
     "raw": "ovs cpu pinning resource config:[%s] format error.",
     "en_US": "ovs cpu pinning resource config:[{0}] format error.",
@@ -1622,6 +1622,13 @@
     "arguments": [],
     "fileName": "src/main/java/org/zstack/compute/vmscheduling/VmSchedulingRuleApiInterceptor.java"
   },
+  {
+    "raw": "the vm scheduling group has already had a vms Affinitive to Hosts scheduling policy attached",
+    "en_US": "the vm scheduling group has already had a vms Affinitive to Hosts scheduling policy attached, you cannot attach a vm antiaffinity from each other scheduling rule to the group again.",
+    "zh_CN": "该虚拟机调度组已绑定聚集虚拟机调度策略，不可绑定其它虚拟机调度策略",
+    "arguments": [],
+    "fileName": "src/main/java/org/zstack/compute/vmscheduling/VmSchedulingRuleApiInterceptor.java"
+  },
   {
     "raw": "can not satisfied vm scheduling rule group conditions",
     "en_US": "can not satisfied vm scheduling rule group conditions",
@@ -2065,12 +2072,22 @@
     "fileName": "src/main/java/org/zstack/license/LicenseManagerImpl.java"
   },
   {
-    "raw": "Insufficient CPU number licensed. Your %s license permits the number of CPUs: %d.",
-    "en_US": "Insufficient CPU number licensed. Your {0} license permits the number of CPUs: {1}.",
-    "zh_CN": "许可证的 CPU 配额数量不足。您的 {0} 许可证允许的 CPU 数量为 {1}",
+    "raw": "Insufficient CPU Socket number licensed. Your %s license permits the number of CPU Sockets: %d.",
+    "en_US": "Insufficient CPU Socket number licensed. Your {0} license permits the number of CPU Sockets: {1}.",
+    "zh_CN": "许可证的 CPU Socket 数配额数量不足。您的 {0} 许可证允许的 CPU Socket 数量为 {1}",
     "arguments": [
       "addon.getModules()",
-      "addon.getCpuNum()"
+      "addon.getCpuSocketsNum()"
+    ],
+    "fileName": "src/main/java/org/zstack/license/LicenseManagerImpl.java"
+  },
+  {
+    "raw": "Insufficient CPU Core number licensed. Your %s license permits the number of CPU Cores: %d.",
+    "en_US": "Insufficient CPU Core number licensed. Your {0} license permits the number of CPU Cores: {1}.",
+    "zh_CN": "许可证的 CPU 核心数配额数量不足。您的 {0} 许可证允许的 CPU 核心数量为 {1}",
+    "arguments": [
+      "addon.getModules()",
+      "addon.getCpuCoresNum()"
     ],
     "fileName": "src/main/java/org/zstack/license/LicenseManagerImpl.java"
   },
@@ -2215,8 +2232,19 @@
     "zh_CN": "{0} 许可证配额为 {1}，已使用 {2} 个 CPU 核数。请上传新的许可证或删除多余的主机",
     "arguments": [
       "licenseType",
-      "platformLicenseCpu",
-      "x86HostCpu + otherHostCpu"
+      "platformLicenseCpuSockets",
+      "x86HostCpuSockets + otherHostCpuSockets"
+    ],
+    "fileName": "src/main/java/org/zstack/license/compute/LicenseCapacity.java"
+  },
+  {
+    "raw": "hijacked detected. Your license[%s] permits %d CPU cores, but consumed %d. You can either apply a new license or delete additional hosts",
+    "en_US": "hijacked detected. Your license[{0}] permits {1} CPU cores, but consumed {2}. You can either apply a new license or delete additional hosts",
+    "zh_CN": "",
+    "arguments": [
+      "licenseType",
+      "platformLicenseCpuCores",
+      "x86HostCpuCores + otherHostCpuCores"
     ],
     "fileName": "src/main/java/org/zstack/license/compute/LicenseCapacity.java"
   },