CP-15401: Show/Hide rdpPolling, upsell and optimize for XenApp depending on XenCenter registry keys

Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>

XenAdmin/Alerts/Types/MessageAlert.cs

@@ -348,8 +348,10 @@ namespace XenAdmin.Alerts
 
 					case XenAPI.Message.MessageType.LICENSE_EXPIRES_SOON:
 					case XenAPI.Message.MessageType.LICENSE_DOES_NOT_SUPPORT_POOLING:
-						return () => Program.OpenURL(InvisibleMessages.LICENSE_EXPIRY_WEBPAGE);
+                        if (XenAdmin.Core.Registry.LinkLabelHidden)
-
+                            return null;
+                        else
+                            return () => Program.OpenURL(XenAdmin.Core.Registry.LinkLabelHidden ? "" : InvisibleMessages.LICENSE_EXPIRY_WEBPAGE);
 					case XenAPI.Message.MessageType.VBD_QOS_FAILED:
 					case XenAPI.Message.MessageType.VCPU_QOS_FAILED:
 					case XenAPI.Message.MessageType.VIF_QOS_FAILED:

XenAdmin/Commands/AddHostToPoolCommand.cs

@@ -121,7 +121,8 @@ namespace XenAdmin.Commands
                 Helpers.FeatureForbidden(host, Host.RestrictCpuMasking) &&
                 !PoolJoinRules.FreeHostPaidMaster(host, master, false)))  // in this case we can upgrade the license and then mask the CPU
             {
-                UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_CPUMASKING, InvisibleMessages.UPSELL_LEARNMOREURL_CPUMASKING);
+                UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_CPUMASKING : Messages.UPSELL_BLURB_CPUMASKING + Messages.UPSELL_BLURB_CPUMASKING_MORE,
+                                                    InvisibleMessages.UPSELL_LEARNMOREURL_CPUMASKING);
                 dlg.ShowDialog(Parent);
                 return;
             }

XenAdmin/Commands/CrossPoolMigrateCommand.cs

@@ -93,7 +93,8 @@ namespace XenAdmin.Commands
 
         public static void ShowUpsellDialog(IWin32Window parent)
         {
-            UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_CPM, InvisibleMessages.UPSELL_LEARNMOREURL_CPM);
+            UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_CPM: Messages.UPSELL_BLURB_CPM + Messages.UPSELL_BLURB_CPM_MORE,
+                                                InvisibleMessages.UPSELL_LEARNMOREURL_CPM);
             dlg.ShowDialog(parent);
         }
 

XenAdmin/Commands/DRConfigureCommand.cs

@@ -118,7 +118,8 @@ namespace XenAdmin.Commands
     	private static void ShowUpsellDialog(IWin32Window parent)
         {
             // Show upsell dialog
-            UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_DR, InvisibleMessages.UPSELL_LEARNMOREURL_DR);
+            UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_DR : Messages.UPSELL_BLURB_DR + Messages.UPSELL_BLURB_DR_MORE,
+                                                InvisibleMessages.UPSELL_LEARNMOREURL_DR);
             dlg.ShowDialog(parent);
         }
 

XenAdmin/Commands/DRDryrunCommand.cs

@@ -94,7 +94,8 @@ namespace XenAdmin.Commands
         public static void ShowUpsellDialog(IWin32Window parent)
         {
             // Show upsell dialog
-            UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_DR, InvisibleMessages.UPSELL_LEARNMOREURL_DR);
+            UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_DR : Messages.UPSELL_BLURB_DR + Messages.UPSELL_BLURB_DR_MORE,
+                                                InvisibleMessages.UPSELL_LEARNMOREURL_DR);
             dlg.ShowDialog(parent);
         }
 

XenAdmin/Commands/DRFailbackCommand.cs

@@ -97,7 +97,8 @@ namespace XenAdmin.Commands
         public static void ShowUpsellDialog(IWin32Window parent)
         {
             // Show upsell dialog
-            UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_DR, InvisibleMessages.UPSELL_LEARNMOREURL_DR);
+            UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_DR : Messages.UPSELL_BLURB_DR + Messages.UPSELL_BLURB_DR_MORE,
+                                                InvisibleMessages.UPSELL_LEARNMOREURL_DR);
             dlg.ShowDialog(parent);
         }
 

XenAdmin/Commands/DRFailoverCommand.cs

@@ -94,7 +94,8 @@ namespace XenAdmin.Commands
         public static void ShowUpsellDialog(IWin32Window parent)
         {
             // Show upsell dialog
-            UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_DR, InvisibleMessages.UPSELL_LEARNMOREURL_DR);
+            UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_DR : Messages.UPSELL_BLURB_DR + Messages.UPSELL_BLURB_DR_MORE,
+                                                InvisibleMessages.UPSELL_LEARNMOREURL_DR);
             dlg.ShowDialog(parent);
         }
 

XenAdmin/Commands/DisasterRecoveryCommand.cs

@@ -91,7 +91,8 @@ namespace XenAdmin.Commands
         public static void ShowUpsellDialog(IWin32Window parent)
         {
             // Show upsell dialog
-            UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_DR, InvisibleMessages.UPSELL_LEARNMOREURL_DR);
+            UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_DR : Messages.UPSELL_BLURB_DR + Messages.UPSELL_BLURB_DR_MORE, 
+                                                InvisibleMessages.UPSELL_LEARNMOREURL_DR);
             dlg.ShowDialog(parent);
         }
 

XenAdmin/Commands/DisconnectWlbServerCommand.cs

@@ -63,7 +63,8 @@ namespace XenAdmin.Commands
             if (Helpers.FeatureForbidden(selection[0].XenObject, Host.RestrictWLB))
             {
                 // Show upsell dialog
-                UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_WLB, InvisibleMessages.UPSELL_LEARNMOREURL_WLB);
+                UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_WLB : Messages.UPSELL_BLURB_WLB + Messages.UPSELL_BLURB_WLB_MORE,
+                                                    InvisibleMessages.UPSELL_LEARNMOREURL_WLB);
                 dlg.ShowDialog(Parent);
                 return;
             }

XenAdmin/Commands/HACommand.cs

@@ -82,7 +82,8 @@ namespace XenAdmin.Commands
             if (Helpers.FeatureForbidden(pool, Host.RestrictHA))
             {
                 // Show upsell dialog
-                UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_HA, InvisibleMessages.UPSELL_LEARNMOREURL_HA);
+                UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_HA : Messages.UPSELL_BLURB_HA + Messages.UPSELL_BLURB_HA_MORE,
+                                                    InvisibleMessages.UPSELL_LEARNMOREURL_HA);
                 dlg.ShowDialog(Parent);
             }
             else if (pool.ha_enabled)

XenAdmin/Commands/MigrateVirtualDiskCommand.cs

@@ -85,7 +85,8 @@ namespace XenAdmin.Commands
 
         public static void ShowUpsellDialog(IWin32Window parent)
         {
-            UpsellDialog dlg = new UpsellDialog(Messages.MIGRATE_VDI_UPSELL_BLURB, InvisibleMessages.UPSELL_LEARNMOREURL_CPM);
+            UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.MIGRATE_VDI_UPSELL_BLURB : Messages.MIGRATE_VDI_UPSELL_BLURB + Messages.MIGRATE_VDI_UPSELL_BLURB_MORE, 
+                                                InvisibleMessages.UPSELL_LEARNMOREURL_CPM);
             dlg.ShowDialog(parent);
         }
 

XenAdmin/Commands/ViewWorkloadReportsCommand.cs

@@ -84,7 +84,8 @@ namespace XenAdmin.Commands
             if (Helpers.FeatureForbidden(selection[0].XenObject, Host.RestrictWLB))
             {
                 // Show upsell dialog
-                UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_WLB, InvisibleMessages.UPSELL_LEARNMOREURL_WLB);
+                UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_WLB : Messages.UPSELL_BLURB_WLB + Messages.UPSELL_BLURB_WLB_MORE, 
+                                                    InvisibleMessages.UPSELL_LEARNMOREURL_WLB);
                 dlg.ShowDialog(Parent);
                 return;
             }

XenAdmin/Controls/DeprecationBanner.cs

@@ -57,7 +57,7 @@ namespace XenAdmin.Controls
         public DeprecationBanner()
         {
             InitializeComponent();
-            HelperLinkVisible = true;
+            HelperLinkVisible = !XenAdmin.Core.Registry.LinkLabelHidden;
             Visible = false;
             helperLink.Click += helperLink_Click;
             BackgroundColour = defaultBackgroundColour;

XenAdmin/Controls/UpsellPage.Designer.cs

@@ -42,6 +42,7 @@ namespace XenAdmin.Controls
             this.LearnMoreButton.Name = "LearnMoreButton";
             this.LearnMoreButton.UseVisualStyleBackColor = true;
             this.LearnMoreButton.Click += new System.EventHandler(this.LearnMoreButton_Clicked);
+            this.LearnMoreButton.Visible = !XenAdmin.Core.Registry.LearnMoreButtonHidden;
             // 
             // tableLayoutPanel1
             // 

XenAdmin/Core/Registry.cs

@@ -329,6 +329,41 @@ namespace XenAdmin.Core
             get { return ReadKey(HEALTH_CHECK_PRODUCT_KEY); }
         }
 
+        public static string HiddenFeatures
+        {
+            get { return ReadKey(HIDDEN_FEATURES); }
+        }
+
+        internal static bool CPSOptimizationHidden
+        {
+            get
+            { return HiddenFeatures.Contains(CPS_OPTIMIZATION_HIDDEN); }
+        }
+
+        internal static bool RDPPollingHidden
+        {
+            get
+            { return HiddenFeatures.Contains(RDP_POLLING_HIDDEN); }
+        }
+
+        internal static bool LearnMoreButtonHidden
+        {
+            get
+            { return HiddenFeatures.Contains(LEARN_MORE_HIDDEN); }
+        }
+
+        internal static bool LinkLabelHidden
+        {
+            get
+            { return HiddenFeatures.Contains(LINK_LABEL_HIDDEN); }
+        }
+
+        internal static bool ToolStripMenuItemHidden
+        {
+            get
+            { return HiddenFeatures.Contains(TOOL_STRIP_MENU_ITEM); }
+        }
+
         private const string SSL_CERTIFICATES_CHANGED_ONLY = "CHANGED";
         private const string SSL_CERTIFICATES_ALL = "ALL";
         private const string SSL_CERTIFICATES_KEY = "ForceSSLCertificates";
@@ -350,6 +385,12 @@ namespace XenAdmin.Core
         private const string HEALTH_CHECK_UPLOAD_DOMAIN_NAME = "HealthCheckUploadDomainName";
         private const string HEALTH_CHECK_DIAGNOSTIC_DOMAIN_NAME = "HealthCheckDiagnosticDomainName";
         private const string HEALTH_CHECK_PRODUCT_KEY = "HealthCheckProductKey";
+        private const string HIDDEN_FEATURES = "HiddenFeatures";
+        private const string CPS_OPTIMIZATION_HIDDEN = "cps_optimization";
+        private const string RDP_POLLING_HIDDEN = "rdp_polling";
+        private const string LEARN_MORE_HIDDEN = "learn_more";
+        private const string LINK_LABEL_HIDDEN = "link_label";
+        private const string TOOL_STRIP_MENU_ITEM = "tool_strip_menu_item";
     }
 
     public enum SSLCertificateTypes { None, Changed, All }

XenAdmin/Core/VMGroup.cs

@@ -139,7 +139,14 @@ namespace XenAdmin.Core
 
         internal static string UpsellBlurb
         {
-            get { return typeof(T) == typeof(VMPP) ? Messages.UPSELL_BLURB_VM_PROTECTION : Messages.UPSELL_BLURB_VM_APPLIANCES; }
+            get
+            {
+                if (XenAdmin.Core.Registry.LinkLabelHidden)
+                    return typeof(T) == typeof(VMPP) ? Messages.UPSELL_BLURB_VM_PROTECTION : Messages.UPSELL_BLURB_VM_APPLIANCES;
+                else
+                    return typeof(T) == typeof(VMPP) ? Messages.UPSELL_BLURB_VM_PROTECTION + Messages.UPSELL_BLURB_VM_PROTECTION_MORE : Messages.UPSELL_BLURB_VM_APPLIANCES + Messages.UPSELL_BLURB_VM_APPLIANCES_MORE;
+                
+            }
         }
 
         internal static string UpsellLearnMoreUrl

XenAdmin/Diagnostics/Problems/ConnectionProblem/VmprActivatedWarning.cs

@@ -55,7 +55,9 @@ namespace XenAdmin.Diagnostics.Problems.ConnectionProblem
 
         public override Uri UriToLaunch
         {
-            get { return new Uri(InvisibleMessages.VMPR_DEPRECATION_URL); }
+            get {
+                return new Uri(XenAdmin.Core.Registry.LinkLabelHidden ? "" : InvisibleMessages.VMPR_DEPRECATION_URL); 
+            }
         }
     }
 }

XenAdmin/Diagnostics/Problems/HostProblem/HostHasWssWarning.cs

@@ -56,7 +56,9 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
 
         public override Uri UriToLaunch
         {
-            get { return new Uri(InvisibleMessages.WSS_DEPRECATION_URL); }
+            get {
+                return new Uri(XenAdmin.Core.Registry.LinkLabelHidden ? "" : InvisibleMessages.WSS_DEPRECATION_URL);
+                }
         }
     }
 }

XenAdmin/Diagnostics/Problems/SRProblem/UnsupportedStorageLinkSrIsPresentProblem.cs

@@ -46,7 +46,7 @@ namespace XenAdmin.Diagnostics.Problems.SRProblem
         public override Uri UriToLaunch {
             get
             {
-                return new Uri(InvisibleMessages.ISL_DEPRECATION_URL);
+                return new Uri(XenAdmin.Core.Registry.LinkLabelHidden ? "" : InvisibleMessages.ISL_DEPRECATION_URL);
             }
         }
 

XenAdmin/Dialogs/ConnectionRefusedDialog.Designer.cs

@@ -68,6 +68,7 @@ namespace XenAdmin.Dialogs
             this.linkLabel.Name = "linkLabel";
             this.linkLabel.TabStop = true;
             this.linkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked);
+            this.linkLabel.Visible = !XenAdmin.Core.Registry.LinkLabelHidden;
             // 
             // buttonOk
             // 

XenAdmin/Dialogs/NewPoolDialog.cs

@@ -161,7 +161,8 @@ namespace XenAdmin.Dialogs
                     Helpers.FeatureForbidden(host, Host.RestrictCpuMasking) &&
                     !PoolJoinRules.FreeHostPaidMaster(host, master, false)))  // in this case we can upgrade the license and then mask the CPU
                 {
-                    UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_CPUMASKING, InvisibleMessages.UPSELL_LEARNMOREURL_CPUMASKING);
+                    UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_CPUMASKING : Messages.UPSELL_BLURB_CPUMASKING + Messages.UPSELL_BLURB_CPUMASKING_MORE,
+                                                        InvisibleMessages.UPSELL_LEARNMOREURL_CPUMASKING);
                     dlg.ShowDialog(this);
                     return;
                 }

XenAdmin/Dialogs/OptionsPages/ConsolesOptionsPage.cs

@@ -74,6 +74,7 @@ namespace XenAdmin.Dialogs.OptionsPages
             // Console scaling
             PreserveUndockedScaleCheckBox.Checked = Properties.Settings.Default.PreserveScaleWhenUndocked;
             PreserveVNCConsoleScalingCheckBox.Checked = Properties.Settings.Default.PreserveScaleWhenSwitchBackToVNC;
+            checkBoxDisableRDPPolling.Visible = !XenAdmin.Core.Registry.RDPPollingHidden;
             checkBoxDisableRDPPolling.Checked = Properties.Settings.Default.EnableRDPPolling;
         }
 

XenAdmin/Dialogs/OptionsPages/PluginOptionsPage.Designer.cs

@@ -129,6 +129,7 @@ namespace XenAdmin.Dialogs.OptionsPages
             this.linkLabel1.TabStop = true;
             this.linkLabel1.VisitedLinkColor = System.Drawing.Color.Blue;
             this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+            this.linkLabel1.Visible = !XenAdmin.Core.Registry.LinkLabelHidden;
             // 
             // tableLayoutPanel2
             // 

XenAdmin/Dialogs/PropertiesDialog.cs

@@ -156,7 +156,8 @@ namespace XenAdmin.Dialogs
                     if (Helpers.FeatureForbidden(xenObjectCopy, Host.RestrictAlerts))
                     {
                         PerfmonAlertUpsellEditPage = new UpsellPage {Image = Properties.Resources._000_Alert2_h32bit_16, Text = Messages.ALERTS};
-                        PerfmonAlertUpsellEditPage.SetAllTexts(Messages.UPSELL_BLURB_ALERTS, InvisibleMessages.UPSELL_LEARNMOREURL_ALERTS);
+                        PerfmonAlertUpsellEditPage.SetAllTexts(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_ALERTS : Messages.UPSELL_BLURB_ALERTS + Messages.UPSELL_BLURB_ALERTS_MORE, 
+                                                                InvisibleMessages.UPSELL_LEARNMOREURL_ALERTS);
                         ShowTab(PerfmonAlertUpsellEditPage);
                     }
                     else
@@ -170,7 +171,8 @@ namespace XenAdmin.Dialogs
                     if (Helpers.FeatureForbidden(xenObjectCopy, Host.RestrictAlerts))
                     {
                         PerfmonAlertOptionsUpsellEditPage = new UpsellPage {Image = Properties.Resources._000_Email_h32bit_16, Text = Messages.EMAIL_OPTIONS};
-                        PerfmonAlertOptionsUpsellEditPage.SetAllTexts(Messages.UPSELL_BLURB_ALERTS, InvisibleMessages.UPSELL_LEARNMOREURL_ALERTS);
+                        PerfmonAlertOptionsUpsellEditPage.SetAllTexts(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_ALERTS : Messages.UPSELL_BLURB_ALERTS + Messages.UPSELL_BLURB_ALERTS_MORE,
+                                                                        InvisibleMessages.UPSELL_LEARNMOREURL_ALERTS);
                         ShowTab(PerfmonAlertOptionsUpsellEditPage);
                     }
                     else
@@ -209,7 +211,8 @@ namespace XenAdmin.Dialogs
                     if (Helpers.FeatureForbidden(xenObjectCopy, Host.RestrictGpu))
                     {
                         GpuUpsellEditPage = new UpsellPage { Image = Properties.Resources._000_GetMemoryInfo_h32bit_16, Text = Messages.GPU };
-                        GpuUpsellEditPage.SetAllTexts(Messages.UPSELL_BLURB_GPU, InvisibleMessages.UPSELL_LEARNMOREURL_GPU);
+                        GpuUpsellEditPage.SetAllTexts(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_GPU : Messages.UPSELL_BLURB_GPU + Messages.UPSELL_BLURB_GPU_MORE,
+                                                        InvisibleMessages.UPSELL_LEARNMOREURL_GPU);
                         ShowTab(GpuUpsellEditPage);
                     }
                     else

XenAdmin/Dialogs/VMProtectionRecovery/VMProtectionPoliciesDialog.cs

@@ -296,7 +296,7 @@ namespace XenAdmin.Dialogs.VMProtection_Recovery
                 deprecationBanner.AppliesToVersion = Messages.XENSERVER_6_2;
                 deprecationBanner.BannerType = DeprecationBanner.Type.Removal;
                 deprecationBanner.FeatureName = Messages.VMPP;
-                deprecationBanner.LinkUri = new Uri(InvisibleMessages.VMPR_DEPRECATION_URL);
+                deprecationBanner.LinkUri = new Uri(XenAdmin.Core.Registry.LinkLabelHidden ? "" : InvisibleMessages.VMPR_DEPRECATION_URL);
                 deprecationBanner.Visible = true;
             }
         }

XenAdmin/MainWindow.Designer.cs

@@ -1760,17 +1760,20 @@ namespace XenAdmin
             this.xenSourceOnTheWebToolStripMenuItem.Name = "xenSourceOnTheWebToolStripMenuItem";
             resources.ApplyResources(this.xenSourceOnTheWebToolStripMenuItem, "xenSourceOnTheWebToolStripMenuItem");
             this.xenSourceOnTheWebToolStripMenuItem.Click += new System.EventHandler(this.xenSourceOnTheWebToolStripMenuItem_Click);
+            this.xenSourceOnTheWebToolStripMenuItem.Visible = !XenAdmin.Core.Registry.ToolStripMenuItemHidden;
             // 
             // xenCenterPluginsOnlineToolStripMenuItem
             // 
             this.xenCenterPluginsOnlineToolStripMenuItem.Name = "xenCenterPluginsOnlineToolStripMenuItem";
             resources.ApplyResources(this.xenCenterPluginsOnlineToolStripMenuItem, "xenCenterPluginsOnlineToolStripMenuItem");
             this.xenCenterPluginsOnlineToolStripMenuItem.Click += new System.EventHandler(this.xenCenterPluginsOnTheWebToolStripMenuItem_Click);
+            this.xenCenterPluginsOnlineToolStripMenuItem.Visible = !XenAdmin.Core.Registry.ToolStripMenuItemHidden;
             // 
             // toolStripSeparator7
             // 
             this.toolStripSeparator7.Name = "toolStripSeparator7";
             resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
+            this.toolStripSeparator7.Visible = !XenAdmin.Core.Registry.ToolStripMenuItemHidden;
             // 
             // pluginItemsPlaceHolderToolStripMenuItem8
             // 

XenAdmin/MainWindow.cs

@@ -805,6 +805,8 @@ namespace XenAdmin
                     Program.Invoke(Program.MainWindow, delegate()
                     {
                         string msg = string.Format(Messages.GUI_OUT_OF_DATE, Helpers.GetName(master));
+                        if (!XenAdmin.Core.Registry.LinkLabelHidden)
+                            msg = msg + Messages.GUI_OUT_OF_DATE_MORE;
                         string url = "https://" + connection.Hostname;
 
                         using (var dlog = new ConnectionRefusedDialog())

XenAdmin/SettingsPanels/VMAdvancedEditPage.Designer.cs

@@ -32,16 +32,16 @@ namespace XenAdmin.SettingsPanels
             this.GeneralOptimizationRadioButton = new System.Windows.Forms.RadioButton();
             this.CPSOptimizationRadioButton = new System.Windows.Forms.RadioButton();
             this.ManualOptimizationRadioButton = new System.Windows.Forms.RadioButton();
-            this.iconWarning = new System.Windows.Forms.PictureBox();
             this.labelWarning = new System.Windows.Forms.Label();
             this.ManualOptimizationGroupBox = new XenAdmin.Controls.DecentGroupBox();
             this.ShadowMultiplierTextBox = new System.Windows.Forms.TextBox();
             this.labelShadowMultiplier = new System.Windows.Forms.Label();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.label1 = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.iconWarning)).BeginInit();
+            this.iconWarning = new System.Windows.Forms.PictureBox();
             this.ManualOptimizationGroupBox.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.iconWarning)).BeginInit();
             this.SuspendLayout();
             // 
             // GeneralOptimizationRadioButton
@@ -59,6 +59,7 @@ namespace XenAdmin.SettingsPanels
             this.CPSOptimizationRadioButton.Name = "CPSOptimizationRadioButton";
             this.CPSOptimizationRadioButton.UseVisualStyleBackColor = true;
             this.CPSOptimizationRadioButton.CheckedChanged += new System.EventHandler(this.CPSOptimizationRadioButton_CheckedChanged);
+            this.CPSOptimizationRadioButton.Visible = !XenAdmin.Core.Registry.CPSOptimizationHidden;
             // 
             // ManualOptimizationRadioButton
             // 
@@ -67,13 +68,6 @@ namespace XenAdmin.SettingsPanels
             this.ManualOptimizationRadioButton.UseVisualStyleBackColor = true;
             this.ManualOptimizationRadioButton.CheckedChanged += new System.EventHandler(this.ManualOptimizationRadioButton_CheckedChanged);
             // 
-            // iconWarning
-            // 
-            this.iconWarning.Image = global::XenAdmin.Properties.Resources._000_Alert2_h32bit_16;
-            resources.ApplyResources(this.iconWarning, "iconWarning");
-            this.iconWarning.Name = "iconWarning";
-            this.iconWarning.TabStop = false;
-            // 
             // labelWarning
             // 
             resources.ApplyResources(this.labelWarning, "labelWarning");
@@ -81,9 +75,9 @@ namespace XenAdmin.SettingsPanels
             // 
             // ManualOptimizationGroupBox
             // 
+            resources.ApplyResources(this.ManualOptimizationGroupBox, "ManualOptimizationGroupBox");
             this.ManualOptimizationGroupBox.Controls.Add(this.ShadowMultiplierTextBox);
             this.ManualOptimizationGroupBox.Controls.Add(this.labelShadowMultiplier);
-            resources.ApplyResources(this.ManualOptimizationGroupBox, "ManualOptimizationGroupBox");
             this.ManualOptimizationGroupBox.Name = "ManualOptimizationGroupBox";
             this.ManualOptimizationGroupBox.TabStop = false;
             // 
@@ -108,6 +102,13 @@ namespace XenAdmin.SettingsPanels
             resources.ApplyResources(this.label1, "label1");
             this.label1.Name = "label1";
             // 
+            // iconWarning
+            // 
+            resources.ApplyResources(this.iconWarning, "iconWarning");
+            this.iconWarning.Image = global::XenAdmin.Properties.Resources._000_Alert2_h32bit_16;
+            this.iconWarning.Name = "iconWarning";
+            this.iconWarning.TabStop = false;
+            // 
             // VMAdvancedEditPage
             // 
             resources.ApplyResources(this, "$this");
@@ -121,11 +122,11 @@ namespace XenAdmin.SettingsPanels
             this.Controls.Add(this.ManualOptimizationGroupBox);
             this.DoubleBuffered = true;
             this.Name = "VMAdvancedEditPage";
-            ((System.ComponentModel.ISupportInitialize)(this.iconWarning)).EndInit();
             this.ManualOptimizationGroupBox.ResumeLayout(false);
             this.ManualOptimizationGroupBox.PerformLayout();
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.iconWarning)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 

XenAdmin/SettingsPanels/VMAdvancedEditPage.ja.resx

@@ -112,339 +112,43 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="GeneralOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="GeneralOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="GeneralOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 47</value>
-  </data>
   <data name="GeneralOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 18</value>
+    <value>185, 17</value>
-  </data>
-  <data name="GeneralOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
   </data>
   <data name="GeneralOptimizationRadioButton.Text" xml:space="preserve">
     <value>一般的な環境用に最適化する(&amp;G)</value>
   </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.Name" xml:space="preserve">
-    <value>GeneralOptimizationRadioButton</value>
-  </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 70</value>
-  </data>
   <data name="CPSOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>161, 18</value>
+    <value>180, 17</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
   </data>
   <data name="CPSOptimizationRadioButton.Text" xml:space="preserve">
     <value>Citrix XenApp 用に最適化する(&amp;X)</value>
   </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.Name" xml:space="preserve">
-    <value>CPSOptimizationRadioButton</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 94</value>
-  </data>
   <data name="ManualOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>223, 18</value>
+    <value>301, 17</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
   </data>
   <data name="ManualOptimizationRadioButton.Text" xml:space="preserve">
     <value>最適化方法を指定する (詳しい知識がある管理者向け)(&amp;A)</value>
   </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.Name" xml:space="preserve">
-    <value>ManualOptimizationRadioButton</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="iconWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="iconWarning.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 185</value>
-  </data>
-  <data name="iconWarning.Size" type="System.Drawing.Size, System.Drawing">
-    <value>16, 16</value>
-  </data>
-  <data name="iconWarning.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;iconWarning.Name" xml:space="preserve">
-    <value>iconWarning</value>
-  </data>
-  <data name="&gt;&gt;iconWarning.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;iconWarning.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;iconWarning.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="labelWarning.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="labelWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labelWarning.Location" type="System.Drawing.Point, System.Drawing">
-    <value>40, 187</value>
-  </data>
   <data name="labelWarning.Size" type="System.Drawing.Size, System.Drawing">
-    <value>325, 17</value>
+    <value>281, 13</value>
-  </data>
-  <data name="labelWarning.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
   </data>
   <data name="labelWarning.Text" xml:space="preserve">
     <value>これらの設定は、一時停止状態の VM には適用できません</value>
   </data>
-  <data name="&gt;&gt;labelWarning.Name" xml:space="preserve">
-    <value>labelWarning</value>
-  </data>
-  <data name="&gt;&gt;labelWarning.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelWarning.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;labelWarning.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Name" xml:space="preserve">
-    <value>ShadowMultiplierTextBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Parent" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Name" xml:space="preserve">
-    <value>labelShadowMultiplier</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Parent" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 96</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>359, 72</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.Name" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.Type" xml:space="preserve">
-    <value>XenAdmin.Controls.DecentGroupBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 8.25pt</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>189, 27</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 21</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Name" xml:space="preserve">
-    <value>ShadowMultiplierTextBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Parent" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="labelShadowMultiplier.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="labelShadowMultiplier.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labelShadowMultiplier.Location" type="System.Drawing.Point, System.Drawing">
-    <value>17, 30</value>
-  </data>
   <data name="labelShadowMultiplier.Size" type="System.Drawing.Size, System.Drawing">
-    <value>142, 17</value>
+    <value>112, 13</value>
-  </data>
-  <data name="labelShadowMultiplier.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
   </data>
   <data name="labelShadowMultiplier.Text" xml:space="preserve">
     <value>シャドウ メモリ乗数(&amp;M):</value>
   </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Name" xml:space="preserve">
-    <value>labelShadowMultiplier</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Parent" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="tableLayoutPanel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 0, 0</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 41</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
   <data name="label1.Text" xml:space="preserve">
     <value>環境に応じて VM のパフォーマンスを最適化できます。一般的な環境用の最適化オプションを使用したり、Citrix XenApp 用のオプションを使用したりできます。また、より高度な最適化オプションを設定することもできます。</value>
   </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 41</value>
-  </data>
-  <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50" /&gt;&lt;Rows Styles="Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>96, 96</value>
-  </data>
-  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 423</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>VMAdvancedEditPage</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
 </root>

XenAdmin/SettingsPanels/VMAdvancedEditPage.resx

@@ -112,175 +112,280 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="GeneralOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
+  <data name="labelShadowMultiplier.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="GeneralOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="GeneralOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 47</value>
-  </data>
-  <data name="GeneralOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>138, 17</value>
-  </data>
-  <data name="GeneralOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
   <data name="GeneralOptimizationRadioButton.Text" xml:space="preserve">
     <value>Optimize for &amp;general use</value>
   </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.Name" xml:space="preserve">
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <value>GeneralOptimizationRadioButton</value>
+  <data name="label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-  </data>
+    <value>Fill</value>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 70</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>146, 17</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.Text" xml:space="preserve">
-    <value>Optimize for @BRANDING_COMPANY_NAME_SHORT@ &amp;XenApp</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.Name" xml:space="preserve">
-    <value>CPSOptimizationRadioButton</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 94</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>208, 17</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
   </data>
   <data name="ManualOptimizationRadioButton.Text" xml:space="preserve">
     <value>Optimize manually (&amp;advanced use only)</value>
   </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.Name" xml:space="preserve">
+  <data name="&gt;&gt;GeneralOptimizationRadioButton.Type" xml:space="preserve">
-    <value>ManualOptimizationRadioButton</value>
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.Parent" xml:space="preserve">
-    <value>$this</value>
   </data>
   <data name="&gt;&gt;ManualOptimizationRadioButton.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="iconWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>NoControl</value>
+    <value>label1</value>
   </data>
-  <data name="iconWarning.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>15, 185</value>
+    <value>0, 0, 0, 0</value>
   </data>
-  <data name="iconWarning.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="&gt;&gt;labelShadowMultiplier.Type" xml:space="preserve">
-    <value>16, 16</value>
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="iconWarning.TabIndex" type="System.Int32, mscorlib">
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <value>4</value>
+  <data name="ManualOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>208, 17</value>
   </data>
-  <data name="&gt;&gt;iconWarning.Name" xml:space="preserve">
+  <data name="CPSOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>iconWarning</value>
+    <value>14, 150</value>
   </data>
-  <data name="&gt;&gt;iconWarning.Type" xml:space="preserve">
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>VMAdvancedEditPage</value>
+  </data>
+  <data name="&gt;&gt;ShadowMultiplierTextBox.Name" xml:space="preserve">
+    <value>ShadowMultiplierTextBox</value>
+  </data>
+  <data name="&gt;&gt;ShadowMultiplierTextBox.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="ShadowMultiplierTextBox.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 8.25pt</value>
   </data>
   <data name="&gt;&gt;iconWarning.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;iconWarning.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="labelWarning.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="labelWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labelWarning.Location" type="System.Drawing.Point, System.Drawing">
-    <value>40, 187</value>
-  </data>
-  <data name="labelWarning.Size" type="System.Drawing.Size, System.Drawing">
-    <value>301, 13</value>
-  </data>
-  <data name="labelWarning.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="labelWarning.Text" xml:space="preserve">
-    <value>These settings cannot be adjusted when the VM is suspended</value>
-  </data>
-  <data name="&gt;&gt;labelWarning.Name" xml:space="preserve">
-    <value>labelWarning</value>
-  </data>
-  <data name="&gt;&gt;labelWarning.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelWarning.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
   <data name="&gt;&gt;labelWarning.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Name" xml:space="preserve">
+  <data name="CPSOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
-    <value>ShadowMultiplierTextBox</value>
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;ManualOptimizationRadioButton.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;CPSOptimizationRadioButton.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="iconWarning.Location" type="System.Drawing.Point, System.Drawing">
+    <value>15, 185</value>
+  </data>
+  <data name="&gt;&gt;CPSOptimizationRadioButton.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="tableLayoutPanel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="ShadowMultiplierTextBox.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
   </data>
   <data name="&gt;&gt;ShadowMultiplierTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="CPSOptimizationRadioButton.Text" xml:space="preserve">
+    <value>Optimize for @BRANDING_COMPANY_NAME_SHORT@ &amp;XenApp</value>
+  </data>
+  <data name="iconWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+    <value>tableLayoutPanel1</value>
+  </data>
+  <data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <data name="&gt;&gt;ShadowMultiplierTextBox.Parent" xml:space="preserve">
     <value>ManualOptimizationGroupBox</value>
   </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;ManualOptimizationGroupBox.Name" xml:space="preserve">
+    <value>ManualOptimizationGroupBox</value>
+  </data>
+  <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;ManualOptimizationGroupBox.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>653, 41</value>
+  </data>
+  <data name="ManualOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>14, 70</value>
+  </data>
+  <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="GeneralOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="ShadowMultiplierTextBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 21</value>
+  </data>
+  <data name="ManualOptimizationGroupBox.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>96, 96</value>
+  </data>
+  <data name="labelShadowMultiplier.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="ManualOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="iconWarning.Size" type="System.Drawing.Size, System.Drawing">
+    <value>16, 16</value>
+  </data>
+  <data name="GeneralOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;GeneralOptimizationRadioButton.Name" xml:space="preserve">
+    <value>GeneralOptimizationRadioButton</value>
+  </data>
+  <data name="ManualOptimizationGroupBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 72</value>
+  </data>
+  <data name="labelWarning.Location" type="System.Drawing.Point, System.Drawing">
+    <value>40, 187</value>
+  </data>
+  <data name="&gt;&gt;iconWarning.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ManualOptimizationRadioButton.Name" xml:space="preserve">
+    <value>ManualOptimizationRadioButton</value>
+  </data>
+  <data name="labelWarning.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;CPSOptimizationRadioButton.Name" xml:space="preserve">
+    <value>CPSOptimizationRadioButton</value>
+  </data>
+  <data name="&gt;&gt;CPSOptimizationRadioButton.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="ManualOptimizationGroupBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 72</value>
+  </data>
+  <data name="CPSOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>343, 17</value>
+  </data>
+  <data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GeneralOptimizationRadioButton.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="GeneralOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>138, 17</value>
+  </data>
+  <data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
+    <value>tableLayoutPanel1</value>
+  </data>
+  <data name="labelWarning.Text" xml:space="preserve">
+    <value>These settings cannot be adjusted when the VM is suspended</value>
+  </data>
+  <data name="&gt;&gt;iconWarning.Name" xml:space="preserve">
+    <value>iconWarning</value>
+  </data>
+  <data name="labelWarning.Size" type="System.Drawing.Size, System.Drawing">
+    <value>301, 13</value>
+  </data>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
   <data name="&gt;&gt;labelShadowMultiplier.Name" xml:space="preserve">
     <value>labelShadowMultiplier</value>
   </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Type" xml:space="preserve">
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GeneralOptimizationRadioButton.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="CPSOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;ManualOptimizationGroupBox.Type" xml:space="preserve">
+    <value>XenAdmin.Controls.DecentGroupBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="ShadowMultiplierTextBox.Location" type="System.Drawing.Point, System.Drawing">
+    <value>189, 27</value>
+  </data>
+  <data name="iconWarning.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+    <value>653, 423</value>
+  </data>
+  <data name="ManualOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="GeneralOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>14, 47</value>
+  </data>
+  <data name="labelWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;ManualOptimizationGroupBox.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="labelWarning.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50" /&gt;&lt;Rows Styles="Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
+  </data>
+  <data name="ManualOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="CPSOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;labelWarning.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;labelWarning.Name" xml:space="preserve">
+    <value>labelWarning</value>
+  </data>
+  <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>653, 41</value>
+  </data>
+  <data name="&gt;&gt;labelWarning.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="labelShadowMultiplier.Location" type="System.Drawing.Point, System.Drawing">
+    <value>17, 30</value>
+  </data>
+  <data name="labelShadowMultiplier.Size" type="System.Drawing.Size, System.Drawing">
+    <value>131, 13</value>
   </data>
   <data name="&gt;&gt;labelShadowMultiplier.Parent" xml:space="preserve">
     <value>ManualOptimizationGroupBox</value>
@@ -291,160 +396,31 @@
   <data name="ManualOptimizationGroupBox.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="ManualOptimizationGroupBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 96</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>359, 72</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.Name" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.Type" xml:space="preserve">
-    <value>XenAdmin.Controls.DecentGroupBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 8.25pt</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>189, 27</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 21</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Name" xml:space="preserve">
-    <value>ShadowMultiplierTextBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Parent" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="labelShadowMultiplier.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="labelShadowMultiplier.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labelShadowMultiplier.Location" type="System.Drawing.Point, System.Drawing">
-    <value>17, 30</value>
-  </data>
-  <data name="labelShadowMultiplier.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 13</value>
-  </data>
   <data name="labelShadowMultiplier.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
   <data name="labelShadowMultiplier.Text" xml:space="preserve">
     <value>Shadow memory &amp;multiplier:</value>
   </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Name" xml:space="preserve">
+  <data name="&gt;&gt;iconWarning.ZOrder" xml:space="preserve">
-    <value>labelShadowMultiplier</value>
+    <value>2</value>
   </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Type" xml:space="preserve">
+  <data name="&gt;&gt;ManualOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Parent" xml:space="preserve">
+  <data name="GeneralOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="tableLayoutPanel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 0, 0</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 41</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
   <data name="label1.Text" xml:space="preserve">
     <value>You can optimize this VM for increased performance in different environments. Use the preset choices to configure it for general use or to enhance Citrix XenApp performance. Alternatively, advanced users can select the manual setting for custom optimization.</value>
   </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 41</value>
-  </data>
-  <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50" /&gt;&lt;Rows Styles="Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>96, 96</value>
-  </data>
-  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 423</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>VMAdvancedEditPage</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
 </root>

XenAdmin/SettingsPanels/VMAdvancedEditPage.zh-CN.resx

@@ -112,339 +112,43 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="GeneralOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="GeneralOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="GeneralOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 47</value>
-  </data>
   <data name="GeneralOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>138, 17</value>
+    <value>159, 17</value>
-  </data>
-  <data name="GeneralOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
   </data>
   <data name="GeneralOptimizationRadioButton.Text" xml:space="preserve">
     <value>针对一般用途进行优化(&amp;G)</value>
   </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.Name" xml:space="preserve">
-    <value>GeneralOptimizationRadioButton</value>
-  </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;GeneralOptimizationRadioButton.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 70</value>
-  </data>
   <data name="CPSOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>146, 17</value>
+    <value>376, 17</value>
-  </data>
-  <data name="CPSOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
   </data>
   <data name="CPSOptimizationRadioButton.Text" xml:space="preserve">
     <value>针对 @BRANDING_COMPANY_NAME_SHORT@ XenApp 进行优化(&amp;X)</value>
   </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.Name" xml:space="preserve">
-    <value>CPSOptimizationRadioButton</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;CPSOptimizationRadioButton.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 94</value>
-  </data>
   <data name="ManualOptimizationRadioButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>208, 17</value>
+    <value>164, 17</value>
-  </data>
-  <data name="ManualOptimizationRadioButton.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
   </data>
   <data name="ManualOptimizationRadioButton.Text" xml:space="preserve">
     <value>手动优化(仅限高级用途)(&amp;A)</value>
   </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.Name" xml:space="preserve">
-    <value>ManualOptimizationRadioButton</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationRadioButton.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="iconWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="iconWarning.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 185</value>
-  </data>
-  <data name="iconWarning.Size" type="System.Drawing.Size, System.Drawing">
-    <value>16, 16</value>
-  </data>
-  <data name="iconWarning.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;iconWarning.Name" xml:space="preserve">
-    <value>iconWarning</value>
-  </data>
-  <data name="&gt;&gt;iconWarning.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;iconWarning.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;iconWarning.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="labelWarning.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="labelWarning.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labelWarning.Location" type="System.Drawing.Point, System.Drawing">
-    <value>40, 187</value>
-  </data>
   <data name="labelWarning.Size" type="System.Drawing.Size, System.Drawing">
-    <value>301, 13</value>
+    <value>158, 13</value>
-  </data>
-  <data name="labelWarning.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
   </data>
   <data name="labelWarning.Text" xml:space="preserve">
     <value>VM 挂起时无法调整这些设置</value>
   </data>
-  <data name="&gt;&gt;labelWarning.Name" xml:space="preserve">
-    <value>labelWarning</value>
-  </data>
-  <data name="&gt;&gt;labelWarning.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelWarning.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;labelWarning.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Name" xml:space="preserve">
-    <value>ShadowMultiplierTextBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Parent" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Name" xml:space="preserve">
-    <value>labelShadowMultiplier</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Parent" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 96</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>359, 72</value>
-  </data>
-  <data name="ManualOptimizationGroupBox.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.Name" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.Type" xml:space="preserve">
-    <value>XenAdmin.Controls.DecentGroupBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ManualOptimizationGroupBox.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Verdana, 8.25pt</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>189, 27</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 21</value>
-  </data>
-  <data name="ShadowMultiplierTextBox.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Name" xml:space="preserve">
-    <value>ShadowMultiplierTextBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.Parent" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;ShadowMultiplierTextBox.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="labelShadowMultiplier.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="labelShadowMultiplier.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labelShadowMultiplier.Location" type="System.Drawing.Point, System.Drawing">
-    <value>17, 30</value>
-  </data>
   <data name="labelShadowMultiplier.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 13</value>
+    <value>97, 13</value>
-  </data>
-  <data name="labelShadowMultiplier.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
   </data>
   <data name="labelShadowMultiplier.Text" xml:space="preserve">
     <value>重影内存系数(&amp;M):</value>
   </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Name" xml:space="preserve">
-    <value>labelShadowMultiplier</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.Parent" xml:space="preserve">
-    <value>ManualOptimizationGroupBox</value>
-  </data>
-  <data name="&gt;&gt;labelShadowMultiplier.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="tableLayoutPanel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 0, 0</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 41</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
   <data name="label1.Text" xml:space="preserve">
     <value>您可以对此 VM 进行优化，以提高在不同环境中的性能。要实现一般用途或者要提高 @BRANDING_COMPANY_NAME_SHORT@ XenApp 性能，请使用预设选项进行配置。或者，高级用户可以选择手动设置来实现自定义优化。</value>
   </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 41</value>
-  </data>
-  <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">
-    <value>tableLayoutPanel1</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,50" /&gt;&lt;Rows Styles="Percent,50" /&gt;&lt;/TableLayoutSettings&gt;</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>96, 96</value>
-  </data>
-  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>653, 423</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>VMAdvancedEditPage</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
 </root>

XenAdmin/TabPages/AdPage.cs

@@ -1019,7 +1019,8 @@ namespace XenAdmin.TabPages
             if (Helpers.FeatureForbidden(pool.Connection, Host.RestrictRBAC))
             {
                 // Show upsell dialog
-                UpsellDialog dlg = new UpsellDialog(Messages.UPSELL_BLURB_RBAC, InvisibleMessages.UPSELL_LEARNMOREURL_RBAC);
+                UpsellDialog dlg = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_RBAC : Messages.UPSELL_BLURB_RBAC + Messages.UPSELL_BLURB_RBAC_MORE,
+                                                    InvisibleMessages.UPSELL_LEARNMOREURL_RBAC);
                 dlg.ShowDialog(this);
                 return;
 

XenAdmin/TabPages/HomePage.cs

@@ -89,7 +89,8 @@ namespace XenAdmin.TabPages
 
         private void panelTry_Click(object sender, EventArgs e)
         {
-            Program.OpenURL(InvisibleMessages.XENDESKTOP_URL);
+            if (!XenAdmin.Core.Registry.LinkLabelHidden) 
+                Program.OpenURL(InvisibleMessages.XENDESKTOP_URL);
         }
 
         private void labelNetwork_Click(object sender, EventArgs e)

XenAdmin/TabPages/PerformancePage.cs

@@ -303,7 +303,8 @@ namespace XenAdmin.TabPages
 
         private void ShowUpsell()
         {
-            UpsellDialog upsellDialog = new UpsellDialog(Messages.UPSELL_BLURB_PERFORMANCE, InvisibleMessages.UPSELL_LEARNMOREURL_PERFORMANCE);
+            UpsellDialog upsellDialog = new UpsellDialog(XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_PERFORMANCE : Messages.UPSELL_BLURB_PERFORMANCE + Messages.UPSELL_BLURB_PERFORMANCE_MORE,
+                                                        InvisibleMessages.UPSELL_LEARNMOREURL_PERFORMANCE);
             upsellDialog.ShowDialog(this);
         }
 

XenAdmin/TabPages/SrStoragePage.cs

@@ -116,8 +116,8 @@ namespace XenAdmin.TabPages
                 Banner.AppliesToVersion = Messages.XENSERVER_6_5;
                 Banner.BannerType = DeprecationBanner.Type.Removal;
                 Banner.FeatureName = Messages.ISL_SR;
-                Banner.LinkUri = new Uri(InvisibleMessages.ISL_DEPRECATION_URL);
+                Banner.LinkUri = new Uri(XenAdmin.Core.Registry.LinkLabelHidden ? "" : InvisibleMessages.ISL_DEPRECATION_URL);
-                Banner.Visible = true;
+                Banner.Visible = !XenAdmin.Core.Registry.LinkLabelHidden;
             }
             else
                 Banner.Visible = false;

XenAdmin/TabPages/UpsellTabPage.cs

@@ -54,21 +54,23 @@ namespace XenAdmin.TabPages
     public class BallooningUpsellPage : UpsellTabPage
     {
         public BallooningUpsellPage()
-            : base(Messages.DYNAMIC_MEMORY_CONTROL, Messages.UPSELL_BLURB_DMC, InvisibleMessages.UPSELL_LEARNMOREURL_DMC)
+            : base(Messages.DYNAMIC_MEMORY_CONTROL, XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_DMC : Messages.UPSELL_BLURB_DMC + Messages.UPSELL_BLURB_DMC_MORE, InvisibleMessages.UPSELL_LEARNMOREURL_DMC)
         { }
     }
 
     public class HAUpsellPage : UpsellTabPage
     {
         public HAUpsellPage()
-            : base(Messages.HIGH_AVAILABILITY, Messages.UPSELL_BLURB_HA, InvisibleMessages.UPSELL_LEARNMOREURL_HA)
+            : base(Messages.HIGH_AVAILABILITY, XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_HA : Messages.UPSELL_BLURB_HA + Messages.UPSELL_BLURB_HA_MORE, InvisibleMessages.UPSELL_LEARNMOREURL_HA)
         { }
     }
 
     public class WLBUpsellPage : UpsellTabPage
     {
         public WLBUpsellPage()
-            : base(Messages.WORKLOAD_BALANCING, Messages.UPSELL_BLURB_WLB, InvisibleMessages.UPSELL_LEARNMOREURL_WLB)
+            : base(Messages.WORKLOAD_BALANCING,
+                    XenAdmin.Core.Registry.LinkLabelHidden ? Messages.UPSELL_BLURB_WLB : Messages.UPSELL_BLURB_WLB + Messages.UPSELL_BLURB_WLB_MORE,
+                    InvisibleMessages.UPSELL_LEARNMOREURL_WLB)
         { }
     }
 }

XenAdmin/Wizards/BugToolWizardFiles/BugToolPageSelectCapabilities.Designer.cs

@@ -140,6 +140,7 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
             this.linkLabel1.Name = "linkLabel1";
             this.linkLabel1.TabStop = true;
             this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+            this.linkLabel1.Visible = !XenAdmin.Core.Registry.LinkLabelHidden;
             // 
             // tableLayoutPanel4
             // 

XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs

@@ -72,8 +72,8 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
                 deprecationBanner.AppliesToVersion = Messages.XENSERVER_6_5;
                 deprecationBanner.BannerType = DeprecationBanner.Type.Removal;
                 deprecationBanner.FeatureName = Messages.ISL_SR;
-                deprecationBanner.LinkUri = new Uri(InvisibleMessages.ISL_DEPRECATION_URL);
+                deprecationBanner.LinkUri = new Uri(XenAdmin.Core.Registry.LinkLabelHidden ? "" : InvisibleMessages.ISL_DEPRECATION_URL);
-                deprecationBanner.Visible = true;
+                deprecationBanner.Visible = !XenAdmin.Core.Registry.LinkLabelHidden;
             }
             else
                 deprecationBanner.Visible = false;

XenModel/Messages.Designer.cs

@@ -15461,9 +15461,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to This version of @BRANDING_BRAND_CONSOLE@ is out of date and cannot connect to {0}.
+        ///   Looks up a localized string similar to This version of @BRANDING_BRAND_CONSOLE@ is out of date and cannot connect to {0}..
-        ///
-        ///You can get a compatible version of @BRANDING_BRAND_CONSOLE@ from the following location:.
         /// </summary>
         public static string GUI_OUT_OF_DATE {
             get {
@@ -15471,6 +15469,17 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 
+        ///
+        ///You can get a compatible version of @BRANDING_BRAND_CONSOLE@ from the following location:.
+        /// </summary>
+        public static string GUI_OUT_OF_DATE_MORE {
+            get {
+                return ResourceManager.GetString("GUI_OUT_OF_DATE_MORE", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to HA.
         /// </summary>
@@ -21337,9 +21346,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable VDI live migration. This feature enables you to migrate multiple running VDIs between SRs in the same pool with no VM downtime. 
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable VDI live migration. This feature enables you to migrate multiple running VDIs between SRs in the same pool with no VM downtime. .
-        ///
-        ///To learn more about the @BRANDING_SERVER@ Live VDI Migration feature or to start a @BRANDING_SERVER@ trial, click the button below..
         /// </summary>
         public static string MIGRATE_VDI_UPSELL_BLURB {
             get {
@@ -21347,6 +21354,17 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 
+        ///
+        ///To learn more about the @BRANDING_SERVER@ Live VDI Migration feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string MIGRATE_VDI_UPSELL_BLURB_MORE {
+            get {
+                return ResourceManager.GetString("MIGRATE_VDI_UPSELL_BLURB_MORE", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Migrate VMs off server &apos;{0}&apos;.
         /// </summary>
@@ -32891,9 +32909,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Alerting and Reporting capabilities. Email based performance and error alerting will proactively notify administrators of error conditions or performance problems before they affect critical services.
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Alerting and Reporting capabilities. Email based performance and error alerting will proactively notify administrators of error conditions or performance problems before they affect critical services..
-        ///
-        ///To learn more about the @BRANDING_SERVER@ Alerting and Reporting feature or to start a @BRANDING_SERVER@ trial, click the button below..
         /// </summary>
         public static string UPSELL_BLURB_ALERTS {
             get {
@@ -32902,9 +32918,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable VM live migration. This feature enables you to migrate running VMs on shared or local storage between servers in the same pool or across pools with no VM downtime. 
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the @BRANDING_SERVER@ Cross-Pool Migration feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the @BRANDING_SERVER@ Alerting and Reporting feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_ALERTS_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_ALERTS_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable VM live migration. This feature enables you to migrate running VMs on shared or local storage between servers in the same pool or across pools with no VM downtime. .
         /// </summary>
         public static string UPSELL_BLURB_CPM {
             get {
@@ -32913,9 +32938,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Heterogeneous Pools. Heterogeneous Pools allows hosts with different CPUs to form a resource pool, and allows virtual machines to migrate between them.
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the @BRANDING_SERVER@ Heterogeneous Pools feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the @BRANDING_SERVER@ Cross-Pool Migration feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_CPM_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_CPM_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Heterogeneous Pools. Heterogeneous Pools allows hosts with different CPUs to form a resource pool, and allows virtual machines to migrate between them..
         /// </summary>
         public static string UPSELL_BLURB_CPUMASKING {
             get {
@@ -32924,9 +32958,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Dynamic Memory Control.  Dynamic Memory Control allows @BRANDING_SERVER@ to adjust the memory of live virtual machines, and respond dynamically to changing demands on the host server.
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the @BRANDING_SERVER@ Dynamic Memory Control feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the @BRANDING_SERVER@ Heterogeneous Pools feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_CPUMASKING_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_CPUMASKING_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Dynamic Memory Control.  Dynamic Memory Control allows @BRANDING_SERVER@ to adjust the memory of live virtual machines, and respond dynamically to changing demands on the host server..
         /// </summary>
         public static string UPSELL_BLURB_DMC {
             get {
@@ -32935,9 +32978,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Disaster Recovery. The Disaster Recovery feature allows you to recover your critical VMs and vApps at your DR site in the event of a disaster at your primary production site.
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the @BRANDING_SERVER@ Disaster Recovery feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the @BRANDING_SERVER@ Dynamic Memory Control feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_DMC_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_DMC_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Disaster Recovery. The Disaster Recovery feature allows you to recover your critical VMs and vApps at your DR site in the event of a disaster at your primary production site..
         /// </summary>
         public static string UPSELL_BLURB_DR {
             get {
@@ -32945,6 +32997,17 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 
+        ///
+        ///To learn more about the @BRANDING_SERVER@ Disaster Recovery feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_DR_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_DR_MORE", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable StorageLink™ Technology. StorageLink allows @BRANDING_SERVER@ to leverage all the power of your existing storage hardware and offload storage operations automatically. This allows for high performance and space efficient storage provisioning, cloning, and snapshot capabilities to be handled in hardware using your storage hardware&apos;s native features..
         /// </summary>
@@ -32955,9 +33018,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable GPU pass-through. The GPU pass-through feature allows you to assign a dedicated graphics processing unit to a VM for higher graphics performance.
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable GPU pass-through. The GPU pass-through feature allows you to assign a dedicated graphics processing unit to a VM for higher graphics performance..
-        ///
-        ///To learn more about the @BRANDING_SERVER@ GPU pass-through feature or to start a @BRANDING_SERVER@ trial, click the button below..
         /// </summary>
         public static string UPSELL_BLURB_GPU {
             get {
@@ -32966,9 +33027,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable High Availability. High Availability allows virtual machines to be automatically restarted in the event of an underlying hardware failure or individual VM failure. If the server fails the VMs will be intelligently restarted on other virtualized servers in the resource pool.
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the @BRANDING_SERVER@ High Availability feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the @BRANDING_SERVER@ GPU pass-through feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_GPU_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_GPU_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable High Availability. High Availability allows virtual machines to be automatically restarted in the event of an underlying hardware failure or individual VM failure. If the server fails the VMs will be intelligently restarted on other virtualized servers in the resource pool..
         /// </summary>
         public static string UPSELL_BLURB_HA {
             get {
@@ -32977,9 +33047,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Performance Reporting capabilities. Performance Reporting provides guidance on overall environment performance trends and enables you to accurately plan capacity as business needs change.
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the @BRANDING_SERVER@ Performance Reporting capabilities feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the @BRANDING_SERVER@ High Availability feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_HA_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_HA_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Performance Reporting capabilities. Performance Reporting provides guidance on overall environment performance trends and enables you to accurately plan capacity as business needs change..
         /// </summary>
         public static string UPSELL_BLURB_PERFORMANCE {
             get {
@@ -32988,9 +33067,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Role Based Access Control. Using the RBAC feature, you will be able to control access to vital components in your @BRANDING_SERVER@ resource pools, with full audit logging capabilities and seamless integration with your current Active Directory setup.
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the @BRANDING_SERVER@ Role Based Access Control feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the @BRANDING_SERVER@ Performance Reporting capabilities feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_PERFORMANCE_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_PERFORMANCE_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Role Based Access Control. Using the RBAC feature, you will be able to control access to vital components in your @BRANDING_SERVER@ resource pools, with full audit logging capabilities and seamless integration with your current Active Directory setup..
         /// </summary>
         public static string UPSELL_BLURB_RBAC {
             get {
@@ -32999,9 +33087,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable vApps. The vApps feature allows you to place your VMs into groups, allowing them to be started or stopped as a unit, and also allowing them to be easily recovered at your DR site in the event of a disaster at your primary production site.
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the vApps feature of @BRANDING_SERVER@ or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the @BRANDING_SERVER@ Role Based Access Control feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_RBAC_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_RBAC_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable vApps. The vApps feature allows you to place your VMs into groups, allowing them to be started or stopped as a unit, and also allowing them to be easily recovered at your DR site in the event of a disaster at your primary production site..
         /// </summary>
         public static string UPSELL_BLURB_VM_APPLIANCES {
             get {
@@ -33010,9 +33107,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable VM Protection and Recovery. VM Protection and Recovery allows you to protect your critical VMs by scheduling automatic snapshots, and optionally, archiving those snapshots to a CIFS or NFS share.
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the @BRANDING_SERVER@ VM Protection and Recovery feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the vApps feature of @BRANDING_SERVER@ or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_VM_APPLIANCES_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_VM_APPLIANCES_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable VM Protection and Recovery. VM Protection and Recovery allows you to protect your critical VMs by scheduling automatic snapshots, and optionally, archiving those snapshots to a CIFS or NFS share..
         /// </summary>
         public static string UPSELL_BLURB_VM_PROTECTION {
             get {
@@ -33021,9 +33127,18 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Dynamic Workload Balancing. Dynamic Workload Balancing continually profiles your virtual machines’ and @BRANDING_SERVER@ hosts’ performance and will intelligently rebalance and optimally place new workloads to ensure the best use of physical server resources in your resource pool.
+        ///   Looks up a localized string similar to 
         ///
-        ///To learn more about the @BRANDING_SERVER@ Dynamic Workload Balancing feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        ///To learn more about the @BRANDING_SERVER@ VM Protection and Recovery feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_VM_PROTECTION_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_VM_PROTECTION_MORE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Upgrade your @BRANDING_SERVER@ license to enable Dynamic Workload Balancing. Dynamic Workload Balancing continually profiles your virtual machines’ and @BRANDING_SERVER@ hosts’ performance and will intelligently rebalance and optimally place new workloads to ensure the best use of physical server resources in your resource pool..
         /// </summary>
         public static string UPSELL_BLURB_WLB {
             get {
@@ -33031,6 +33146,17 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 
+        ///
+        ///To learn more about the @BRANDING_SERVER@ Dynamic Workload Balancing feature or to start a @BRANDING_SERVER@ trial, click the button below..
+        /// </summary>
+        public static string UPSELL_BLURB_WLB_MORE {
+            get {
+                return ResourceManager.GetString("UPSELL_BLURB_WLB_MORE", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Uptime.
         /// </summary>

XenModel/Messages.ja.resx

@@ -5144,8 +5144,10 @@ CD をイジェクトしてから再試行してください。</value>
   </data>
   <data name="GUI_OUT_OF_DATE" xml:space="preserve">
     <value>@BRANDING_BRAND_CONSOLE@ のバージョンが古いため {0} に接続できません。
-
+    </value>
-最新バージョンの @BRANDING_BRAND_CONSOLE@ は、以下の場所から入手できます。</value>
+  </data>
+  <data name="GUI_OUT_OF_DATE_MORE" xml:space="preserve">
+    <value>最新バージョンの @BRANDING_BRAND_CONSOLE@ は、以下の場所から入手できます。</value>
   </data>
   <data name="HA" xml:space="preserve">
     <value>高可用性</value>
@@ -7095,7 +7097,10 @@ SCSI ID: {2}
     <value>移行先のストレージ リポジトリの選択(&amp;D)</value>
   </data>
   <data name="MIGRATE_VDI_UPSELL_BLURB" xml:space="preserve">
-    <value>VDI ライブ マイグレーション機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能により、実行中の複数の VDI を、同一プールのストレージ リポジトリ間で移行できます。VM のダウンタイムは発生しません。 
+    <value>VDI ライブ マイグレーション機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能により、実行中の複数の VDI を、同一プールのストレージ リポジトリ間で移行できます。VM のダウンタイムは発生しません。 </value>
+  </data>
+  <data name="MIGRATE_VDI_UPSELL_BLURB_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、VDI ライブ マイグレーション機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
@@ -10808,27 +10813,42 @@ VM が再起動したら、[@BRANDING_PRODUCT_BRAND@ Tools のインストール
     <value>アップデートをサーバー '{0}' にアップロードしています...</value>
   </data>
   <data name="UPSELL_BLURB_ALERTS" xml:space="preserve">
-    <value>アラートとレポート機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。パフォーマンス上の問題やエラー状態に関するメール アラートにより、管理者は、基幹サービスが影響を受ける前に潜在的な問題に対処することができます。
+    <value>アラートとレポート機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。パフォーマンス上の問題やエラー状態に関するメール アラートにより、管理者は、基幹サービスが影響を受ける前に潜在的な問題に対処することができます。</value>
+  </data>
+  <data name="UPSELL_BLURB_ALERTS_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、アラートとレポート機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_CPM" xml:space="preserve">
-    <value>VM ライブ マイグレーション機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能により、共有ストレージまたはローカル ストレージ上で実行されている複数の VM を、同一プールまたは別のプールのサーバー間で移行できます。VM のダウンタイムは発生しません。 
+    <value>VM ライブ マイグレーション機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能により、共有ストレージまたはローカル ストレージ上で実行されている複数の VM を、同一プールまたは別のプールのサーバー間で移行できます。VM のダウンタイムは発生しません。 </value>
+  </data>
+  <data name="UPSELL_BLURB_CPM_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、プール間の移行機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_CPUMASKING" xml:space="preserve">
-    <value>異種混在型プールを使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。異種混在型プールでは、異なる種類の CPU を搭載したホストでリソース プールを作成でき、そのホスト間での VM の移行がサポートされます。
+    <value>異種混在型プールを使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。異種混在型プールでは、異なる種類の CPU を搭載したホストでリソース プールを作成でき、そのホスト間での VM の移行がサポートされます。</value>
+  </data>
+  <data name="UPSELL_BLURB_CPUMASKING_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、異種混在型プール機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_DMC" xml:space="preserve">
-    <value>動的メモリ制御機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。動的メモリ制御により、実行中の仮想マシンのメモリがサーバーでの要求に応じて動的に調節されます。
+    <value>動的メモリ制御機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。動的メモリ制御により、実行中の仮想マシンのメモリがサーバーでの要求に応じて動的に調節されます。</value>
+  </data>
+  <data name="UPSELL_BLURB_DMC_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、動的メモリ制御機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_DR" xml:space="preserve">
-    <value>障害回復機能を有効にするには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能では、プライマリの業務サイトに障害が発生した場合に、vApp や VM を障害回復 (DR) サイトにフェイルオーバーできます。
+    <value>障害回復機能を有効にするには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能では、プライマリの業務サイトに障害が発生した場合に、vApp や VM を障害回復 (DR) サイトにフェイルオーバーできます。</value>
+  </data>
+  <data name="UPSELL_BLURB_DR_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、障害回復機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
@@ -10836,37 +10856,58 @@ VM が再起動したら、[@BRANDING_PRODUCT_BRAND@ Tools のインストール
     <value>StorageLink™ テクノロジを使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。StorageLink では、既存のストレージ ハードウェアの機能を活用して、@BRANDING_SERVER@ でのストレージ操作の負荷を自動的に軽減させることができます。このテクノロジを使用すると、高性能で効率的なストレージ プロビジョニング、複製、およびスナップショットを、使用するストレージ ハードウェア自体の機能を使用してハードウェア内で実行できます。</value>
   </data>
   <data name="UPSELL_BLURB_GPU" xml:space="preserve">
-    <value>GPU パススルー機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能では、VM に専用の GPU (Graphics Processing Unit) を割り当てて、グラフィック パフォーマンスを向上させることができます。
+    <value>GPU パススルー機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能では、VM に専用の GPU (Graphics Processing Unit) を割り当てて、グラフィック パフォーマンスを向上させることができます。</value>
+  </data>
+  <data name="UPSELL_BLURB_GPU_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、GPU パススルー機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_HA" xml:space="preserve">
-    <value>高可用性機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。高可用性により、サーバーが動作するハードウェアや個々の VM に障害が発生した場合に、VM が自動的に再起動します。サーバー障害が発生した場合、そのサーバー上の VM は、リソース プール内のほかの仮想サーバー上で正しく再起動します。
+    <value>高可用性機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。高可用性により、サーバーが動作するハードウェアや個々の VM に障害が発生した場合に、VM が自動的に再起動します。サーバー障害が発生した場合、そのサーバー上の VM は、リソース プール内のほかの仮想サーバー上で正しく再起動します。</value>
+  </data>
+  <data name="UPSELL_BLURB_HA_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、高可用性機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_PERFORMANCE" xml:space="preserve">
-    <value>パフォーマンス レポート機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。これらのレポートにより、環境の全体的なパフォーマンス傾向を分析して、業務ニーズの変化に応じた的確な展開プランニングが可能になります。
+    <value>パフォーマンス レポート機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。これらのレポートにより、環境の全体的なパフォーマンス傾向を分析して、業務ニーズの変化に応じた的確な展開プランニングが可能になります。</value>
+  </data>
+  <data name="UPSELL_BLURB_PERFORMANCE_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、パフォーマンス レポート機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_RBAC" xml:space="preserve">
-    <value>役割ベースのアクセス制御機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。役割ベースのアクセス制御 (RBAC: Role Based Access Control) では、@BRANDING_SERVER@ リソース プール環境の主要コンポーネントへのアクセスを制御するための、詳細な監査ログ機能とシームレスな Active Directory 統合が提供されます。
+    <value>役割ベースのアクセス制御機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。役割ベースのアクセス制御 (RBAC: Role Based Access Control) では、@BRANDING_SERVER@ リソース プール環境の主要コンポーネントへのアクセスを制御するための、詳細な監査ログ機能とシームレスな Active Directory 統合が提供されます。</value>
+  </data>
+  <data name="UPSELL_BLURB_RBAC_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、役割ベースのアクセス制御機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_VM_APPLIANCES" xml:space="preserve">
-    <value>vApp 機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能では、いくつかの VM を単一の仮想アプライアンスとしてグループ化して、それらを一緒に起動したり停止したりできます。また、プライマリの業務サイトに障害が発生した場合に、それらの VM を障害回復 (DR) サイトに簡単にフェイルオーバーできます。
+    <value>vApp 機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能では、いくつかの VM を単一の仮想アプライアンスとしてグループ化して、それらを一緒に起動したり停止したりできます。また、プライマリの業務サイトに障害が発生した場合に、それらの VM を障害回復 (DR) サイトに簡単にフェイルオーバーできます。</value>
+  </data>
+  <data name="UPSELL_BLURB_VM_APPLIANCES_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、vApp 機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_VM_PROTECTION" xml:space="preserve">
-    <value>VM の保護と回復機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能では、定期的にスナップショットを作成したり、CIFS や NFS の共有にスナップショットをアーカイブしたりできます。
+    <value>VM の保護と回復機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。この機能では、定期的にスナップショットを作成したり、CIFS や NFS の共有にスナップショットをアーカイブしたりできます。</value>
+  </data>
+  <data name="UPSELL_BLURB_VM_PROTECTION_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、VM の保護と回復機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>
   <data name="UPSELL_BLURB_WLB" xml:space="preserve">
-    <value>動的なワークロード バランス機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。動的なワークロード バランスにより、仮想マシンおよび @BRANDING_SERVER@ ホストのパフォーマンスが継続的に監視され、新しいワークロードを最適に分散・配置して、リソース プール内の物理サーバー リソースを最大限に活用します。
+    <value>動的なワークロード バランス機能を使用するには、@BRANDING_SERVER@ ライセンスをアップグレードしてください。動的なワークロード バランスにより、仮想マシンおよび @BRANDING_SERVER@ ホストのパフォーマンスが継続的に監視され、新しいワークロードを最適に分散・配置して、リソース プール内の物理サーバー リソースを最大限に活用します。</value>
+  </data>
+  <data name="UPSELL_BLURB_WLB_MORE" xml:space="preserve">
+    <value>
 
 下のボタンを使用して、動的なワークロード バランス機能や @BRANDING_SERVER@ の試用についての情報を参照できます。</value>
   </data>

XenModel/Messages.resx

@@ -5416,7 +5416,10 @@ Note: Any custom color selections will remain unchanged</value>
     <value>Group Roles</value>
   </data>
   <data name="GUI_OUT_OF_DATE" xml:space="preserve">
-    <value>This version of @BRANDING_BRAND_CONSOLE@ is out of date and cannot connect to {0}.
+    <value>This version of @BRANDING_BRAND_CONSOLE@ is out of date and cannot connect to {0}.</value>
+  </data>
+  <data name="GUI_OUT_OF_DATE_MORE" xml:space="preserve">
+    <value>
 
 You can get a compatible version of @BRANDING_BRAND_CONSOLE@ from the following location:</value>
   </data>
@@ -7436,7 +7439,10 @@ To fix a corrupt configuration file revert changes to {0} or delete the file to
     <value>Select the &amp;destination storage repository</value>
   </data>
   <data name="MIGRATE_VDI_UPSELL_BLURB" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable VDI live migration. This feature enables you to migrate multiple running VDIs between SRs in the same pool with no VM downtime. 
+    <value>Upgrade your @BRANDING_SERVER@ license to enable VDI live migration. This feature enables you to migrate multiple running VDIs between SRs in the same pool with no VM downtime. </value>
+  </data>
+  <data name="MIGRATE_VDI_UPSELL_BLURB_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ Live VDI Migration feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
@@ -11403,27 +11409,42 @@ Note that if RBAC is enabled, only updates which you have privileges to dismiss
     <value>Uploaded</value>
   </data>
   <data name="UPSELL_BLURB_ALERTS" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable Alerting and Reporting capabilities. Email based performance and error alerting will proactively notify administrators of error conditions or performance problems before they affect critical services.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable Alerting and Reporting capabilities. Email based performance and error alerting will proactively notify administrators of error conditions or performance problems before they affect critical services.</value>
+  </data>
+  <data name="UPSELL_BLURB_ALERTS_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ Alerting and Reporting feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_CPM" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable VM live migration. This feature enables you to migrate running VMs on shared or local storage between servers in the same pool or across pools with no VM downtime. 
+    <value>Upgrade your @BRANDING_SERVER@ license to enable VM live migration. This feature enables you to migrate running VMs on shared or local storage between servers in the same pool or across pools with no VM downtime. </value>
+  </data>
+  <data name="UPSELL_BLURB_CPM_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ Cross-Pool Migration feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_CPUMASKING" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable Heterogeneous Pools. Heterogeneous Pools allows hosts with different CPUs to form a resource pool, and allows virtual machines to migrate between them.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable Heterogeneous Pools. Heterogeneous Pools allows hosts with different CPUs to form a resource pool, and allows virtual machines to migrate between them.</value>
+  </data>
+  <data name="UPSELL_BLURB_CPUMASKING_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ Heterogeneous Pools feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_DMC" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable Dynamic Memory Control.  Dynamic Memory Control allows @BRANDING_SERVER@ to adjust the memory of live virtual machines, and respond dynamically to changing demands on the host server.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable Dynamic Memory Control.  Dynamic Memory Control allows @BRANDING_SERVER@ to adjust the memory of live virtual machines, and respond dynamically to changing demands on the host server.</value>
+  </data>
+  <data name="UPSELL_BLURB_DMC_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ Dynamic Memory Control feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_DR" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable Disaster Recovery. The Disaster Recovery feature allows you to recover your critical VMs and vApps at your DR site in the event of a disaster at your primary production site.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable Disaster Recovery. The Disaster Recovery feature allows you to recover your critical VMs and vApps at your DR site in the event of a disaster at your primary production site.</value>
+  </data>
+  <data name="UPSELL_BLURB_DR_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ Disaster Recovery feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
@@ -11431,37 +11452,58 @@ To learn more about the @BRANDING_SERVER@ Disaster Recovery feature or to start
     <value>Upgrade your @BRANDING_SERVER@ license to enable StorageLink™ Technology. StorageLink allows @BRANDING_SERVER@ to leverage all the power of your existing storage hardware and offload storage operations automatically. This allows for high performance and space efficient storage provisioning, cloning, and snapshot capabilities to be handled in hardware using your storage hardware's native features.</value>
   </data>
   <data name="UPSELL_BLURB_GPU" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable GPU pass-through. The GPU pass-through feature allows you to assign a dedicated graphics processing unit to a VM for higher graphics performance.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable GPU pass-through. The GPU pass-through feature allows you to assign a dedicated graphics processing unit to a VM for higher graphics performance.</value>
+  </data>
+  <data name="UPSELL_BLURB_GPU_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ GPU pass-through feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_HA" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable High Availability. High Availability allows virtual machines to be automatically restarted in the event of an underlying hardware failure or individual VM failure. If the server fails the VMs will be intelligently restarted on other virtualized servers in the resource pool.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable High Availability. High Availability allows virtual machines to be automatically restarted in the event of an underlying hardware failure or individual VM failure. If the server fails the VMs will be intelligently restarted on other virtualized servers in the resource pool.</value>
+  </data>
+  <data name="UPSELL_BLURB_HA_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ High Availability feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_PERFORMANCE" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable Performance Reporting capabilities. Performance Reporting provides guidance on overall environment performance trends and enables you to accurately plan capacity as business needs change.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable Performance Reporting capabilities. Performance Reporting provides guidance on overall environment performance trends and enables you to accurately plan capacity as business needs change.</value>
+  </data>
+  <data name="UPSELL_BLURB_PERFORMANCE_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ Performance Reporting capabilities feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_RBAC" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable Role Based Access Control. Using the RBAC feature, you will be able to control access to vital components in your @BRANDING_SERVER@ resource pools, with full audit logging capabilities and seamless integration with your current Active Directory setup.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable Role Based Access Control. Using the RBAC feature, you will be able to control access to vital components in your @BRANDING_SERVER@ resource pools, with full audit logging capabilities and seamless integration with your current Active Directory setup.</value>
+  </data>
+  <data name="UPSELL_BLURB_RBAC_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ Role Based Access Control feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_VM_APPLIANCES" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable vApps. The vApps feature allows you to place your VMs into groups, allowing them to be started or stopped as a unit, and also allowing them to be easily recovered at your DR site in the event of a disaster at your primary production site.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable vApps. The vApps feature allows you to place your VMs into groups, allowing them to be started or stopped as a unit, and also allowing them to be easily recovered at your DR site in the event of a disaster at your primary production site.</value>
+  </data>
+  <data name="UPSELL_BLURB_VM_APPLIANCES_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the vApps feature of @BRANDING_SERVER@ or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_VM_PROTECTION" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable VM Protection and Recovery. VM Protection and Recovery allows you to protect your critical VMs by scheduling automatic snapshots, and optionally, archiving those snapshots to a CIFS or NFS share.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable VM Protection and Recovery. VM Protection and Recovery allows you to protect your critical VMs by scheduling automatic snapshots, and optionally, archiving those snapshots to a CIFS or NFS share.</value>
+  </data>
+  <data name="UPSELL_BLURB_VM_PROTECTION_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ VM Protection and Recovery feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>
   <data name="UPSELL_BLURB_WLB" xml:space="preserve">
-    <value>Upgrade your @BRANDING_SERVER@ license to enable Dynamic Workload Balancing. Dynamic Workload Balancing continually profiles your virtual machines’ and @BRANDING_SERVER@ hosts’ performance and will intelligently rebalance and optimally place new workloads to ensure the best use of physical server resources in your resource pool.
+    <value>Upgrade your @BRANDING_SERVER@ license to enable Dynamic Workload Balancing. Dynamic Workload Balancing continually profiles your virtual machines’ and @BRANDING_SERVER@ hosts’ performance and will intelligently rebalance and optimally place new workloads to ensure the best use of physical server resources in your resource pool.</value>
+  </data>
+  <data name="UPSELL_BLURB_WLB_MORE" xml:space="preserve">
+    <value>
 
 To learn more about the @BRANDING_SERVER@ Dynamic Workload Balancing feature or to start a @BRANDING_SERVER@ trial, click the button below.</value>
   </data>

XenModel/Messages.zh-CN.resx

@@ -5141,7 +5141,10 @@
     <value>组角色</value>
   </data>
   <data name="GUI_OUT_OF_DATE" xml:space="preserve">
-    <value>此版本的 @BRANDING_BRAND_CONSOLE@ 已过时，无法连接到 {0}。
+    <value>此版本的 @BRANDING_BRAND_CONSOLE@ 已过时，无法连接到 {0}。</value>
+  </data>
+  <data name="GUI_OUT_OF_DATE_MORE" xml:space="preserve">
+    <value>
 
 可以从以下位置获取兼容版本的 @BRANDING_BRAND_CONSOLE@:</value>
   </data>
@@ -7093,7 +7096,10 @@ SCSI ID: {2}
     <value>选择目标存储库(&amp;D)</value>
   </data>
   <data name="MIGRATE_VDI_UPSELL_BLURB" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用 VDI 实时迁移。通过此功能，您能够在同一池中的 SR 之间迁移多个正在运行的 VDI，而不会导致 VM 停机。 
+    <value>升级 @BRANDING_SERVER@ 许可证以启用 VDI 实时迁移。通过此功能，您能够在同一池中的 SR 之间迁移多个正在运行的 VDI，而不会导致 VM 停机。 </value>
+  </data>
+  <data name="MIGRATE_VDI_UPSELL_BLURB_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ VDI 实时迁移功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
@@ -10810,27 +10816,42 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并
     <value>正在将更新上载到服务器“{0}”...</value>
   </data>
   <data name="UPSELL_BLURB_ALERTS" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用警报和报告功能。基于电子邮件的性能和错误警报将在错误情况或性能问题对关键服务产生影响之前，抢先将这些情况或问题通知给管理员。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用警报和报告功能。基于电子邮件的性能和错误警报将在错误情况或性能问题对关键服务产生影响之前，抢先将这些情况或问题通知给管理员。</value>
+  </data>
+  <data name="UPSELL_BLURB_ALERTS_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ 警报和报告功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_CPM" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用 VM 实时迁移。通过此功能，您能够在同一个池中的服务器之间或跨池迁移共享存储或本地存储上正在运行的 VM，而不会导致 VM 停机。 
+    <value>升级 @BRANDING_SERVER@ 许可证以启用 VM 实时迁移。通过此功能，您能够在同一个池中的服务器之间或跨池迁移共享存储或本地存储上正在运行的 VM，而不会导致 VM 停机。 </value>
+  </data>
+  <data name="UPSELL_BLURB_CPM_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ 跨池迁移功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_CPUMASKING" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用异构池。异构池允许由使用不同 CPU 的主机构成一个资源池，并允许虚拟机在这些主机之间迁移。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用异构池。异构池允许由使用不同 CPU 的主机构成一个资源池，并允许虚拟机在这些主机之间迁移。</value>
+  </data>
+  <data name="UPSELL_BLURB_CPUMASKING_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ 异构池功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_DMC" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用动态内存控制功能。通过动态内存控制功能，@BRANDING_SERVER@ 可以调整活动虚拟机的内存，并对主机服务器不断变化的要求进行动态响应。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用动态内存控制功能。通过动态内存控制功能，@BRANDING_SERVER@ 可以调整活动虚拟机的内存，并对主机服务器不断变化的要求进行动态响应。</value>
+  </data>
+  <data name="UPSELL_BLURB_DMC_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ 动态内存控制功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_DR" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用灾难恢复功能。通过灾难恢复功能，您可以在主生产站点发生灾难性故障时在 DR 站点恢复关键 VM 和 vApp。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用灾难恢复功能。通过灾难恢复功能，您可以在主生产站点发生灾难性故障时在 DR 站点恢复关键 VM 和 vApp。</value>
+  </data>
+  <data name="UPSELL_BLURB_DR_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ 灾难恢复功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
@@ -10838,37 +10859,58 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并
     <value>升级 @BRANDING_SERVER@ 许可证以启用 StorageLink™ 技术。StorageLink 使 @BRANDING_SERVER@ 能够充分利用现有存储硬件并自动卸载存储操作。这样便可以使用存储硬件固有的特性，在硬件层面实现具有高性能和空间效率的存储置备、克隆和快照功能。</value>
   </data>
   <data name="UPSELL_BLURB_GPU" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用 GPU 直通功能。通过 GPU 直通功能，可以为 VM 分配专用图形处理器以提高图形性能。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用 GPU 直通功能。通过 GPU 直通功能，可以为 VM 分配专用图形处理器以提高图形性能。</value>
+  </data>
+  <data name="UPSELL_BLURB_GPU_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ GPU 直通功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_HA" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用高可用性。通过高可用性，虚拟机可以在基础硬件出现故障或单个 VM 出现故障时自动重新启动。如果服务器出现故障，VM 将智能地在资源池中的其他虚拟化服务器上重新启动。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用高可用性。通过高可用性，虚拟机可以在基础硬件出现故障或单个 VM 出现故障时自动重新启动。如果服务器出现故障，VM 将智能地在资源池中的其他虚拟化服务器上重新启动。</value>
+  </data>
+  <data name="UPSELL_BLURB_HA_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ 高可用性功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_PERFORMANCE" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用性能报告功能。性能报告提供关于整体环境性能趋势的指导，并使您能够在业务需求发生变化时对生产能力做出准确规划。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用性能报告功能。性能报告提供关于整体环境性能趋势的指导，并使您能够在业务需求发生变化时对生产能力做出准确规划。</value>
+  </data>
+  <data name="UPSELL_BLURB_PERFORMANCE_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ 性能报告功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_RBAC" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用基于角色的访问控制。通过 RBAC 功能，可以控制对 @BRANDING_SERVER@ 资源池中重要组件的访问，并具有完全的审核日志记录功能，能够与当前 Active Directory 设置实现无缝集成。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用基于角色的访问控制。通过 RBAC 功能，可以控制对 @BRANDING_SERVER@ 资源池中重要组件的访问，并具有完全的审核日志记录功能，能够与当前 Active Directory 设置实现无缝集成。</value>
+  </data>
+  <data name="UPSELL_BLURB_RBAC_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ 基于角色的访问控制功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_VM_APPLIANCES" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用 vApp。通过 vApp 功能，您可以将 VM 放置到组中，从而允许这些 VM 作为一个单元来启动或停止，同时还允许这些 VM 在主生产站点出现灾难性故障时在 DR 站点上轻松恢复。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用 vApp。通过 vApp 功能，您可以将 VM 放置到组中，从而允许这些 VM 作为一个单元来启动或停止，同时还允许这些 VM 在主生产站点出现灾难性故障时在 DR 站点上轻松恢复。</value>
+  </data>
+  <data name="UPSELL_BLURB_VM_APPLIANCES_MORE" xml:space="preserve">
+    <value>
 
 要了解有关 @BRANDING_SERVER@ 的 vApp 功能的更多信息，或者要启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_VM_PROTECTION" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用 VM 保护和恢复功能。通过 VM 保护和恢复功能，您可以安排时间自动生成快照并(可选)将这些快照存档到 CIFS 或 NFS 共享，从而保护关键 VM。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用 VM 保护和恢复功能。通过 VM 保护和恢复功能，您可以安排时间自动生成快照并(可选)将这些快照存档到 CIFS 或 NFS 共享，从而保护关键 VM。</value>
+  </data>
+  <data name="UPSELL_BLURB_VM_PROTECTION_MORE" xml:space="preserve">
+    <value>
 
 要了解有关 @BRANDING_SERVER@ VM 保护和恢复功能的更多信息，或者要启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>
   <data name="UPSELL_BLURB_WLB" xml:space="preserve">
-    <value>升级 @BRANDING_SERVER@ 许可证以启用动态工作负载平衡。动态工作负载平衡功能不断对虚拟机和 @BRANDING_SERVER@ 主机的性能进行配置，并对新工作负载进行智能重新平衡和最优安排，以确保最有效地利用资源池中的物理服务器资源。
+    <value>升级 @BRANDING_SERVER@ 许可证以启用动态工作负载平衡。动态工作负载平衡功能不断对虚拟机和 @BRANDING_SERVER@ 主机的性能进行配置，并对新工作负载进行智能重新平衡和最优安排，以确保最有效地利用资源池中的物理服务器资源。</value>
+  </data>
+  <data name="UPSELL_BLURB_WLB_MORE" xml:space="preserve">
+    <value>
 
 要了解与 @BRANDING_SERVER@ 动态工作负载平衡功能有关的更多信息或启动 @BRANDING_SERVER@ 试用版，请单击下面的按钮。</value>
   </data>