Merge pull request #40 from xenserver/master

Merge latest changes from master to xs64bit including [CA-99780]
This commit is contained in:
Stephen Turner 2014-04-15 16:18:54 +01:00
commit 1809ec56c9
2 changed files with 2 additions and 2 deletions

View File

@ -6550,7 +6550,7 @@ namespace XenAdmin {
/// Looks up a localized string similar to Are you sure you want to destroy '{0}'?
///
///You should only need to destroy a XenServer if it has physically failed.
///Destroying this server will permanently remove it from the pool along with its local SRs, DVD drives and removable storage.
///Destroying this server will permanently remove it from the pool along with its local SRs, DVD drives and removable storage. The server will need to be reinstalled before it can be used again.
///
///This action is final and unrecoverable..
/// </summary>

View File

@ -2389,7 +2389,7 @@ This will also delete its VMs.</value>
<value>Are you sure you want to destroy '{0}'?
You should only need to destroy a XenServer if it has physically failed.
Destroying this server will permanently remove it from the pool along with its local SRs, DVD drives and removable storage.
Destroying this server will permanently remove it from the pool along with its local SRs, DVD drives and removable storage. The server will need to be reinstalled before it can be used again.
This action is final and unrecoverable.</value>
</data>