Martin Mucha has uploaded a new change for review. Change subject: <userportal|webadmin>: fixed badly formed multi-line values. ......................................................................
<userportal|webadmin>: fixed badly formed multi-line values. few multi-line values were invalid, which caused that only substring was presented to the user. Bug-Url: https://bugzilla.redhat.com/1075509 Bug-Url: https://bugzilla.redhat.com/1075508 Change-Id: I58f14efbc29ea7a8ba9f741175b17a62ee320f86 Signed-off-by: Martin Mucha <[email protected]> --- 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 2 files changed, 4 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/25657/1 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 73f6d66..6534b9e 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 @@ -78,10 +78,9 @@ wait for operation to complete and retry. VDS_CANNOT_MAINTENANCE_IT_INCLUDES_NON_MIGRATABLE_VM=Cannot switch the following Hosts to Maintenance mode: ${HostsList}.\n\ One or more running VMs are indicated as non-migratable. The non-migratable VMs are: ${VmsList}. -VDS_CANNOT_MAINTENANCE_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot switch the following Hosts to Maintenance mode: ${HostsList}.\n +VDS_CANNOT_MAINTENANCE_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot switch the following Hosts to Maintenance mode: ${HostsList}.\n\ The following VMs cannot be migrated because they have activated Disk Snapshot attached (VM/Disk Snapshots): \n \n\ - ${disksInfo} \n \n -please deactivate/detach the Disk snapshots or turn off those VMs and try again. + ${disksInfo} \n \nplease deactivate/detach the Disk snapshots or turn off those VMs and try again. VDS_CANNOT_REMOVE_DEFAULT_VDS_GROUP=Cannot remove default Host Cluster. VDS_CANNOT_REMOVE_VDS_DETECTED_RUNNING_VM=Cannot ${action} ${type}. One or more VMs are still running on this Host. VDS_CANNOT_REMOVE_VDS_GROUP_VDS_DETECTED=Cannot ${action} ${type}. Host Cluster contains one or more Hosts. @@ -207,8 +206,7 @@ ACTION_TYPE_FAILED_VDS_VM_NETWORKS=Cannot ${action} ${type}. There are no available running Hosts with all the networks used by the VM. ACTION_TYPE_FAILED_MISSING_DISPLAY_NETWORK=Cannot ${action} ${type}. There are no available running Hosts with the cluster's display network. ACTION_TYPE_FAILED_NO_HA_VDS=Cannot ${action} ${type}. There are no available HA hosts in the VM's Cluster. -CANNOT_MAINTENANCE_VDS_RUN_VMS_NO_OTHER_RUNNING_VDS=The following Hosts have running VMs and cannot be switched to maintenance mode: ${HostsList}. -Please ensure that the following Clusters have at least one Host in UP state: ${ClustersList}. +CANNOT_MAINTENANCE_VDS_RUN_VMS_NO_OTHER_RUNNING_VDS=The following Hosts have running VMs and cannot be switched to maintenance mode: ${HostsList}.Please ensure that the following Clusters have at least one Host in UP state: ${ClustersList}. ACTION_TYPE_FAILED_VDS_VM_VERSION=Cannot ${action} ${type}. VM's tools version (${toolsVersion}) mismatch with the Host's (${serverVersion}) version. ACTION_TYPE_FAILED_VDS_VM_SWAP=Cannot ${action} ${type}. Host swap percentage is above the defined threshold.\n\ - Check your configuration parameters for Host Swap Percentage. 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 b3c51dd..044633c 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 @@ -209,8 +209,7 @@ ACTION_TYPE_FAILED_VDS_VM_NETWORKS=Cannot ${action} ${type}. There are no available running Hosts with all the networks used by the VM. ACTION_TYPE_FAILED_MISSING_DISPLAY_NETWORK=Cannot ${action} ${type}. There are no available running Hosts with the cluster's display network. ACTION_TYPE_FAILED_NO_HA_VDS=Cannot ${action} ${type}. There are no available HA hosts in the VM's Cluster. -CANNOT_MAINTENANCE_VDS_RUN_VMS_NO_OTHER_RUNNING_VDS=The following Hosts have running VMs and cannot be switched to maintenance mode: ${HostsList}. -Please ensure that the following Clusters have at least one Host in UP state: ${ClustersList}. +CANNOT_MAINTENANCE_VDS_RUN_VMS_NO_OTHER_RUNNING_VDS=The following Hosts have running VMs and cannot be switched to maintenance mode: ${HostsList}. Please ensure that the following Clusters have at least one Host in UP state: ${ClustersList}. ACTION_TYPE_FAILED_VDS_VM_VERSION=Cannot ${action} ${type}. VM's tools version (${toolsVersion}) mismatch with the Host's (${serverVersion}) version. ACTION_TYPE_FAILED_VDS_VM_SWAP=Cannot ${action} ${type}. Host swap percentage is above the defined threshold.\n\ - Check your configuration parameters for Host Swap Percentage. -- To view, visit http://gerrit.ovirt.org/25657 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58f14efbc29ea7a8ba9f741175b17a62ee320f86 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
