Tal Nisan has uploaded a new change for review. Change subject: core: Rephrase CDA message when removing a last copy of a template disk ......................................................................
core: Rephrase CDA message when removing a last copy of a template disk Change-Id: I42e2fefb8ba95bd7e83de75d1d90ff5eef2cb102 Signed-off-by: Tal Nisan <[email protected]> Bug-url: https://bugzilla.redhat.com/975040 --- M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/24245/1 diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 880c539..56b0919 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -25,7 +25,7 @@ VM_TEMPLATE_IS_LOCKED=Template is currently locked (temporarily). VM_TEMPLATE_IMAGE_IS_LOCKED=Template's Image is locked (temporarily). VM_TEMPLATE_IMAGE_IS_ILLEGAL=Template's Image is invalid (temporarily). -VM_TEMPLATE_IMAGE_LAST_DOMAIN=Template's Image is located only on single domain. +VM_TEMPLATE_IMAGE_LAST_DOMAIN=Cannot ${action} ${type}. The image is the last copy of a template disk. VM_NAME_CANNOT_BE_EMPTY=VM Name cannot be empty. VM_CANNOT_UPDATE_ILLEGAL_FIELD=There was an attempt to change VM values while the VM is not down. Please shut down the VM in order to modify these properties. VM_CANNOT_UPDATE_DEVICE_VM_NOT_DOWN=Failed updating the properties of the VM. VM should be in status Down in order to change the ${device} device. diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index 623cf95..9ad9ad2 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -79,7 +79,7 @@ @DefaultStringValue("Template's Image is invalid (temporarily).") String VM_TEMPLATE_IMAGE_IS_ILLEGAL(); - @DefaultStringValue("Template's Image is located only on single domain.") + @DefaultStringValue("Cannot ${action} ${type}. The image is the last copy of a template disk.") String VM_TEMPLATE_IMAGE_LAST_DOMAIN(); @DefaultStringValue("VM Name cannot be empty.") diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 8aad2c7..33e60d1 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -25,7 +25,7 @@ VM_TEMPLATE_IS_LOCKED=Template is currently locked (temporarily). VM_TEMPLATE_IMAGE_IS_LOCKED=Template's Image is locked (temporarily). VM_TEMPLATE_IMAGE_IS_ILLEGAL=Template's Image is invalid (temporarily). -VM_TEMPLATE_IMAGE_LAST_DOMAIN=Template's Image is located only on single domain. +VM_TEMPLATE_IMAGE_LAST_DOMAIN=Cannot ${action} ${type}. The image is the last copy of a template disk. VM_NAME_CANNOT_BE_EMPTY=VM Name cannot be empty. VM_CANNOT_UPDATE_ILLEGAL_FIELD=There was an attempt to change VM values while the VM is not down. Please shut down the VM in order to modify these properties. VM_CANNOT_UPDATE_DEVICE_VM_NOT_DOWN=Failed updating the properties of the VM. VM should be in status Down in order to change the ${device} device. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 07136c9..1d54cf0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -25,7 +25,7 @@ VM_TEMPLATE_IS_LOCKED=Template is currently locked (temporarily). VM_TEMPLATE_IMAGE_IS_LOCKED=Template's Image is locked (temporarily). VM_TEMPLATE_IMAGE_IS_ILLEGAL=Template's Image is invalid (temporarily). -VM_TEMPLATE_IMAGE_LAST_DOMAIN=Template's Image is located only on single domain. +VM_TEMPLATE_IMAGE_LAST_DOMAIN=Cannot ${action} ${type}. The image is the last copy of a template disk. VM_NAME_CANNOT_BE_EMPTY=VM Name cannot be empty. VM_CANNOT_UPDATE_ILLEGAL_FIELD=There was an attempt to change VM values while the VM is not down. Please shut down the VM in order to modify these properties. VM_CANNOT_UPDATE_DEVICE_VM_NOT_DOWN=Failed updating the properties of the VM. VM should be in status Down in order to change the ${device} device. -- To view, visit http://gerrit.ovirt.org/24245 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42e2fefb8ba95bd7e83de75d1d90ff5eef2cb102 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
