Merge pull request #1890 from jishengx/private/jishengx/CA-272130

CA-272130: modify truncated linklabel and text on the memory settings wizard
This commit is contained in:
Mihaela Stoica 2017-12-07 13:53:03 +00:00 committed by GitHub
commit 1e08eb2371
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -129,7 +129,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="memoryControlsBasic.Size" type="System.Drawing.Size, System.Drawing">
<value>558, 319</value>
<value>558, 355</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="memoryControlsBasic.TabIndex" type="System.Int32, mscorlib">

View File

@ -7224,7 +7224,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Changing the memory of these VMs while they are running will cause them to be forcibly rebooted. This operation can lose data.
/// Looks up a localized string similar to Changing the memory of these VMs while they are running will cause them to be forcibly rebooted. This operation can cause data loss.
///
///Do you want to continue?.
/// </summary>
@ -7235,7 +7235,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Changing the memory of this VM while it is running will cause it to be forcibly rebooted. This operation can lose data.
/// Looks up a localized string similar to Changing the memory of this VM while it is running will cause it to be forcibly rebooted. This operation can cause data loss.
///
///Do you want to continue?.
/// </summary>

View File

@ -2625,12 +2625,12 @@ Do you want to continue?</value>
Do you want to continue?</value>
</data>
<data name="CONFIRM_CHANGE_MEMORY_PLURAL" xml:space="preserve">
<value>Changing the memory of these VMs while they are running will cause them to be forcibly rebooted. This operation can lose data.
<value>Changing the memory of these VMs while they are running will cause them to be forcibly rebooted. This operation can cause data loss.
Do you want to continue?</value>
</data>
<data name="CONFIRM_CHANGE_MEMORY_SINGULAR" xml:space="preserve">
<value>Changing the memory of this VM while it is running will cause it to be forcibly rebooted. This operation can lose data.
<value>Changing the memory of this VM while it is running will cause it to be forcibly rebooted. This operation can cause data loss.
Do you want to continue?</value>
</data>