From 4a2b27e8ab3cf1ad11171d21de1045eef70d3d1e Mon Sep 17 00:00:00 2001
From: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
Date: Wed, 9 Nov 2016 15:52:52 +0000
Subject: [PATCH] [CA-228729] Improve the message shown on finishing the update
 installation

Changed the message to Delete/Deleting/Deleted update installation files, as used in other messages.
---
 .../Wizards/PatchingWizard/PatchingWizard.cs  |  6 +--
 XenModel/Messages.Designer.cs                 | 54 +++++++++----------
 XenModel/Messages.resx                        | 18 +++----
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs b/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs
index 7203f63f3..9d57d8ce9 100644
--- a/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs
+++ b/XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs
@@ -309,19 +309,19 @@ namespace XenAdmin.Wizards.PatchingWizard
         private void RemoveUnwantedPatches(List<Pool_patch> patchesToRemove)
         {
             List<AsyncAction> subActions = GetRemovePatchActions(patchesToRemove);
-            RunMultipleActions(Messages.CLEAN_UPDATE_FILES, Messages.CLEANING_UPDATE_FILES, Messages.CLEANED_UPDATE_FILES, subActions);
+            RunMultipleActions(Messages.PATCHINGWIZARD_REMOVE_UPDATES, Messages.PATCHINGWIZARD_REMOVING_UPDATES, Messages.PATCHINGWIZARD_REMOVED_UPDATES, subActions);
         }
 
         private void RemoveTemporaryVdis()
         {
             List<AsyncAction> subActions = GetRemoveVdiActions();
-            RunMultipleActions(Messages.CLEAN_UPDATE_FILES, Messages.CLEANING_UPDATE_FILES, Messages.CLEANED_UPDATE_FILES, subActions);
+            RunMultipleActions(Messages.PATCHINGWIZARD_REMOVE_UPDATES, Messages.PATCHINGWIZARD_REMOVING_UPDATES, Messages.PATCHINGWIZARD_REMOVED_UPDATES, subActions);
         }
 
         private void CleanUpPoolUpdates()
         {
             var subActions = GetCleanUpPoolUpdateActions();
-            RunMultipleActions(Messages.CLEAN_UPDATE_FILES, Messages.CLEANING_UPDATE_FILES, Messages.CLEANED_UPDATE_FILES, subActions);
+            RunMultipleActions(Messages.PATCHINGWIZARD_REMOVE_UPDATES, Messages.PATCHINGWIZARD_REMOVING_UPDATES, Messages.PATCHINGWIZARD_REMOVED_UPDATES, subActions);
         }
 
         private void RemoveDownloadedPatches()
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index 0c929ee00..00e7ee15d 100755
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -7047,33 +7047,6 @@ namespace XenAdmin {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Clean Update Files.
-        /// </summary>
-        public static string CLEAN_UPDATE_FILES {
-            get {
-                return ResourceManager.GetString("CLEAN_UPDATE_FILES", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cleaned Update Files.
-        /// </summary>
-        public static string CLEANED_UPDATE_FILES {
-            get {
-                return ResourceManager.GetString("CLEANED_UPDATE_FILES", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Cleaning Update Files.
-        /// </summary>
-        public static string CLEANING_UPDATE_FILES {
-            get {
-                return ResourceManager.GetString("CLEANING_UPDATE_FILES", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Clear Search.
         /// </summary>
@@ -26715,6 +26688,33 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Delete update installation files.
+        /// </summary>
+        public static string PATCHINGWIZARD_REMOVE_UPDATES {
+            get {
+                return ResourceManager.GetString("PATCHINGWIZARD_REMOVE_UPDATES", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Deleted update installation files.
+        /// </summary>
+        public static string PATCHINGWIZARD_REMOVED_UPDATES {
+            get {
+                return ResourceManager.GetString("PATCHINGWIZARD_REMOVED_UPDATES", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Deleting update installation files.
+        /// </summary>
+        public static string PATCHINGWIZARD_REMOVING_UPDATES {
+            get {
+                return ResourceManager.GetString("PATCHINGWIZARD_REMOVING_UPDATES", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Choose Update File.
         /// </summary>
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
index cfe926aeb..905cda804 100755
--- a/XenModel/Messages.resx
+++ b/XenModel/Messages.resx
@@ -9966,9 +9966,6 @@ To log out of this server and log in again using a different user account, enter
   <data name="REMOVED_UPDATE" xml:space="preserve">
     <value>Removed Update '{0}'</value>
   </data>
-  <data name="CLEANED_UPDATE_FILES" xml:space="preserve">
-    <value>Cleaned Update Files</value>
-  </data>
   <data name="REMOVED_VMS_FROM_APPLIANCE" xml:space="preserve">
     <value>Removed from vApp </value>
   </data>
@@ -10035,9 +10032,6 @@ Click Server Status Report to open the Compile Server Status Report Wizard or cl
   <data name="REMOVE_STORAGE_SYSTEMS" xml:space="preserve">
     <value>R&amp;emove Storage Systems</value>
   </data>
-  <data name="CLEAN_UPDATE_FILES" xml:space="preserve">
-    <value>Clean Update Files</value>
-  </data>
   <data name="REMOVE_VIRTUAL_DISK" xml:space="preserve">
     <value>Remove Virtual Disk</value>
   </data>
@@ -10065,9 +10059,6 @@ Click Server Status Report to open the Compile Server Status Report Wizard or cl
   <data name="REMOVING_UPDATE" xml:space="preserve">
     <value>Removing Update '{0}'...</value>
   </data>
-  <data name="CLEANING_UPDATE_FILES" xml:space="preserve">
-    <value>Cleaning Update Files</value>
-  </data>
   <data name="REMOVING_VMS_FROM_APPLIANCE" xml:space="preserve">
     <value>Removing from vApp</value>
   </data>
@@ -13345,4 +13336,13 @@ You will need to navigate to the Console on each of the selected VMs to complete
   <data name="YOU_ARE_HERE" xml:space="preserve">
     <value>You are here</value>
   </data>
+  <data name="PATCHINGWIZARD_REMOVED_UPDATES" xml:space="preserve">
+    <value>Deleted update installation files</value>
+  </data>
+  <data name="PATCHINGWIZARD_REMOVE_UPDATES" xml:space="preserve">
+    <value>Delete update installation files</value>
+  </data>
+  <data name="PATCHINGWIZARD_REMOVING_UPDATES" xml:space="preserve">
+    <value>Deleting update installation files</value>
+  </data>
 </root>
\ No newline at end of file