diff --git a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs index 0e66dac50..cddbea0e4 100644 --- a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs +++ b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs @@ -215,18 +215,17 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard groups.Add(new CheckGroup(Messages.CHECKING_SAFE_TO_UPGRADE, upgradeChecks)); } - //Checking automated updates license if apply updates checkbox is ticked + //Checking automated updates are possible if apply updates checkbox is ticked if (ApplyUpdatesToNewVersion) { - var automatedUpdateLicenseChecks = new List(); + var automatedUpdateChecks = new List(); foreach (var pool in SelectedPools) - automatedUpdateLicenseChecks.Add(new AutomatedUpdatesLicenseCheck(pool)); + automatedUpdateChecks.Add(new AutomatedUpdatesLicenseCheck(pool)); - groups.Add(new CheckGroup(Messages.CHECKING_AUTOMATED_UPDATES_LICENSE_STATUS, - automatedUpdateLicenseChecks)); + automatedUpdateChecks.Add(new CfuAvailabilityCheck()); - var cfuCheck = new List {new CfuAvailabilityCheck()}; - groups.Add(new CheckGroup(Messages.CHECKING_CFU_STATUS, cfuCheck)); + groups.Add(new CheckGroup(Messages.CHECKING_AUTOMATED_UPDATES_POSSIBLE, + automatedUpdateChecks)); } return groups; diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 82616e5a6..0be901592 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -6983,11 +6983,11 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Checking automated updates license status. + /// Looks up a localized string similar to Checking automated updates can be applied. /// - public static string CHECKING_AUTOMATED_UPDATES_LICENSE_STATUS { + public static string CHECKING_AUTOMATED_UPDATES_POSSIBLE { get { - return ResourceManager.GetString("CHECKING_AUTOMATED_UPDATES_LICENSE_STATUS", resourceCulture); + return ResourceManager.GetString("CHECKING_AUTOMATED_UPDATES_POSSIBLE", resourceCulture); } } @@ -7000,15 +7000,6 @@ namespace XenAdmin { } } - /// - /// Looks up a localized string similar to Checking ability to download updates. - /// - public static string CHECKING_CFU_STATUS { - get { - return ResourceManager.GetString("CHECKING_CFU_STATUS", resourceCulture); - } - } - /// /// Looks up a localized string similar to Checking for pending restart. /// diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index d2993d80b..bbbcde89d 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -2533,15 +2533,12 @@ Do you want to assign these VMs to the schedule '{0}' instead? Do you want to assign it to the schedule '{2}' instead? - - Checking automated updates license status + + Checking automated updates can be applied Checking VM migration status - - Checking ability to download updates - Checking for pending restart