Omer Frenkel has uploaded a new change for review.
Change subject: core: fix typos in canDo messages
......................................................................
core: fix typos in canDo messages
Change-Id: If7deb6de9bb3c2bc84bf9911104391fdf50d9fc0
Signed-off-by: Omer Frenkel <ofren...@redhat.com>
---
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, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/26081/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 a9aec15..3986aa2 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -647,7 +647,7 @@
ACTION_TYPE_FAILED_SNAPSHOT_IS_BEING_TAKEN_FOR_VM=Cannot ${action} ${type}.
Snapshot is currently being created for VM ${VmName}.
ACTION_TYPE_FAILED_DISK_IS_USED_FOR_CREATE_VM=Cannot ${action} ${type}. This
disk is currently in use to create VM ${VmName}.
ACTION_TYPE_FAILED_DISK_IS_BEING_REMOVED=Cannot ${action} ${type}. Disk
${DiskName} is being removed.
-ACTION_TYPE_FAILED_OVF_DISK_IS_BEING_USED=Cannot ${action} ${type}. Disk OVF
data is currently being updated..
+ACTION_TYPE_FAILED_OVF_DISK_IS_BEING_USED=Cannot ${action} ${type}. Disk OVF
data is currently being updated.
ACTION_TYPE_FAILED_DOMAIN_OVF_ON_UPDATE=Cannot ${action} ${type}. Storage
Domain OVF data is currently being updated.
ACTION_TYPE_FAILED_DISK_IS_BEING_MIGRATED=Cannot ${action} ${type}. Disk
${DiskName} is being moved or copied.
ACTION_TYPE_FAILED_DESTINATION_AND_SOURCE_STORAGE_SUB_TYPES_DIFFERENT=Cannot
${action} ${type}. Source and target domains must both be either file domains
or block domains.
@@ -679,7 +679,7 @@
ACTION_TYPE_FAILED_MAX_NUM_CPU=Cannot ${action} ${type}. Max number of cpu
exceeded
ACTION_TYPE_FAILED_MAX_NUM_SOCKETS=Cannot ${action} ${type}. Max number of
sockets exceeded
VMT_CANNOT_IMPORT_TEMPLATE_EXISTS=Import Template failed - Template Id already
exist in the system. Please remove the Template (${TemplateName}) from the
system first
-VMT_CANNOT_IMPORT_TEMPLATE_VERSION_MISSING_BASE=Cannot import Template
Version, Base Template for this Version is missing, please first Import Baste
Template, or Import Version as Base Template using Clone.
+VMT_CANNOT_IMPORT_TEMPLATE_VERSION_MISSING_BASE=Cannot import Template
Version, Base Template for this Version is missing, please first Import Base
Template, or Import Version as Base Template using Clone.
VM_CANNOT_IMPORT_TEMPLATE_NAME_EXISTS=Import Template failed - Template Name
already exist in the system. Please rename the Template in the system first
VM_CANNOT_IMPORT_VM_EXISTS=Import VM failed - VM Id already exist in the
system. Please remove the VM (${VmName}) from the system first
VM_CANNOT_IMPORT_VM_NAME_EXISTS=Import VM failed - VM Name already exist in
the system. Please rename the VM in the system first
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 012b8e4..b35b367 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
@@ -1849,7 +1849,7 @@
@DefaultStringValue("Import Template failed - Template Id already exist in
the system. Please remove the Template (${TemplateName}) from the system first")
String VMT_CANNOT_IMPORT_TEMPLATE_EXISTS();
- @DefaultStringValue("Cannot import Template Version, Base Template for
this Version is missing, please first Import Baste Template, or Import Version
as Base Template using Clone.")
+ @DefaultStringValue("Cannot import Template Version, Base Template for
this Version is missing, please first Import Base Template, or Import Version
as Base Template using Clone.")
String VMT_CANNOT_IMPORT_TEMPLATE_VERSION_MISSING_BASE();
@DefaultStringValue("Import Template failed - Template Name already exist
in the system. Please rename the Template in the system first")
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 da311f6..59a60bb 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
@@ -627,7 +627,7 @@
ACTION_TYPE_FAILED_SNAPSHOT_IS_BEING_TAKEN_FOR_VM=Cannot ${action} ${type}.
Snapshot is currently being created for VM ${VmName}.
ACTION_TYPE_FAILED_DISK_IS_USED_FOR_CREATE_VM=Cannot ${action} ${type}. This
disk is currently in use to create VM ${VmName}.
ACTION_TYPE_FAILED_DISK_IS_BEING_REMOVED=Cannot ${action} ${type}. Disk
${DiskName} is being removed.
-ACTION_TYPE_FAILED_OVF_DISK_IS_BEING_USED=Cannot ${action} ${type}. Disk OVF
data is currently being updated..
+ACTION_TYPE_FAILED_OVF_DISK_IS_BEING_USED=Cannot ${action} ${type}. Disk OVF
data is currently being updated.
ACTION_TYPE_FAILED_DOMAIN_OVF_ON_UPDATE=Cannot ${action} ${type}. Storage
Domain OVF data is currently being updated.
ACTION_TYPE_FAILED_DISK_IS_BEING_MIGRATED=Cannot ${action} ${type}. Disk
${DiskName} is being moved or copied.
ACTION_TYPE_FAILED_DESTINATION_AND_SOURCE_STORAGE_SUB_TYPES_DIFFERENT=Cannot
${action} ${type}. Source and target domains must both be either file domains
or block domains.
@@ -659,7 +659,7 @@
ACTION_TYPE_FAILED_MAX_NUM_CPU=Cannot ${action} ${type}. Max number of cpu
exceeded
ACTION_TYPE_FAILED_MAX_NUM_SOCKETS=Cannot ${action} ${type}. Max number of
sockets exceeded
VMT_CANNOT_IMPORT_TEMPLATE_EXISTS=Import Template failed - Template Id already
exist in the system. Please remove the Template (${TemplateName}) from the
system first
-VMT_CANNOT_IMPORT_TEMPLATE_VERSION_MISSING_BASE=Cannot import Template
Version, Base Template for this Version is missing, please first Import Baste
Template, or Import Version as Base Template using Clone.
+VMT_CANNOT_IMPORT_TEMPLATE_VERSION_MISSING_BASE=Cannot import Template
Version, Base Template for this Version is missing, please first Import Base
Template, or Import Version as Base Template using Clone.
VM_CANNOT_IMPORT_TEMPLATE_NAME_EXISTS=Import Template failed - Template Name
already exist in the system. Please rename the Template in the system first
VM_CANNOT_IMPORT_VM_EXISTS=Import VM failed - VM Id already exist in the
system. Please remove the VM (${VmName}) from the system first
VM_CANNOT_IMPORT_VM_NAME_EXISTS=Import VM failed - VM Name already exist in
the system. Please rename the VM in the system first
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 e5e8b8b..2ab4611 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
@@ -648,7 +648,7 @@
ACTION_TYPE_FAILED_SNAPSHOT_IS_BEING_TAKEN_FOR_VM=Cannot ${action} ${type}.
Snapshot is currently being created for VM ${VmName}.
ACTION_TYPE_FAILED_DISK_IS_USED_FOR_CREATE_VM=Cannot ${action} ${type}. This
disk is currently in use to create VM ${VmName}.
ACTION_TYPE_FAILED_DISK_IS_BEING_REMOVED=Cannot ${action} ${type}. Disk
${DiskName} is being removed.
-ACTION_TYPE_FAILED_OVF_DISK_IS_BEING_USED=Cannot ${action} ${type}. Disk OVF
data is currently being updated..
+ACTION_TYPE_FAILED_OVF_DISK_IS_BEING_USED=Cannot ${action} ${type}. Disk OVF
data is currently being updated.
ACTION_TYPE_FAILED_DOMAIN_OVF_ON_UPDATE=Cannot ${action} ${type}. Storage
Domain OVF data is currently being updated.
ACTION_TYPE_FAILED_DISK_IS_BEING_MIGRATED=Cannot ${action} ${type}. Disk
${DiskName} is being moved or copied.
ACTION_TYPE_FAILED_DESTINATION_AND_SOURCE_STORAGE_SUB_TYPES_DIFFERENT=Cannot
${action} ${type}. Source and target domains must both be either file domains
or block domains.
@@ -680,7 +680,7 @@
ACTION_TYPE_FAILED_MAX_NUM_CPU=Cannot ${action} ${type}. Max number of cpu
exceeded
ACTION_TYPE_FAILED_MAX_NUM_SOCKETS=Cannot ${action} ${type}. Max number of
sockets exceeded
VMT_CANNOT_IMPORT_TEMPLATE_EXISTS=Import Template failed - Template Id already
exist in the system. Please remove the Template (${TemplateName}) from the
system first
-VMT_CANNOT_IMPORT_TEMPLATE_VERSION_MISSING_BASE=Cannot import Template
Version, Base Template for this Version is missing, please first Import Baste
Template, or Import Version as Base Template using Clone.
+VMT_CANNOT_IMPORT_TEMPLATE_VERSION_MISSING_BASE=Cannot import Template
Version, Base Template for this Version is missing, please first Import Base
Template, or Import Version as Base Template using Clone.
VM_CANNOT_IMPORT_TEMPLATE_NAME_EXISTS=Import Template failed - Template Name
already exist in the system. Please rename the Template in the system first
VM_CANNOT_IMPORT_VM_EXISTS=Import VM failed - VM Id already exist in the
system. Please remove the VM (${VmName}) from the system first
VM_CANNOT_IMPORT_VM_NAME_EXISTS=Import VM failed - VM Name already exist in
the system. Please rename the VM in the system first
--
To view, visit http://gerrit.ovirt.org/26081
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7deb6de9bb3c2bc84bf9911104391fdf50d9fc0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofren...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
