diff --git a/XenAdmin/Commands/DetachVirtualDiskCommand.cs b/XenAdmin/Commands/DetachVirtualDiskCommand.cs index 84a620bc5..55b3d4c86 100644 --- a/XenAdmin/Commands/DetachVirtualDiskCommand.cs +++ b/XenAdmin/Commands/DetachVirtualDiskCommand.cs @@ -169,8 +169,8 @@ namespace XenAdmin.Commands if (actionsToComplete.Count == 1) actionsToComplete[0].RunAsync(); else - RunMultipleActions(actionsToComplete, Messages.ACTION_DETATCHING_MULTIPLE_VDIS_TITLE, - Messages.ACTION_DETATCHING_MULTIPLE_VDIS_STATUS, Messages.COMPLETED, true); + RunMultipleActions(actionsToComplete, Messages.ACTION_DETACHING_MULTIPLE_VDIS_TITLE, + Messages.ACTION_DETACHING_MULTIPLE_VDIS_STATUS, Messages.COMPLETED, true); } private List getDetachVDIAction(VDI vdi) @@ -194,9 +194,9 @@ namespace XenAdmin.Commands return true; MultipleWarningDialog warningDialog = new MultipleWarningDialog( - Messages.MESSAGEBOX_DETATCH_VD_TITLE_MUTLIPLE, - Messages.MULTI_VDI_DETATCH_WARNING, - Messages.DETATCH_ALL_BUTTON_LABEL); + Messages.MESSAGEBOX_DETACH_VD_TITLE_MUTLIPLE, + Messages.MULTI_VDI_DETACH_WARNING, + Messages.DETACH_ALL_BUTTON_LABEL); SelectedItemCollection selectedItems = GetSelection(); List sysDisks = new List(); diff --git a/XenAdmin/TabPages/VMStoragePage.cs b/XenAdmin/TabPages/VMStoragePage.cs index e6aec6260..6e6408235 100644 --- a/XenAdmin/TabPages/VMStoragePage.cs +++ b/XenAdmin/TabPages/VMStoragePage.cs @@ -345,7 +345,7 @@ namespace XenAdmin.TabPages } else { - // this is the default cause in the mixed attached/detatched scenario. We try to activate all the selection + // this is the default cause in the mixed attached/detached scenario. We try to activate all the selection // The command error reports afterwards about the ones which are already attached DeactivateButton.Text = Messages.ACTIVATE; activationCmd = new ActivateVBDCommand(Program.MainWindow, selectedVBDs); diff --git a/XenModel/Actions/VDI/DetachVirtualDiskAction.cs b/XenModel/Actions/VDI/DetachVirtualDiskAction.cs index 4e1cea08a..ba7dadded 100644 --- a/XenModel/Actions/VDI/DetachVirtualDiskAction.cs +++ b/XenModel/Actions/VDI/DetachVirtualDiskAction.cs @@ -74,7 +74,7 @@ namespace XenAdmin.Actions protected override void Run() { - log.DebugFormat("Detatching VDI '{0}'", Helpers.GetName(vdi)); + log.DebugFormat("Detaching VDI '{0}'", Helpers.GetName(vdi)); Description = Messages.ACTION_DISK_DETACHING; try { @@ -96,7 +96,7 @@ namespace XenAdmin.Actions PollToCompletion(51, 100); } Description = Messages.ACTION_DISK_DETACHED; - log.DebugFormat("Detatched VDI '{0}'", Helpers.GetName(vdi)); + log.DebugFormat("Detached VDI '{0}'", Helpers.GetName(vdi)); } protected override void Clean() diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 5e0dbd79a..34c82d940 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -484,20 +484,20 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to Detatching storage items.... + /// Looks up a localized string similar to Detaching storage items.... /// - public static string ACTION_DETATCHING_MULTIPLE_VDIS_STATUS { + public static string ACTION_DETACHING_MULTIPLE_VDIS_STATUS { get { - return ResourceManager.GetString("ACTION_DETATCHING_MULTIPLE_VDIS_STATUS", resourceCulture); + return ResourceManager.GetString("ACTION_DETACHING_MULTIPLE_VDIS_STATUS", resourceCulture); } } /// /// Looks up a localized string similar to Detaching Multiple Storage Items. /// - public static string ACTION_DETATCHING_MULTIPLE_VDIS_TITLE { + public static string ACTION_DETACHING_MULTIPLE_VDIS_TITLE { get { - return ResourceManager.GetString("ACTION_DETATCHING_MULTIPLE_VDIS_TITLE", resourceCulture); + return ResourceManager.GetString("ACTION_DETACHING_MULTIPLE_VDIS_TITLE", resourceCulture); } } @@ -6442,7 +6442,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to You must detatch this virtual disk before it can be moved.. + /// Looks up a localized string similar to You must detach this virtual disk before it can be moved.. /// public static string CANNOT_MOVE_VDI_WITH_VBDS { get { @@ -10681,6 +10681,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to &Detach all. + /// + public static string DETACH_ALL_BUTTON_LABEL { + get { + return ResourceManager.GetString("DETACH_ALL_BUTTON_LABEL", resourceCulture); + } + } + /// /// Looks up a localized string similar to &Detach. /// @@ -10726,15 +10735,6 @@ namespace XenAdmin { } } - /// - /// Looks up a localized string similar to &Detatch all. - /// - public static string DETATCH_ALL_BUTTON_LABEL { - get { - return ResourceManager.GetString("DETATCH_ALL_BUTTON_LABEL", resourceCulture); - } - } - /// /// Looks up a localized string similar to Device. /// @@ -13350,20 +13350,20 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to The following virtual disks could not be detatched:. + /// Looks up a localized string similar to The following virtual disks could not be detached:. /// - public static string ERROR_DETATCHING_VDIS_MESSAGE { + public static string ERROR_DETACHING_VDIS_MESSAGE { get { - return ResourceManager.GetString("ERROR_DETATCHING_VDIS_MESSAGE", resourceCulture); + return ResourceManager.GetString("ERROR_DETACHING_VDIS_MESSAGE", resourceCulture); } } /// - /// Looks up a localized string similar to Error Detatching Virtual Disks. + /// Looks up a localized string similar to Error Detaching Virtual Disks. /// - public static string ERROR_DETATCHING_VDIS_TITLE { + public static string ERROR_DETACHING_VDIS_TITLE { get { - return ResourceManager.GetString("ERROR_DETATCHING_VDIS_TITLE", resourceCulture); + return ResourceManager.GetString("ERROR_DETACHING_VDIS_TITLE", resourceCulture); } } @@ -21422,9 +21422,9 @@ namespace XenAdmin { /// /// Looks up a localized string similar to Detach Multiple Virtual Disks. /// - public static string MESSAGEBOX_DETATCH_VD_TITLE_MUTLIPLE { + public static string MESSAGEBOX_DETACH_VD_TITLE_MUTLIPLE { get { - return ResourceManager.GetString("MESSAGEBOX_DETATCH_VD_TITLE_MUTLIPLE", resourceCulture); + return ResourceManager.GetString("MESSAGEBOX_DETACH_VD_TITLE_MUTLIPLE", resourceCulture); } } @@ -21997,9 +21997,9 @@ namespace XenAdmin { /// /// Looks up a localized string similar to You are about to detach multiple virtual disks, are you sure you wish to proceed?. /// - public static string MULTI_VDI_DETATCH_WARNING { + public static string MULTI_VDI_DETACH_WARNING { get { - return ResourceManager.GetString("MULTI_VDI_DETATCH_WARNING", resourceCulture); + return ResourceManager.GetString("MULTI_VDI_DETACH_WARNING", resourceCulture); } } diff --git a/XenModel/Messages.ja.resx b/XenModel/Messages.ja.resx index d40f772c3..09bf59a4a 100644 --- a/XenModel/Messages.ja.resx +++ b/XenModel/Messages.ja.resx @@ -258,10 +258,10 @@ {0} の破棄 - + ストレージの接続を解除しています... - + 複数ストレージの接続解除 @@ -3799,7 +3799,7 @@ VM 移行処理のパフォーマンスや信頼性を向上させるため、 詳細 - + すべて接続解除(&D) @@ -4679,10 +4679,10 @@ CD をイジェクトしてから再試行してください。 ストレージの破棄エラー - + 以下の仮想ディスクを接続解除できません。 - + 仮想ディスクの接続解除エラー @@ -7384,7 +7384,7 @@ SCSI ID: {2} 仮想ディスクの接続解除 - + 複数仮想ディスクの接続解除 @@ -7611,7 +7611,7 @@ SCSI ID: {2} 複数の仮想ディスクが削除されます。続行しますか? - + 複数の仮想ディスクが接続解除されます。続行しますか? diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index b20f55bf6..ff1563e8a 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -258,10 +258,10 @@ Destroying {0} - - Detatching storage items... + + Detaching storage items... - + Detaching Multiple Storage Items @@ -2347,7 +2347,7 @@ Deleting this bond will disrupt traffic through the secondary interface on the b Snapshot disks cannot be moved - You must detatch this virtual disk before it can be moved. + You must detach this virtual disk before it can be moved. Cannot parse required parameter '{1}' on XML node '{0}' @@ -3831,15 +3831,15 @@ This will also delete its subfolders. [XenCenter] has detected that an SR already exists on this LUN. This SR is not currently in use by '{0}', would you like to attach it? + + &Detach all + &Detach Details - - &Detatch all - Device @@ -4717,11 +4717,11 @@ Would you like to eject these ISOs before continuing? Error Destroying Storage Items - - The following virtual disks could not be detatched: + + The following virtual disks could not be detached: - - Error Detatching Virtual Disks + + Error Detaching Virtual Disks The following servers could not be added to the pool '{0}': @@ -7461,7 +7461,7 @@ Are you sure you want to detach this storage repository? Detach virtual disk - + Detach Multiple Virtual Disks @@ -7688,7 +7688,7 @@ To learn more about the [XenServer] Live VDI Migration feature or to start a [Xe You are about to delete multiple virtual disks. Are you sure you wish to proceed? - + You are about to detach multiple virtual disks, are you sure you wish to proceed? diff --git a/XenModel/Messages.zh-CN.resx b/XenModel/Messages.zh-CN.resx index 2e93820d3..0373b7150 100644 --- a/XenModel/Messages.zh-CN.resx +++ b/XenModel/Messages.zh-CN.resx @@ -258,10 +258,10 @@ 正在销毁 {0} - + 正在分离存储项... - + 正在分离多个存储项 @@ -3794,7 +3794,7 @@ 详细信息 - + 全部分离(&D) @@ -4674,10 +4674,10 @@ 销毁存储项时出错 - + 无法分离以下虚拟磁盘: - + 分离虚拟磁盘时出错 @@ -7379,7 +7379,7 @@ SCSI ID: {2} 分离虚拟磁盘 - + 分离多个虚拟磁盘 @@ -7606,7 +7606,7 @@ SCSI ID: {2} 您将删除多个虚拟磁盘。是否确实要继续? - + 您将分离多个虚拟磁盘，是否确实要继续?