From 3a5444ceb2455f5b04905b49c583df143c68a3d8 Mon Sep 17 00:00:00 2001 From: Callum McIntyre Date: Mon, 15 Aug 2016 14:22:18 +0100 Subject: [PATCH 1/3] CA-217821: Specified home server in cross pool migration should behave as home server Mostly just terminology changes from home server to target server in the CPM wizard. Changes in shared component SelectMultipleVMDestinationPage (shared with ImportWizard) to allow CPM wizard to rename the Home Server column (as it can the VM/template one - using the same pattern). Signed-off-by: Callum McIntyre --- .../Controls/VMOperationToolStripMenuItem.cs | 2 +- ....cs => CrossPoolMigrateToTargetCommand.cs} | 8 +-- .../CrossPoolMigrateDestinationPage.cs | 14 ++++-- ...PoolMigrateTransferNetworkPage.Designer.cs | 6 +-- .../CrossPoolMigrateTransferNetworkPage.resx | 49 ++++++++++--------- .../CrossPoolMigrateWizard.cs | 2 +- .../SelectMultipleVMDestinationPage.cs | 24 ++++++--- .../SelectMultipleVMDestinationPage.resx | 22 ++++----- .../Wizards/GenericPages/VMMappingSummary.cs | 6 +-- .../ImportWizard/ImportSelectHostPage.cs | 4 +- XenAdmin/XenAdmin.csproj | 4 +- XenModel/Messages.Designer.cs | 38 ++++++++++---- XenModel/Messages.ja.resx | 9 ++++ XenModel/Messages.resx | 14 ++++-- XenModel/Messages.zh-CN.resx | 9 ++++ 15 files changed, 137 insertions(+), 74 deletions(-) rename XenAdmin/Commands/{CrossPoolMigrateToHomeCommand.cs => CrossPoolMigrateToTargetCommand.cs} (80%) diff --git a/XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs b/XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs index 0d5d83e46..bbacff78f 100644 --- a/XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs +++ b/XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs @@ -174,7 +174,7 @@ namespace XenAdmin.Commands VMOperationCommand cmdHome = new VMOperationHomeServerCommand(Command.MainWindowCommandInterface, selection, _operation, session); Host affinityHost = connection.Resolve(((VM)Command.GetSelection()[0].XenObject).affinity); - VMOperationCommand cpmCmdHome = new CrossPoolMigrateToHomeCommand(Command.MainWindowCommandInterface, selection, affinityHost); + VMOperationCommand cpmCmdHome = new CrossPoolMigrateToTargetCommand(Command.MainWindowCommandInterface, selection, affinityHost); Program.Invoke(Program.MainWindow, delegate { diff --git a/XenAdmin/Commands/CrossPoolMigrateToHomeCommand.cs b/XenAdmin/Commands/CrossPoolMigrateToTargetCommand.cs similarity index 80% rename from XenAdmin/Commands/CrossPoolMigrateToHomeCommand.cs rename to XenAdmin/Commands/CrossPoolMigrateToTargetCommand.cs index 843173433..a460a94cc 100644 --- a/XenAdmin/Commands/CrossPoolMigrateToHomeCommand.cs +++ b/XenAdmin/Commands/CrossPoolMigrateToTargetCommand.cs @@ -38,14 +38,14 @@ using XenAPI; namespace XenAdmin.Commands { /// - /// The command for the 'Home Server' subitem which is shown when WLB isn't enabled in the submenu for start-on, resume-on or migrate. + /// The command for the 'Target Server' subitem which is shown when WLB isn't enabled in the submenu for start-on, resume-on or migrate. /// - internal class CrossPoolMigrateToHomeCommand : CrossPoolMigrateCommand + internal class CrossPoolMigrateToTargetCommand : CrossPoolMigrateCommand { - public CrossPoolMigrateToHomeCommand(IMainWindow mainWindow, IEnumerable selection, Host preSelectedHost) + public CrossPoolMigrateToTargetCommand(IMainWindow mainWindow, IEnumerable selection, Host preSelectedHost) : base(mainWindow, selection, preSelectedHost) { - MenuText = Messages.HOME_SERVER_MENU_ITEM; + MenuText = Messages.TARGET_SERVER_MENU_ITEM; } public override Image MenuImage diff --git a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs index b0a77e654..7a9d2ec17 100644 --- a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs +++ b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs @@ -112,9 +112,9 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard } } - protected override string HomeServerText { get { return Messages.CPM_WIZARD_DESTINATION_DESTINATION; } } + protected override string TargetServerText { get { return Messages.CPM_WIZARD_DESTINATION_DESTINATION; } } - protected override string HomeServerSelectionIntroText { get { return Messages.CPM_WIZARD_DESTINATION_TABLE_INTRO; } } + protected override string TargetServerSelectionIntroText { get { return Messages.CPM_WIZARD_DESTINATION_TABLE_INTRO; } } public override DelayLoadingOptionComboBoxItem CreateDelayLoadingOptionComboBoxItem(IXenObject xenItem) @@ -122,7 +122,7 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard return new CrossPoolMigrateDelayLoadingComboBoxItem(xenItem, preSelectedHost, selectedVMs); } - protected override List CreateHomeServerFilterList(IEnableableXenObjectComboBoxItem selectedItem) + protected override List CreateTargetServerFilterList(IEnableableXenObjectComboBoxItem selectedItem) { List filters = new List{ new ResidentHostIsSameAsSelectionFilter(selectedVMs) }; @@ -168,5 +168,13 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard return TemplatesOnly ? Messages.TEMPLATE : Messages.VM; } } + + protected override string TargetColumnHeaderText + { + get + { + return Messages.TARGET_SERVER; + } + } } } diff --git a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.Designer.cs b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.Designer.cs index d42ed11a5..ce0cf45df 100644 --- a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.Designer.cs +++ b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.Designer.cs @@ -67,10 +67,10 @@ resources.ApplyResources(this.networkComboBox, "networkComboBox"); this.networkComboBox.Name = "networkComboBox"; // - // label3 + // blurbText // - resources.ApplyResources(this.blurbText, "label3"); - this.blurbText.Name = "label3"; + resources.ApplyResources(this.blurbText, "blurbText"); + this.blurbText.Name = "blurbText"; // // CrossPoolMigrateTransferNetworkPage // diff --git a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.resx b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.resx index bfcc7f320..e23aa401e 100644 --- a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.resx +++ b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateTransferNetworkPage.resx @@ -145,7 +145,7 @@ 0, 0, 10, 0 - 88, 27 + 229, 46 0 @@ -172,10 +172,10 @@ False - 101, 3 + 242, 3 - 432, 21 + 432, 39 11 @@ -196,13 +196,13 @@ Top - 3, 36 + 3, 55 1 - 608, 27 + 1529, 46 2 @@ -222,40 +222,40 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="label1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="networkComboBox" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,Percent,100" /><Rows Styles="AutoSize,100" /></TableLayoutSettings> - + True - + Fill - + NoControl - + 3, 0 - + 0, 0, 0, 20 - - 608, 33 + + 1529, 52 - + 14 - + label3 - - label3 + + blurbText - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tableLayoutPanel1 - + 1 @@ -268,7 +268,7 @@ 2 - 614, 332 + 1535, 830 0 @@ -286,16 +286,19 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label3" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,Percent,100" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="blurbText" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,Percent,100" /></TableLayoutSettings> True - 96, 96 + 240, 240 + + + 8, 8, 8, 8 - 614, 332 + 1535, 830 CrossPoolMigrateTransferNetworkPage diff --git a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateWizard.cs b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateWizard.cs index 8c2e422df..5ec9739cb 100644 --- a/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateWizard.cs +++ b/XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateWizard.cs @@ -419,7 +419,7 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard summary = new VmTitleSummary(summary, pair.Value); summary = new DestinationPoolSummary(summary, pair.Value, TargetConnection); - summary = new HomeServerSummary(summary, pair.Value, TargetConnection); + summary = new TargetServerSummary(summary, pair.Value, TargetConnection); summary = new TransferNetworkSummary(summary, m_pageTransferNetwork.NetworkUuid.Value); summary = new StorageSummary(summary, pair.Value, xenConnection); summary = new NetworkSummary(summary, pair.Value, xenConnection); diff --git a/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.cs b/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.cs index 31f7b4558..9255ef54e 100644 --- a/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.cs +++ b/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.cs @@ -101,9 +101,10 @@ namespace XenAdmin.Wizards.GenericPages protected void InitializeText() { m_labelIntro.Text = InstructionText; - label1.Text = HomeServerText; - label2.Text = HomeServerSelectionIntroText; + label1.Text = TargetServerText; + label2.Text = TargetServerSelectionIntroText; m_colVmName.HeaderText = VmColumnHeaderText; + m_colTarget.HeaderText = TargetColumnHeaderText; } private IXenObject _chosenItem; @@ -123,9 +124,9 @@ namespace XenAdmin.Wizards.GenericPages protected abstract string InstructionText { get; } /// - /// Text demarking what the label fot the home server drop down should be + /// Text demarking what the label for the target server drop down should be /// - protected abstract string HomeServerText { get; } + protected abstract string TargetServerText { get; } protected virtual string VmColumnHeaderText { @@ -135,10 +136,19 @@ namespace XenAdmin.Wizards.GenericPages } } + protected virtual string TargetColumnHeaderText + { + get + { + return m_colTarget.HeaderText; + } + } + + /// /// Text above the table containing a list of VMs and concomitant home server /// - protected abstract string HomeServerSelectionIntroText { get; } + protected abstract string TargetServerSelectionIntroText { get; } protected virtual void OnChosenItemChanged() {} @@ -553,7 +563,7 @@ namespace XenAdmin.Wizards.GenericPages { Cursor.Current = Cursors.WaitCursor; ChosenItem = item == null ? null : item.Item; - Program.Invoke(Program.MainWindow, ()=> PopulateDataGridView(CreateHomeServerFilterList(item))); + Program.Invoke(Program.MainWindow, ()=> PopulateDataGridView(CreateTargetServerFilterList(item))); } finally { @@ -569,7 +579,7 @@ namespace XenAdmin.Wizards.GenericPages /// /// selected item from the host combobox /// - protected virtual List CreateHomeServerFilterList(IEnableableXenObjectComboBoxItem item) + protected virtual List CreateTargetServerFilterList(IEnableableXenObjectComboBoxItem item) { return new List(); } diff --git a/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.resx b/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.resx index 32172821c..ce852f56e 100644 --- a/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.resx +++ b/XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.resx @@ -112,26 +112,26 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 1 True - + Fill NoControl - + 3, 0 @@ -285,18 +285,18 @@ 2 - + True - + VM 48 - + True - + Home Server @@ -447,9 +447,9 @@ <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="m_labelIntro" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanel2" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="label2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="m_dataGridView" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="tableLayoutPanelWarning" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /></Controls><Columns Styles="Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,Absolute,20" /></TableLayoutSettings> - + True - + 96, 96 diff --git a/XenAdmin/Wizards/GenericPages/VMMappingSummary.cs b/XenAdmin/Wizards/GenericPages/VMMappingSummary.cs index e1b032d8a..f7abf257f 100644 --- a/XenAdmin/Wizards/GenericPages/VMMappingSummary.cs +++ b/XenAdmin/Wizards/GenericPages/VMMappingSummary.cs @@ -168,12 +168,12 @@ namespace XenAdmin.Wizards.GenericPages } } - public class HomeServerSummary : MappingSummaryDecorator + public class TargetServerSummary : MappingSummaryDecorator { private readonly VmMapping mapping; private readonly IXenConnection connection; - public HomeServerSummary(MappingSummary summary, VmMapping mapping, IXenConnection connection) + public TargetServerSummary(MappingSummary summary, VmMapping mapping, IXenConnection connection) : base(summary) { this.mapping = mapping; @@ -185,7 +185,7 @@ namespace XenAdmin.Wizards.GenericPages get { List decoratedSummary = summary.Details; - decoratedSummary.Add(new SummaryDetails(Messages.CPM_SUMMARY_KEY_HOME_SERVER, ResolveLabel())); + decoratedSummary.Add(new SummaryDetails(Messages.CPM_SUMMARY_KEY_TARGET_SERVER, ResolveLabel())); return decoratedSummary; } } diff --git a/XenAdmin/Wizards/ImportWizard/ImportSelectHostPage.cs b/XenAdmin/Wizards/ImportWizard/ImportSelectHostPage.cs index f128bff2d..81a61d0b5 100644 --- a/XenAdmin/Wizards/ImportWizard/ImportSelectHostPage.cs +++ b/XenAdmin/Wizards/ImportWizard/ImportSelectHostPage.cs @@ -84,9 +84,9 @@ namespace XenAdmin.Wizards.ImportWizard protected override string InstructionText { get { return Messages.IMPORT_WIZARD_DESTINATION_INSTRUCTIONS; } } - protected override string HomeServerText { get { return Messages.IMPORT_WIZARD_DESTINATION_DESTINATION; } } + protected override string TargetServerText { get { return Messages.IMPORT_WIZARD_DESTINATION_DESTINATION; } } - protected override string HomeServerSelectionIntroText { get { return Messages.IMPORT_WIZARD_DESTINATION_TABLE_INTRO; } } + protected override string TargetServerSelectionIntroText { get { return Messages.IMPORT_WIZARD_DESTINATION_TABLE_INTRO; } } protected override void OnChosenItemChanged() { diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index a3d3273b3..d6b35fcba 100644 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -123,7 +123,7 @@ Component - + @@ -6755,4 +6755,4 @@ copy "$(ProjectDir)\..\putty\putty.exe" "$(TargetDir)" - + \ No newline at end of file diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index a10815199..bfe770a23 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -8571,15 +8571,6 @@ namespace XenAdmin { } } - /// - /// Looks up a localized string similar to Home Server:. - /// - public static string CPM_SUMMARY_KEY_HOME_SERVER { - get { - return ResourceManager.GetString("CPM_SUMMARY_KEY_HOME_SERVER", resourceCulture); - } - } - /// /// Looks up a localized string similar to Template:. /// @@ -8616,6 +8607,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to Target Server:. + /// + public static string CPM_SUMMARY_KEY_TARGET_SERVER { + get { + return ResourceManager.GetString("CPM_SUMMARY_KEY_TARGET_SERVER", resourceCulture); + } + } + /// /// Looks up a localized string similar to Migration Network:. /// @@ -8743,7 +8743,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Specify a &home server in the destination pool (optional):. + /// Looks up a localized string similar to Specify a &target server in the destination pool (optional):. /// public static string CPM_WIZARD_DESTINATION_TABLE_INTRO { get { @@ -31263,6 +31263,24 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to Target Server. + /// + public static string TARGET_SERVER { + get { + return ResourceManager.GetString("TARGET_SERVER", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to &Target Server. + /// + public static string TARGET_SERVER_MENU_ITEM { + get { + return ResourceManager.GetString("TARGET_SERVER_MENU_ITEM", resourceCulture); + } + } + /// /// Looks up a localized string similar to Tell me more .... /// diff --git a/XenModel/Messages.ja.resx b/XenModel/Messages.ja.resx index c9e3e44d5..b66a01007 100644 --- a/XenModel/Messages.ja.resx +++ b/XenModel/Messages.ja.resx @@ -12948,4 +12948,13 @@ To learn more about the [XenServer] Active Directory feature or to start a [XenS 現在の位置 + + &Target Server + + + Target Server + + + Target Server: + diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index e5a016820..55c0c0179 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -3110,9 +3110,6 @@ You can only connect to a single [Citrix] [XenServer product] Express Edition se Destination: - - Home Server: - Template: @@ -3125,6 +3122,9 @@ You can only connect to a single [Citrix] [XenServer product] Express Edition se Storage: + + Target Server: + Migration Network: @@ -3165,7 +3165,7 @@ You can only connect to a single [Citrix] [XenServer product] Express Edition se Select the pool or standalone server where you want to migrate the selected VM to. - Specify a &home server in the destination pool (optional): + Specify a &target server in the destination pool (optional): Destination Pool @@ -10861,6 +10861,12 @@ Refer to the "[XenServer product] Administrator's Guide" for instructions on how Target + + Target Server + + + &Target Server + Tell me more ... diff --git a/XenModel/Messages.zh-CN.resx b/XenModel/Messages.zh-CN.resx index 61a199692..dd8151e7e 100644 --- a/XenModel/Messages.zh-CN.resx +++ b/XenModel/Messages.zh-CN.resx @@ -12947,4 +12947,13 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并 您在此处 + + &Target Server + + + Target Server + + + Target Server: + From 05efba8b9f59f250ce683fc9b292eb324ccdd53f Mon Sep 17 00:00:00 2001 From: Callum McIntyre Date: Mon, 15 Aug 2016 16:13:35 +0100 Subject: [PATCH 2/3] CA-217821: Rename command back to CrossPoolMigrateToHomeCommand --- .../Commands/Controls/VMOperationToolStripMenuItem.cs | 2 +- ...TargetCommand.cs => CrossPoolMigrateToHomeCommand.cs} | 6 +++--- XenAdmin/XenAdmin.csproj | 2 +- XenModel/Messages.Designer.cs | 9 --------- XenModel/Messages.resx | 3 --- 5 files changed, 5 insertions(+), 17 deletions(-) rename XenAdmin/Commands/{CrossPoolMigrateToTargetCommand.cs => CrossPoolMigrateToHomeCommand.cs} (86%) diff --git a/XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs b/XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs index bbacff78f..0d5d83e46 100644 --- a/XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs +++ b/XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs @@ -174,7 +174,7 @@ namespace XenAdmin.Commands VMOperationCommand cmdHome = new VMOperationHomeServerCommand(Command.MainWindowCommandInterface, selection, _operation, session); Host affinityHost = connection.Resolve(((VM)Command.GetSelection()[0].XenObject).affinity); - VMOperationCommand cpmCmdHome = new CrossPoolMigrateToTargetCommand(Command.MainWindowCommandInterface, selection, affinityHost); + VMOperationCommand cpmCmdHome = new CrossPoolMigrateToHomeCommand(Command.MainWindowCommandInterface, selection, affinityHost); Program.Invoke(Program.MainWindow, delegate { diff --git a/XenAdmin/Commands/CrossPoolMigrateToTargetCommand.cs b/XenAdmin/Commands/CrossPoolMigrateToHomeCommand.cs similarity index 86% rename from XenAdmin/Commands/CrossPoolMigrateToTargetCommand.cs rename to XenAdmin/Commands/CrossPoolMigrateToHomeCommand.cs index a460a94cc..43a8d35d9 100644 --- a/XenAdmin/Commands/CrossPoolMigrateToTargetCommand.cs +++ b/XenAdmin/Commands/CrossPoolMigrateToHomeCommand.cs @@ -40,12 +40,12 @@ namespace XenAdmin.Commands /// /// The command for the 'Target Server' subitem which is shown when WLB isn't enabled in the submenu for start-on, resume-on or migrate. /// - internal class CrossPoolMigrateToTargetCommand : CrossPoolMigrateCommand + internal class CrossPoolMigrateToHomeCommand : CrossPoolMigrateCommand { - public CrossPoolMigrateToTargetCommand(IMainWindow mainWindow, IEnumerable selection, Host preSelectedHost) + public CrossPoolMigrateToHomeCommand(IMainWindow mainWindow, IEnumerable selection, Host preSelectedHost) : base(mainWindow, selection, preSelectedHost) { - MenuText = Messages.TARGET_SERVER_MENU_ITEM; + MenuText = Messages.HOME_SERVER_MENU_ITEM; } public override Image MenuImage diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index d6b35fcba..2dec906d8 100644 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -123,7 +123,7 @@ Component - + diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index bfe770a23..e16add6cf 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -31272,15 +31272,6 @@ namespace XenAdmin { } } - /// - /// Looks up a localized string similar to &Target Server. - /// - public static string TARGET_SERVER_MENU_ITEM { - get { - return ResourceManager.GetString("TARGET_SERVER_MENU_ITEM", resourceCulture); - } - } - /// /// Looks up a localized string similar to Tell me more .... /// diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 55c0c0179..61003a7e0 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -10864,9 +10864,6 @@ Refer to the "[XenServer product] Administrator's Guide" for instructions on how Target Server - - &Target Server - Tell me more ... From a41c76a0ba62431f94105cb8977f48f612d1eb95 Mon Sep 17 00:00:00 2001 From: Callum McIntyre Date: Mon, 15 Aug 2016 16:38:48 +0100 Subject: [PATCH 3/3] CA-217821: Remove unused TARGET_SERVER_MENU_ITEM key from Japanese+Chinese resources Signed-off-by: Callum McIntyre --- XenModel/Messages.ja.resx | 47 +++++++++++++++++------------------- XenModel/Messages.zh-CN.resx | 47 +++++++++++++++++------------------- 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/XenModel/Messages.ja.resx b/XenModel/Messages.ja.resx index b66a01007..006f0f895 100644 --- a/XenModel/Messages.ja.resx +++ b/XenModel/Messages.ja.resx @@ -59,46 +59,46 @@ : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> - - - + + + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -10416,7 +10416,7 @@ VM が再起動したら、[[XenServer product] Tools のインストール] を 権限のより多いユーザー アカウントで再試行してください。 - + いくつかのエラーが発生しました。詳しくは、[XenCenter] のログを参照してください。 @@ -11036,7 +11036,7 @@ VM が再起動したら、[[XenServer product] Tools のインストール] を OVF または OVA パッケージからアプライアンスをインポートします。 - + ローカルに格納された VM、テンプレート、またはスナップショットを新規 VM としてインポートします。 @@ -12235,7 +12235,7 @@ To learn more about the [XenServer] Active Directory feature or to start a [XenS 詳細 - + 最大 @@ -12948,13 +12948,10 @@ To learn more about the [XenServer] Active Directory feature or to start a [XenS 現在の位置 - - &Target Server - Target Server Target Server: - + \ No newline at end of file diff --git a/XenModel/Messages.zh-CN.resx b/XenModel/Messages.zh-CN.resx index dd8151e7e..00f4bef40 100644 --- a/XenModel/Messages.zh-CN.resx +++ b/XenModel/Messages.zh-CN.resx @@ -59,46 +59,46 @@ : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> - - - + + + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -10415,7 +10415,7 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并 使用权限更大的用户帐户重试。 - + 遇到一些错误。有关详细信息，请参阅 [XenCenter] 日志。 @@ -11035,7 +11035,7 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并 从 OVF 或 OVA 包导入设备。 - + 将本地存储的 VM、模板或快照作为新 VM 导入。 @@ -12234,7 +12234,7 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并 高级 - + 最大值 @@ -12947,13 +12947,10 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并 您在此处 - - &Target Server - Target Server Target Server: - + \ No newline at end of file