CA-111770: Version check messages confusing because the target version is a regexp

This commit is contained in:
Stephen Turner 2015-03-20 13:40:11 +00:00
parent 5fc9c6f580
commit 324d52cff7
4 changed files with 119 additions and 11 deletions

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.18444
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -24801,7 +24801,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to This patch is for XenServer {0}..
/// Looks up a localized string similar to This patch is for XenServers with version matching the regular expression &apos;{0}&apos;..
/// </summary>
public static string PATCH_FOR_XENSERVER_VERSION {
get {

View File

@ -8795,7 +8795,7 @@ Date created: {2}
Size: {3}</value>
</data>
<data name="PATCH_FOR_XENSERVER_VERSION" xml:space="preserve">
<value>This patch is for XenServer {0}.</value>
<value>This patch is for XenServers with version matching the regular expression '{0}'.</value>
</data>
<data name="PATCH_NOT_FOUND" xml:space="preserve">
<value>Not found</value>

View File

@ -1338,6 +1338,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to The host joining the pool cannot contain any network bond..
/// </summary>
public static string JOINING_HOST_CANNOT_CONTAIN_NETWORK_BOND {
get {
return ResourceManager.GetString("JOINING_HOST_CANNOT_CONTAIN_NETWORK_BOND", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The server joining the pool cannot contain any shared storage..
/// </summary>
@ -1806,6 +1815,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to The patch precheck stage failed: the server does not have enough space..
/// </summary>
public static string PATCH_PRECHECK_FAILED_OUT_OF_SPACE {
get {
return ResourceManager.GetString("PATCH_PRECHECK_FAILED_OUT_OF_SPACE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The update precheck stage failed: prerequisite updates are missing..
/// </summary>
@ -1843,7 +1861,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to XenServer version number ({1}) is incompatible with the update version number ({2})..
/// Looks up a localized string similar to XenServer version number ({1}) is incompatible with the update version number regular expression ({2})..
/// </summary>
public static string PATCH_PRECHECK_FAILED_WRONG_SERVER_VERSION {
get {
@ -1960,7 +1978,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to PIF has no IPv6 configuration (mode curently set to &apos;none&apos;).
/// Looks up a localized string similar to PIF has no IPv6 configuration (mode currently set to &apos;none&apos;).
/// </summary>
public static string PIF_HAS_NO_V6_NETWORK_CONFIGURATION {
get {
@ -2450,6 +2468,42 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to CIFS mount error.
/// </summary>
public static string SR_BACKEND_FAILURE_111 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_111", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to CIFS unmount error.
/// </summary>
public static string SR_BACKEND_FAILURE_112 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_112", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to CIFS mount point already attached.
/// </summary>
public static string SR_BACKEND_FAILURE_113 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_113", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Failed to remove CIFS mount point.
/// </summary>
public static string SR_BACKEND_FAILURE_114 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_114", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Netapp Target parameter missing in Dconf string.
/// </summary>
@ -3432,7 +3486,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to tapdisk experienced an error.
/// Looks up a localized string similar to Only 1 LUN may be used with shared OCFS.
/// </summary>
public static string SR_BACKEND_FAILURE_449 {
get {
@ -3440,6 +3494,51 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to OCFS mount error.
/// </summary>
public static string SR_BACKEND_FAILURE_450 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_450", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to OCFS unmount error.
/// </summary>
public static string SR_BACKEND_FAILURE_451 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_451", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to OCFS filesystem creation error.
/// </summary>
public static string SR_BACKEND_FAILURE_452 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_452", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to tapdisk experienced an error.
/// </summary>
public static string SR_BACKEND_FAILURE_453 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_453", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to CIFS SR is not licensed on this host.
/// </summary>
public static string SR_BACKEND_FAILURE_454 {
get {
return ResourceManager.GetString("SR_BACKEND_FAILURE_454", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The VDI is not available.
/// </summary>
@ -4188,7 +4287,7 @@ namespace XenAPI {
}
/// <summary>
/// Looks up a localized string similar to There was a problem with the license daemon (v6d). Is it running?.
/// Looks up a localized string similar to There was a problem with the license daemon (v6d)..
/// </summary>
public static string V6D_FAILURE {
get {
@ -4412,6 +4511,15 @@ namespace XenAPI {
}
}
/// <summary>
/// Looks up a localized string similar to This operation is not permitted on VMs containing VDIs in the &apos;on-boot=reset&apos; mode.
/// </summary>
public static string VDI_ON_BOOT_MODE_INCOMPATIBLE_WITH_OPERATION {
get {
return ResourceManager.GetString("VDI_ON_BOOT_MODE_INCOMPATIBLE_WITH_OPERATION", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The operation required write access but VDI {0} is read-only.
/// </summary>

View File

@ -112,10 +112,10 @@
<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>
<data name="ACTIVATION_WHILE_NOT_FREE" xml:space="preserve">
<value>An activation key can only be applied when the edition is set to 'free'.</value>
@ -718,7 +718,7 @@
<value>XenServer build number ({1}) is incompatible with the update build number ({2}).</value>
</data>
<data name="PATCH_PRECHECK_FAILED_WRONG_SERVER_VERSION" xml:space="preserve">
<value>XenServer version number ({1}) is incompatible with the update version number ({2}).</value>
<value>XenServer version number ({1}) is incompatible with the update version number regular expression ({2}).</value>
</data>
<data name="PBD_EXISTS" xml:space="preserve">
<value>A PBD already exists connecting the SR to the server</value>
@ -1886,4 +1886,4 @@ Authorized Roles: {1}</value>
<data name="XMLRPC_UNMARSHAL_FAILURE" xml:space="preserve">
<value>The server failed to unmarshal the XMLRPC message; it was expecting one element and received something else.</value>
</data>
</root>
</root>