Merge branch 'ZSV-5838@@2' into 'zsv_5.0.0'

<fix>[conf]: add i18n "volume[uuid:%s] has been deleted"

See merge request zstackio/zstack!9237

Author: gitlab

conf/i18n/messages_en_US.properties

@@ -3967,6 +3967,7 @@ new\ volume(s)\ %s\ attached\ after\ snapshot\ point,\ can\ only\ revert\ one\ b
 \ volume[uuid\:\ %s]\ has\ been\ referenced\ by\ other\ volumes\ [%s],\ can\ not\ change\ install\ path\ before\ flatten\ them\ and\ their\ descendants\  =  volume[uuid: {0}] has been referenced by other volumes [{1}], can not change install path before flatten them and their descendants 
 current\ volume\ state[%s]\ doesn't\ allow\ to\ proceed\ message[%s] = current volume state[{0}] doesn''t allow to proceed message[{1}]
 failed\ to\ select\ backup\ storage\ to\ download\ iso[uuid\=%s] = failed to select backup storage to download iso[uuid={0}]
+volume[uuid\:%s]\ has\ been\ deleted = volume[uuid:{0}] has been deleted
 unable\ to\ download\ iso\ to\ primary\ storage = unable to download iso to primary storage
 volume[uuid\:%s,\ type\:%s],\ can't\ create\ snapshot = volume[uuid:{0}, type:{1}], can''t create snapshot
 volume[uuid\:%s]\ is\ not\ in\ state\ Enabled,\ current\ is\ %s,\ can't\ create\ snapshot = volume[uuid:{0}] is not in state Enabled, current is {1}, can''t create snapshot

conf/i18n/messages_zh_CN.properties

@@ -1914,7 +1914,7 @@ unable\ to\ connect\ to\ kvm\ host[uuid\:%s,\ ip\:%s,\ url\:%s],\ because\ %s =
 host\ can\ not\ access\ any\ primary\ storage = 主机无法访问任何数据存储
 connection\ error\ for\ KVM\ host[uuid\:%s,\ ip\:%s] = 连接主机 {0} [ip:{1}] 失败
 the\ host[%s]\ ssh\ port[%s]\ not\ open\ after\ %s\ seconds,\ connect\ timeout = 主机[{0}]SSH端口[{1}]在{2}秒后未打开，连接超时
-host\ password\ has\ been\ changed.\ Please\ update\ host\ password\ in\ management\ node\ by\ UpdateKVMHostAction\ with\ host\ UUID[%s] = 主机[UUID:{0}]的密码已被修改，请通过 UpdateKVMHostAction 在管理节点更新主机密码
+host\ password\ has\ been\ changed.\ Please\ update\ host\ password\ in\ management\ node\ by\ UpdateKVMHostAction\ with\ host\ UUID[%s] = 
 failed\ to\ connect\ host[UUID\=%s]\ with\ SSH\ password = 
 failed\ to\ connect\ host[UUID\=%s]\ with\ private\ key = 
 unable\ to\ connect\ to\ KVM[ip\:%s,\ username\:%s,\ sshPort\:\ %d,\ ]\ to\ do\ DNS\ check,\ please\ check\ if\ username/password\ is\ wrong;\ %s = 无法连接主机[ip:{0}, 用户名:{1}, ssh端口:{2} ]做DNS检查，请检查用户名密码是否正确；{3}
@@ -3966,7 +3966,8 @@ volume(s)\ %s\ is\ no\ longer\ attached,\ can\ only\ revert\ one\ by\ one.\ If\
 new\ volume(s)\ %s\ attached\ after\ snapshot\ point,\ can\ only\ revert\ one\ by\ one.\ If\ you\ need\ to\ group\ revert,\ please\ detach\ it. = 
 \ volume[uuid\:\ %s]\ has\ been\ referenced\ by\ other\ volumes\ [%s],\ can\ not\ change\ install\ path\ before\ flatten\ them\ and\ their\ descendants\  = 
 current\ volume\ state[%s]\ doesn't\ allow\ to\ proceed\ message[%s] = 
-failed\ to\ select\ backup\ storage\ to\ download\ iso[uuid\=%s] = 
+failed\ to\ select\ backup\ storage\ to\ download\ iso[uuid\=%s] =
+volume[uuid\:%s]\ has\ been\ deleted = 硬盘[uuid:{0}]已经被删除了
 unable\ to\ download\ iso\ to\ primary\ storage = 
 volume[uuid\:%s,\ type\:%s],\ can't\ create\ snapshot = 卷[uuid：{0}，类型：{1}]，无法创建快照
 volume[uuid\:%s]\ is\ not\ in\ state\ Enabled,\ current\ is\ %s,\ can't\ create\ snapshot = 

conf/i18n_json/i18n_zsv.json

@@ -113,5 +113,14 @@
     "zh_CN": "",
     "arguments": [],
     "fileName": "src/main/java/org/zstack/zsv/storage/ZsvStorageManager.java"
+  },
+  {
+    "raw": "volume[uuid:%s] has been deleted",
+    "en_US": "volume[uuid:{0}] has been deleted",
+    "zh_CN": "硬盘[uuid:{0}]已经被删除了",
+    "arguments": [
+      "volId"
+    ],
+    "fileName": "src/main/java/org/zstack/zsv/snapshotgroup/ZsvBeforeRevertSnapshotGroupFlow.java"
   }
 ]