Skip to content

Commit c48371f

Browse files
author
Zhang Wenhao
committed
<chore>[conf]: update i18n files
This patch is for zsv_4.10.28 Related: ZSV-10444 Change-Id: I70636878647a7962636a64766b6c67756574756c
1 parent 426f554 commit c48371f

55 files changed

Lines changed: 6820 additions & 281 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎conf/i18n/messages_en_US.properties‎

Lines changed: 972 additions & 126 deletions
Large diffs are not rendered by default.

‎conf/i18n/messages_zh_CN.properties‎

Lines changed: 974 additions & 128 deletions
Large diffs are not rendered by default.

‎conf/i18n_json/i18n_aliyun-storage.json‎

Lines changed: 101 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
{
33
"raw": "accessKey and keySecret must be set",
44
"en_US": "accessKey and keySecret must be set",
5-
"zh_CN": "",
5+
"zh_CN": "必须设置 accessKey 和 keySecret",
66
"arguments": [],
77
"fileName": "src/main/java/org/zstack/aliyun/core/AliyunEbsClient.java"
88
},
99
{
1010
"raw": "ocean api endpoint must not be null",
1111
"en_US": "ocean api endpoint must not be null",
12-
"zh_CN": "",
12+
"zh_CN": "ocean API 的 endpoint 不能为空",
1313
"arguments": [],
1414
"fileName": "src/main/java/org/zstack/aliyun/core/AliyunEbsClient.java"
1515
},
1616
{
1717
"raw": "accessKey and keySecret must be set!",
1818
"en_US": "accessKey and keySecret must be set!",
19-
"zh_CN": "",
19+
"zh_CN": "必须设置 accessKey 和 keySecret",
2020
"arguments": [],
2121
"fileName": "src/main/java/org/zstack/aliyun/core/AliyunNasClient.java"
2222
},
2323
{
2424
"raw": "regionId must be set!",
2525
"en_US": "regionId must be set!",
26-
"zh_CN": "",
26+
"zh_CN": "必须设置 regionId",
2727
"arguments": [],
2828
"fileName": "src/main/java/org/zstack/aliyun/core/AliyunNasClient.java"
2929
},
3030
{
3131
"raw": "no current used key/secret for %s!",
3232
"en_US": "no current used key/secret for {0}!",
33-
"zh_CN": "",
33+
"zh_CN": "没有当前使用的 {0} 密钥/密钥对",
3434
"arguments": [
3535
"type.toString()"
3636
],
@@ -39,14 +39,14 @@
3939
{
4040
"raw": "Not a valid message!",
4141
"en_US": "Not a valid message!",
42-
"zh_CN": "",
42+
"zh_CN": "不是有效的消息",
4343
"arguments": [],
4444
"fileName": "src/main/java/org/zstack/aliyun/core/AliyunStorageSdkIml.java"
4545
},
4646
{
4747
"raw": "%s failed, ErrorCode: %s, ErrorMessage: %s",
4848
"en_US": "{0} failed, ErrorCode: {1}, ErrorMessage: {2}",
49-
"zh_CN": "",
49+
"zh_CN": "{0} 失败，错误代码：{1}，错误消息：{2}",
5050
"arguments": [
5151
"action",
5252
"result.ErrorCode",
@@ -57,7 +57,7 @@
5757
{
5858
"raw": "Device Not Ready in %d milli seconds",
5959
"en_US": "Device Not Ready in {0} milli seconds",
60-
"zh_CN": "",
60+
"zh_CN": "设备在 {0} 毫秒内未就绪",
6161
"arguments": [
6262
"15000"
6363
],
@@ -66,7 +66,7 @@
6666
{
6767
"raw": "snapshot task cannot finished in %d milliseconds, now progress is %d, status is %s",
6868
"en_US": "snapshot task cannot finished in {0} milliseconds, now progress is {1}, status is {2}",
69-
"zh_CN": "",
69+
"zh_CN": "快照任务无法在 {0} 毫秒内完成，当前进度为 {1}，状态为 {2}",
7070
"arguments": [
7171
"msg.getTimeout()",
7272
"result.Content.Progress",
@@ -77,7 +77,7 @@
7777
{
7878
"raw": "snapshot task status is finished %s",
7979
"en_US": "snapshot task status is finished {0}",
80-
"zh_CN": "",
80+
"zh_CN": "快照任务状态已完成 {0}",
8181
"arguments": [
8282
"result.Content.TaskStatus"
8383
],
@@ -86,14 +86,14 @@
8686
{
8787
"raw": "not supported HybridClient",
8888
"en_US": "not supported HybridClient",
89-
"zh_CN": "",
89+
"zh_CN": "不支持的 HybridClient",
9090
"arguments": [],
9191
"fileName": "src/main/java/org/zstack/aliyun/core/AliyunStorageSdkIml.java"
9292
},
9393
{
9494
"raw": "arg \u0027endpoint\u0027 must be set in %s type",
9595
"en_US": "arg \u0027endpoint\u0027 must be set in {0} type",
96-
"zh_CN": "",
96+
"zh_CN": "参数 'endpoint' 必须在 {0} 类型中设置",
9797
"arguments": [
9898
"HybridType.AliyunEBS.toString()"
9999
],
@@ -102,7 +102,7 @@
102102
{
103103
"raw": "not supported datacenter [%s] type here!",
104104
"en_US": "not supported datacenter [{0}] type here!",
105-
"zh_CN": "",
105+
"zh_CN": "此处不支持数据中心 [{0}] 类型",
106106
"arguments": [
107107
"type.toString()"
108108
],
@@ -111,14 +111,14 @@
111111
{
112112
"raw": "must indicate zoneId in private aliyun.",
113113
"en_US": "must indicate zoneId in private aliyun.",
114-
"zh_CN": "",
114+
"zh_CN": "必须在私有阿里云中指定 zoneId",
115115
"arguments": [],
116116
"fileName": "src/main/java/org/zstack/aliyun/core/identityzone/AliyunPrivateIdentityZoneBase.java"
117117
},
118118
{
119119
"raw": "make ocean api signature string failed: %s",
120120
"en_US": "make ocean api signature string failed: {0}",
121-
"zh_CN": "",
121+
"zh_CN": "生成 ocean API 签名字符串失败：{0}",
122122
"arguments": [
123123
"e.getMessage()"
124124
],
@@ -127,7 +127,7 @@
127127
{
128128
"raw": "url(ocean endpoint) must be set for aliyun ebs backupstorage",
129129
"en_US": "url(ocean endpoint) must be set for aliyun ebs backupstorage",
130-
"zh_CN": "",
130+
"zh_CN": "必须为阿里云 EBS 备份存储设置 URL（ocean 端点）",
131131
"arguments": [],
132132
"fileName": "src/main/java/org/zstack/aliyun/ebs/storage/backup/AliyunEbsBackupStorageApiInterceptor.java"
133133
},
@@ -241,6 +241,16 @@
241241
],
242242
"fileName": "src/main/java/org/zstack/aliyun/ebs/storage/primary/AliyunEbsPrimaryStorageApiInterceptor.java"
243243
},
244+
{
245+
"raw": "the aliyun ebs primary storage[uuid:%s, name:%s] cannot find any available host in attached clusters for instantiating the volume",
246+
"en_US": "the aliyun ebs primary storage[uuid:{0}, name:{1}] cannot find any available host in attached clusters for instantiating the volume",
247+
"zh_CN": "阿里云 EBS 主存储[uuid:{0}, name:{1}] 在附加的集群中找不到可用于实例化卷的可用主机",
248+
"arguments": [
249+
"self.getUuid()",
250+
"self.getName()"
251+
],
252+
"fileName": "src/main/java/org/zstack/aliyun/ebs/storage/primary/AliyunEbsPrimaryStorageBase.java"
253+
},
244254
{
245255
"raw": "cannot find snapshot from image: %s, maybe the image has been deleted",
246256
"en_US": "cannot find snapshot from image: {0}, maybe the image has been deleted",
@@ -488,6 +498,17 @@
488498
],
489499
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunKvmBackend.java"
490500
},
501+
{
502+
"raw": "failed to ping aliyun nas primary storage[uuid:%s] from host[uuid:%s],because %s. disconnect this host-ps connection",
503+
"en_US": "failed to ping aliyun nas primary storage[uuid:{0}] from host[uuid:{1}],because {2}. disconnect this host-ps connection",
504+
"zh_CN": "从主机[uuid:{1}] ping 阿里云 NAS 主存储[uuid:{0}] 失败，因为 {2}。断开此主机-存储连接",
505+
"arguments": [
506+
"self.getUuid()",
507+
"hostUuid",
508+
"rsp.error"
509+
],
510+
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunKvmBackend.java"
511+
},
491512
{
492513
"raw": "operation error, because:%s",
493514
"en_US": "operation error, because:{0}",
@@ -603,20 +624,75 @@
603624
],
604625
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunKvmBackend.java"
605626
},
627+
{
628+
"raw": "unable to attach a primary storage to cluster. Kvm host[uuid:%s, name:%s] in cluster has qemu-img with version[%s]; but the primary storage has attached to a cluster that has kvm host[uuid:%s], which has qemu-img with version[%s]. qemu-img version greater than %s is incompatible with versions less than %s, this will causes volume snapshot operation to fail. Please avoid attaching a primary storage to clusters that have different Linux distributions, in order to prevent qemu-img version mismatch",
629+
"en_US": "unable to attach a primary storage to cluster. Kvm host[uuid:{0}, name:{1}] in cluster has qemu-img with version[{2}]; but the primary storage has attached to a cluster that has kvm host[uuid:{3}], which has qemu-img with version[{4}]. qemu-img version greater than {5} is incompatible with versions less than {6}, this will causes volume snapshot operation to fail. Please avoid attaching a primary storage to clusters that have different Linux distributions, in order to prevent qemu-img version mismatch",
630+
"zh_CN": "",
631+
"arguments": [
632+
"context.getInventory().getUuid()",
633+
"context.getInventory().getName()",
634+
"mine",
635+
"e.getKey()",
636+
"version",
637+
"QCOW3_QEMU_IMG_VERSION",
638+
"QCOW3_QEMU_IMG_VERSION"
639+
],
640+
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunKvmFactory.java"
641+
},
606642
{
607643
"raw": "no available host could download imagecache!",
608644
"en_US": "no available host could download imagecache!",
609645
"zh_CN": "",
610646
"arguments": [],
611647
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunKvmFactory.java"
612648
},
649+
{
650+
"raw": "the aliyun nas primary storage[uuid:%s, name:%s] cannot find any available host in attached clusters for instantiating the volume",
651+
"en_US": "the aliyun nas primary storage[uuid:{0}, name:{1}] cannot find any available host in attached clusters for instantiating the volume",
652+
"zh_CN": "",
653+
"arguments": [
654+
"self.getUuid()",
655+
"self.getName()"
656+
],
657+
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunNasPrimaryStorageBase.java"
658+
},
659+
{
660+
"raw": "the aliyun nas primary storage[uuid:%s, name:%s] cannot find any available host in attached clusters for delete bits on primarystorage",
661+
"en_US": "the aliyun nas primary storage[uuid:{0}, name:{1}] cannot find any available host in attached clusters for delete bits on primarystorage",
662+
"zh_CN": "",
663+
"arguments": [
664+
"self.getUuid()",
665+
"self.getName()"
666+
],
667+
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunNasPrimaryStorageBase.java"
668+
},
613669
{
614670
"raw": "not support",
615671
"en_US": "not support",
616672
"zh_CN": "",
617673
"arguments": [],
618674
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunNasPrimaryStorageBase.java"
619675
},
676+
{
677+
"raw": "the AliyunNAS primary storage[uuid:%s, name:%s] has not attached to any clusters, or no hosts in the attached clusters are connected",
678+
"en_US": "the AliyunNAS primary storage[uuid:{0}, name:{1}] has not attached to any clusters, or no hosts in the attached clusters are connected",
679+
"zh_CN": "",
680+
"arguments": [
681+
"self.getUuid()",
682+
"self.getName()"
683+
],
684+
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunNasPrimaryStorageBase.java"
685+
},
686+
{
687+
"raw": "the Aliyun Nas primary storage[uuid:%s, name:%s] has not attached to any clusters, or no hosts in the attached clusters are connected",
688+
"en_US": "the Aliyun Nas primary storage[uuid:{0}, name:{1}] has not attached to any clusters, or no hosts in the attached clusters are connected",
689+
"zh_CN": "",
690+
"arguments": [
691+
"self.getUuid()",
692+
"self.getName()"
693+
],
694+
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunNasPrimaryStorageBase.java"
695+
},
620696
{
621697
"raw": "failed to check mount path on host: %s",
622698
"en_US": "failed to check mount path on host: {0}",
@@ -642,6 +718,15 @@
642718
],
643719
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunNasPrimaryStorageBase.java"
644720
},
721+
{
722+
"raw": "cannot find available host for operation on primary storage[uuid:%s].",
723+
"en_US": "cannot find available host for operation on primary storage[uuid:{0}].",
724+
"zh_CN": "",
725+
"arguments": [
726+
"self.getUuid()"
727+
],
728+
"fileName": "src/main/java/org/zstack/aliyun/nas/storage/primary/AliyunNasPrimaryStorageBase.java"
729+
},
645730
{
646731
"raw": "host where vm[uuid:%s] locate is not Connected.",
647732
"en_US": "host where vm[uuid:{0}] locate is not Connected.",

‎conf/i18n_json/i18n_baremetal.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
],
99
"fileName": "src/main/java/org/zstack/baremetal/chassis/BaremetalChassisApiInterceptor.java"
1010
},
11+
{
12+
"raw": "Failed to reach the bare-metal chassis, please make sure: 1. the IPMI connection is active; 2. the IPMI Address, Port, Username and Password are correct; 3. IPMI Over LAN is enabled in BIOS.",
13+
"en_US": "Failed to reach the bare-metal chassis, please make sure: 1. the IPMI connection is active; 2. the IPMI Address, Port, Username and Password are correct; 3. IPMI Over LAN is enabled in BIOS.",
14+
"zh_CN": "",
15+
"arguments": [],
16+
"fileName": "src/main/java/org/zstack/baremetal/chassis/BaremetalChassisApiInterceptor.java"
17+
},
1118
{
1219
"raw": "Baremetal Chassis of IPMI address %s and IPMI port %d has already been created.",
1320
"en_US": "Baremetal Chassis of IPMI address {0} and IPMI port {1} has already been created.",
@@ -82,6 +89,24 @@
8289
"arguments": [],
8390
"fileName": "src/main/java/org/zstack/baremetal/chassis/BaremetalChassisManagerImpl.java"
8491
},
92+
{
93+
"raw": "Hijacked detected. Your license[%s] permits %s baremetal chassis, but we detect there are %s in the database. You can either delete additional chassis or apply a new license.",
94+
"en_US": "Hijacked detected. Your license[{0}] permits {1} baremetal chassis, but we detect there are {2} in the database. You can either delete additional chassis or apply a new license.",
95+
"zh_CN": "",
96+
"arguments": [
97+
"licMgr.getLicenseType()",
98+
"allowedChassisNum",
99+
"currChassisNum"
100+
],
101+
"fileName": "src/main/java/org/zstack/baremetal/chassis/BaremetalChassisManagerImpl.java"
102+
},
103+
{
104+
"raw": "Insufficient baremetal chassis number licensed. You can either delete additional chassis or apply a new license.",
105+
"en_US": "Insufficient baremetal chassis number licensed. You can either delete additional chassis or apply a new license.",
106+
"zh_CN": "",
107+
"arguments": [],
108+
"fileName": "src/main/java/org/zstack/baremetal/chassis/BaremetalChassisManagerImpl.java"
109+
},
85110
{
86111
"raw": "failed to delete baremetal chassis %s",
87112
"en_US": "failed to delete baremetal chassis {0}",
@@ -503,6 +528,19 @@
503528
],
504529
"fileName": "src/main/java/org/zstack/baremetal/pxeserver/BaremetalPxeServerApiInterceptor.java"
505530
},
531+
{
532+
"raw": "baremetal pxeserver[uuid:%s] is not compatible with baremetal instances in cluster[uuid:%s], existing nic ip %s is out of pxeserver dhcp range %s ~ %s.",
533+
"en_US": "baremetal pxeserver[uuid:{0}] is not compatible with baremetal instances in cluster[uuid:{1}], existing nic ip {2} is out of pxeserver dhcp range {3} ~ {4}.",
534+
"zh_CN": "",
535+
"arguments": [
536+
"msg.getPxeServerUuid()",
537+
"msg.getClusterUuid()",
538+
"ip",
539+
"begin",
540+
"end"
541+
],
542+
"fileName": "src/main/java/org/zstack/baremetal/pxeserver/BaremetalPxeServerApiInterceptor.java"
543+
},
506544
{
507545
"raw": "baremetal pxeserver[uuid: %s] not attached to cluster[uuid: %s]",
508546
"en_US": "baremetal pxeserver[uuid: {0}] not attached to cluster[uuid: {1}]",
@@ -614,6 +652,16 @@
614652
],
615653
"fileName": "src/main/java/org/zstack/baremetal/pxeserver/BaremetalPxeServerBase.java"
616654
},
655+
{
656+
"raw": "the uuid of baremtal pxeserver agent changed[expected:%s, actual:%s], it\u0027s most likely the agent was manually restarted. Issue a reconnect to sync the status",
657+
"en_US": "the uuid of baremtal pxeserver agent changed[expected:{0}, actual:{1}], it\u0027s most likely the agent was manually restarted. Issue a reconnect to sync the status",
658+
"zh_CN": "",
659+
"arguments": [
660+
"self.getUuid()",
661+
"ret.uuid"
662+
],
663+
"fileName": "src/main/java/org/zstack/baremetal/pxeserver/BaremetalPxeServerBase.java"
664+
},
617665
{
618666
"raw": "operation error, because:%s",
619667
"en_US": "operation error, because:{0}",

0 commit comments

Comments
 (0)