Merge pull request #1787 from jijiang/master

REQ-534: Fix some UI text display

XenAdmin/TabPages/ManageUpdatesPage.Designer.cs

@@ -377,6 +377,75 @@
             this.dataGridViewHosts.ReadOnly = true;
             this.dataGridViewHosts.Updating = false;
             // 
+            // ColumnExpansion
+            // 
+            this.ColumnExpansion.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.NullValue = ((object)(resources.GetObject("dataGridViewCellStyle1.NullValue")));
+            this.ColumnExpansion.DefaultCellStyle = dataGridViewCellStyle1;
+            resources.ApplyResources(this.ColumnExpansion, "ColumnExpansion");
+            this.ColumnExpansion.Name = "ColumnExpansion";
+            this.ColumnExpansion.ReadOnly = true;
+            // 
+            // ColumnIcon
+            // 
+            this.ColumnIcon.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.NullValue = ((object)(resources.GetObject("dataGridViewCellStyle2.NullValue")));
+            this.ColumnIcon.DefaultCellStyle = dataGridViewCellStyle2;
+            resources.ApplyResources(this.ColumnIcon, "ColumnIcon");
+            this.ColumnIcon.Name = "ColumnIcon";
+            this.ColumnIcon.ReadOnly = true;
+            this.ColumnIcon.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            // 
+            // ColumnName
+            // 
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.ColumnName.DefaultCellStyle = dataGridViewCellStyle3;
+            this.ColumnName.FillWeight = 40F;
+            resources.ApplyResources(this.ColumnName, "ColumnName");
+            this.ColumnName.Name = "ColumnName";
+            this.ColumnName.ReadOnly = true;
+            // 
+            // ColumnVersion
+            // 
+            this.ColumnVersion.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.ColumnVersion.FillWeight = 20F;
+            resources.ApplyResources(this.ColumnVersion, "ColumnVersion");
+            this.ColumnVersion.Name = "ColumnVersion";
+            this.ColumnVersion.ReadOnly = true;
+            this.ColumnVersion.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            // 
+            // ColumnPatchingStatus
+            // 
+            this.ColumnPatchingStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            resources.ApplyResources(this.ColumnPatchingStatus, "ColumnPatchingStatus");
+            this.ColumnPatchingStatus.Name = "ColumnPatchingStatus";
+            this.ColumnPatchingStatus.ReadOnly = true;
+            // 
+            // ColumnStatus
+            // 
+            this.ColumnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.ColumnStatus.FillWeight = 20F;
+            resources.ApplyResources(this.ColumnStatus, "ColumnStatus");
+            this.ColumnStatus.Name = "ColumnStatus";
+            this.ColumnStatus.ReadOnly = true;
+            // 
+            // ColumnRequiredUpdate
+            // 
+            resources.ApplyResources(this.ColumnRequiredUpdate, "ColumnRequiredUpdate");
+            this.ColumnRequiredUpdate.Name = "ColumnRequiredUpdate";
+            this.ColumnRequiredUpdate.ReadOnly = true;
+            this.ColumnRequiredUpdate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.ColumnRequiredUpdate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // ColumnInstalledUpdate
+            // 
+            resources.ApplyResources(this.ColumnInstalledUpdate, "ColumnInstalledUpdate");
+            this.ColumnInstalledUpdate.Name = "ColumnInstalledUpdate";
+            this.ColumnInstalledUpdate.ReadOnly = true;
+            this.ColumnInstalledUpdate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
             // dataGridViewUpdates
             // 
             this.dataGridViewUpdates.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
@@ -450,75 +519,6 @@
             this.ColumnWebPage.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.ColumnWebPage.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             // 
-            // ColumnExpansion
-            // 
-            this.ColumnExpansion.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle1.NullValue = ((object)(resources.GetObject("dataGridViewCellStyle1.NullValue")));
-            this.ColumnExpansion.DefaultCellStyle = dataGridViewCellStyle1;
-            resources.ApplyResources(this.ColumnExpansion, "ColumnExpansion");
-            this.ColumnExpansion.Name = "ColumnExpansion";
-            this.ColumnExpansion.ReadOnly = true;
-            // 
-            // ColumnIcon
-            // 
-            this.ColumnIcon.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.NullValue = ((object)(resources.GetObject("dataGridViewCellStyle2.NullValue")));
-            this.ColumnIcon.DefaultCellStyle = dataGridViewCellStyle2;
-            resources.ApplyResources(this.ColumnIcon, "ColumnIcon");
-            this.ColumnIcon.Name = "ColumnIcon";
-            this.ColumnIcon.ReadOnly = true;
-            this.ColumnIcon.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            // 
-            // ColumnName
-            // 
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.ColumnName.DefaultCellStyle = dataGridViewCellStyle3;
-            this.ColumnName.FillWeight = 40F;
-            resources.ApplyResources(this.ColumnName, "ColumnName");
-            this.ColumnName.Name = "ColumnName";
-            this.ColumnName.ReadOnly = true;
-            // 
-            // ColumnVersion
-            // 
-            this.ColumnVersion.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.ColumnVersion.FillWeight = 20F;
-            resources.ApplyResources(this.ColumnVersion, "ColumnVersion");
-            this.ColumnVersion.Name = "ColumnVersion";
-            this.ColumnVersion.ReadOnly = true;
-            this.ColumnVersion.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            // 
-            // ColumnPatchingStatus
-            // 
-            this.ColumnPatchingStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            resources.ApplyResources(this.ColumnPatchingStatus, "ColumnPatchingStatus");
-            this.ColumnPatchingStatus.Name = "ColumnPatchingStatus";
-            this.ColumnPatchingStatus.ReadOnly = true;
-            // 
-            // ColumnStatus
-            // 
-            this.ColumnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.ColumnStatus.FillWeight = 20F;
-            resources.ApplyResources(this.ColumnStatus, "ColumnStatus");
-            this.ColumnStatus.Name = "ColumnStatus";
-            this.ColumnStatus.ReadOnly = true;
-            // 
-            // ColumnRequiredUpdate
-            // 
-            resources.ApplyResources(this.ColumnRequiredUpdate, "ColumnRequiredUpdate");
-            this.ColumnRequiredUpdate.Name = "ColumnRequiredUpdate";
-            this.ColumnRequiredUpdate.ReadOnly = true;
-            this.ColumnRequiredUpdate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.ColumnRequiredUpdate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // ColumnInstalledUpdate
-            // 
-            resources.ApplyResources(this.ColumnInstalledUpdate, "ColumnInstalledUpdate");
-            this.ColumnInstalledUpdate.Name = "ColumnInstalledUpdate";
-            this.ColumnInstalledUpdate.ReadOnly = true;
-            this.ColumnInstalledUpdate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
             // ManageUpdatesPage
             // 
             resources.ApplyResources(this, "$this");

XenAdmin/TabPages/ManageUpdatesPage.cs

@@ -1318,7 +1318,7 @@ namespace XenAdmin.TabPages
                         else      // host view
                         {
                             stream.WriteLine("{0},{1},{2},{3},{4},{5}", Messages.POOL,
-                                Messages.SERVER, Messages.VERSION, Messages.PATCHING_STATUS,
+                                Messages.SERVER, Messages.VERSION, Messages.STATUS,
                                 Messages.REQUIRED_UPDATES, Messages.INSTALLED_UPDATES);
 
                             if (exportAll)

XenAdmin/TabPages/ManageUpdatesPage.resx

@@ -265,7 +265,7 @@
     <value>152, 22</value>
   </data>
   <data name="byHostToolStripMenuItem.Text" xml:space="preserve">
-    <value>By &amp;Host</value>
+    <value>By &amp;Server</value>
   </data>
   <data name="toolStripDropDownButtonView.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

XenModel/Messages.Designer.cs

@@ -26273,15 +26273,6 @@ namespace XenAdmin {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Patching Status.
-        /// </summary>
-        public static string PATCHING_STATUS {
-            get {
-                return ResourceManager.GetString("PATCHING_STATUS", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Disable HA until after all the hosts have been rebooted.
         /// </summary>

XenModel/Messages.resx

@@ -9337,9 +9337,6 @@ Please wait for this operation to complete, then click Next to continue with the
   <data name="PATCHING_EJECT_CDS" xml:space="preserve">
     <value>Eject any virtual CDs from your VMs</value>
   </data>
-  <data name="PATCHING_STATUS" xml:space="preserve">
-    <value>Patching Status</value>
-  </data>
   <data name="PATCHING_WARNING_HA" xml:space="preserve">
     <value>Disable HA until after all the hosts have been rebooted</value>
   </data>