diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs index 846cd2388..ba0b72adf 100644 --- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs +++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs @@ -26,7 +26,8 @@ namespace XenAdmin.Wizards.PatchingWizard public override string Text { get { return Messages.PATCHINGWIZARD_UPLOADPAGE_TEXT; } } - public override string PageTitle { get { return Messages.PATCHINGWIZARD_UPLOADPAGE_TITLE; } } + private string pageTitle = Messages.PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD; + public override string PageTitle { get { return pageTitle; } } public override string HelpID { get { return "UploadPatch"; } } @@ -40,7 +41,7 @@ namespace XenAdmin.Wizards.PatchingWizard public readonly Dictionary NewUploadedPatches = new Dictionary(); private Dictionary> uploadedUpdates = new Dictionary>(); - private Pool_patch _patch = null; + private Pool_patch _patch; public Pool_patch Patch { get { return _patch; } @@ -73,9 +74,13 @@ namespace XenAdmin.Wizards.PatchingWizard || !File.Exists(AllDownloadedPatches[selectedPatch.Uuid]))) { DownloadFile(); + label2.Text = Messages.PATCHINGWIZARD_UPLOADPAGE_MESSAGE_DOWNLOAD_AND_UPLOAD; + pageTitle = Messages.PATCHINGWIZARD_UPLOADPAGE_TITLE_DOWNLOAD_AND_UPLOAD; } else { + label2.Text = Messages.PATCHINGWIZARD_UPLOADPAGE_MESSAGE_ONLY_UPLOAD; + pageTitle = Messages.PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD; if (selectedPatch != null && AllDownloadedPatches.ContainsKey(selectedPatch.Uuid)) SelectedNewPatchPath = AllDownloadedPatches[selectedPatch.Uuid]; PrepareUploadActions(); diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 177667c26..7ce93ab31 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. @@ -25966,6 +25966,26 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to XenCenter is now downloading your update and uploading it to the servers specified in the previous step. + ///Please wait for these operations to complete, then click Next to continue with the installation.. + /// + public static string PATCHINGWIZARD_UPLOADPAGE_MESSAGE_DOWNLOAD_AND_UPLOAD { + get { + return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_MESSAGE_DOWNLOAD_AND_UPLOAD", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to XenCenter is now uploading your update to the servers specified in the previous step. + ///Please wait for this operation to complete, then click Next to continue with the installation.. + /// + public static string PATCHINGWIZARD_UPLOADPAGE_MESSAGE_ONLY_UPLOAD { + get { + return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_MESSAGE_ONLY_UPLOAD", resourceCulture); + } + } + /// /// Looks up a localized string similar to Upload. /// @@ -25976,11 +25996,20 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Uploading selected file to your servers. + /// Looks up a localized string similar to Downloading and uploading the selected file to your servers. /// - public static string PATCHINGWIZARD_UPLOADPAGE_TITLE { + public static string PATCHINGWIZARD_UPLOADPAGE_TITLE_DOWNLOAD_AND_UPLOAD { get { - return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_TITLE", resourceCulture); + return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_TITLE_DOWNLOAD_AND_UPLOAD", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Uploading the selected file to your servers. + /// + public static string PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD { + get { + return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD", resourceCulture); } } diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index ab78bb63f..9e0d3b63d 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -8961,11 +8961,22 @@ However, there is not enough space to perform the repartitioning, so the current Select the servers you wish to update + + XenCenter is now downloading your update and uploading it to the servers specified in the previous step. +Please wait for these operations to complete, then click Next to continue with the installation. + + + XenCenter is now uploading your update to the servers specified in the previous step. +Please wait for this operation to complete, then click Next to continue with the installation. + Upload - - Uploading selected file to your servers + + Downloading and uploading the selected file to your servers + + + Uploading the selected file to your servers Eject any virtual CDs from your VMs