From 64409fded659e13a036d979c8d9aee92b17f2a40 Mon Sep 17 00:00:00 2001 From: Gabor Apati-Nagy Date: Mon, 15 Jun 2015 16:19:52 +0100 Subject: [PATCH] CP-11985: Implement RPU pre-check phase for safe repartitioning edited Messages.resx Signed-off-by: Gabor Apati-Nagy --- XenModel/Messages.Designer.cs | 10 +++++----- XenModel/Messages.resx | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index f31f9e21f..8ffd813c8 100644 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -24520,9 +24520,9 @@ namespace XenAdmin { /// /// Looks up a localized string similar to VMs on local disk will prevent disk repartitioning. /// - ///New disk partitioning scheme is available in XenServer 7 that includes larger dom0 and backup partitions, dedicated partitions for logging, swap and UEFI. + ///A new disk partitioning scheme is available in XenServer 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI. /// - ///To benefit from repartitioning on upgrade to XenServer 7, VMs must be moved from local storage first.. + ///However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to XenServer 7.0, VMs must be moved from local storage first.. /// public static string NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_LONG { get { @@ -24542,9 +24542,9 @@ namespace XenAdmin { /// /// Looks up a localized string similar to The disk size of the local storage prevents repartitioning. /// - ///New disk partitioning scheme is available in XenServer 7 that includes larger dom0 and backup partitions, dedicated partitions for logging, swap and UEFI. + ///A new disk partitioning scheme is available in XenServer 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI. /// - ///On continuing with the upgrade to XenServer 7, current partitioning scheme will be preserved.. + ///However, there is not enough space to perform the repartitioning, so the current partitioning scheme will be retained.. /// public static string NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE_LONG { get { diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 5a204af6c..a5b17c88a 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -8519,9 +8519,9 @@ It is strongly recommended that you Cancel and apply the latest version of the p VMs on local disk will prevent disk repartitioning. -New disk partitioning scheme is available in XenServer 7 that includes larger dom0 and backup partitions, dedicated partitions for logging, swap and UEFI. +A new disk partitioning scheme is available in XenServer 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI. -To benefit from repartitioning on upgrade to XenServer 7, VMs must be moved from local storage first. +However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to XenServer 7.0, VMs must be moved from local storage first. {0}: VMs on local disk will prevent disk repartitioning. @@ -8529,9 +8529,9 @@ To benefit from repartitioning on upgrade to XenServer 7, VMs must be moved from The disk size of the local storage prevents repartitioning. -New disk partitioning scheme is available in XenServer 7 that includes larger dom0 and backup partitions, dedicated partitions for logging, swap and UEFI. +A new disk partitioning scheme is available in XenServer 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI. -On continuing with the upgrade to XenServer 7, current partitioning scheme will be preserved. +However, there is not enough space to perform the repartitioning, so the current partitioning scheme will be retained. {0}: The disk size of the local storage prevents repartitioning.