From 257a6daef2646cd7885374697755f783f8422258 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Wed, 19 Jul 2017 09:22:27 +0100 Subject: [PATCH] Removed duplicate resource. Signed-off-by: Konstantina Chremmou --- .../XenAPI/FriendlyErrorNames.Designer.cs | 108 ++++++++++++++++-- XenModel/XenAPI/FriendlyErrorNames.resx | 11 +- 2 files changed, 103 insertions(+), 16 deletions(-) diff --git a/XenModel/XenAPI/FriendlyErrorNames.Designer.cs b/XenModel/XenAPI/FriendlyErrorNames.Designer.cs index 674b8e5f2..6b29c7d83 100644 --- a/XenModel/XenAPI/FriendlyErrorNames.Designer.cs +++ b/XenModel/XenAPI/FriendlyErrorNames.Designer.cs @@ -132,6 +132,24 @@ namespace XenAPI { } } + /// + /// Looks up a localized string similar to The host failed to enable external authentication.. + /// + public static string AUTH_ENABLE_FAILED_INVALID_ACCOUNT { + get { + return ResourceManager.GetString("AUTH_ENABLE_FAILED_INVALID_ACCOUNT", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The host failed to enable external authentication.. + /// + public static string AUTH_ENABLE_FAILED_INVALID_OU { + get { + return ResourceManager.GetString("AUTH_ENABLE_FAILED_INVALID_OU", resourceCulture); + } + } + /// /// Looks up a localized string similar to Failed to enable external authentication, permission on the AD server was denied.. /// @@ -2148,6 +2166,15 @@ namespace XenAPI { } } + /// + /// Looks up a localized string similar to This host has no PIF on the given network.. + /// + public static string PIF_NOT_PRESENT { + get { + return ResourceManager.GetString("PIF_NOT_PRESENT", resourceCulture); + } + } + /// /// Looks up a localized string similar to Operation cannot proceed while a tunnel exists on this interface.. /// @@ -2256,6 +2283,15 @@ namespace XenAPI { } } + /// + /// Looks up a localized string similar to Failed to enable external authentication, the supplied account was invalid.. + /// + public static string POOL_AUTH_ENABLE_FAILED_INVALID_ACCOUNT { + get { + return ResourceManager.GetString("POOL_AUTH_ENABLE_FAILED_INVALID_ACCOUNT", resourceCulture); + } + } + /// /// Looks up a localized string similar to The pool failed to enable external authentication.. /// @@ -2291,15 +2327,6 @@ namespace XenAPI { return ResourceManager.GetString("POOL_AUTH_ENABLE_FAILED_WRONG_CREDENTIALS", resourceCulture); } } - - /// - /// Looks up a localized string similar to Failed to enable external authentication, the supplied account was invalid.. - /// - public static string POOL_AUTH_ENABLE_FAILED_INVALID_ACCOUNT { - get { - return ResourceManager.GetString("POOL_AUTH_ENABLE_FAILED_INVALID_ACCOUNT", resourceCulture); - } - } /// /// Looks up a localized string similar to The external authentication configuration of the server joining the pool must match the pool's own external authentication configuration.. @@ -2355,6 +2382,24 @@ namespace XenAPI { } } + /// + /// Looks up a localized string similar to The host joining the pool must have the same API version as the pool master.. + /// + public static string POOL_JOINING_HOST_MUST_HAVE_SAME_API_VERSION { + get { + return ResourceManager.GetString("POOL_JOINING_HOST_MUST_HAVE_SAME_API_VERSION", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The host joining the pool must have the same database schema as the pool master.. + /// + public static string POOL_JOINING_HOST_MUST_HAVE_SAME_DB_SCHEMA { + get { + return ResourceManager.GetString("POOL_JOINING_HOST_MUST_HAVE_SAME_DB_SCHEMA", resourceCulture); + } + } + /// /// Looks up a localized string similar to The server joining the pool must have the same product version as the pool master.. /// @@ -3818,6 +3863,33 @@ namespace XenAPI { } } + /// + /// Looks up a localized string similar to Unable to activate changed block tracking.. + /// + public static string SR_BACKEND_FAILURE_457 { + get { + return ResourceManager.GetString("SR_BACKEND_FAILURE_457", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to deactivate changed block tracking.. + /// + public static string SR_BACKEND_FAILURE_458 { + get { + return ResourceManager.GetString("SR_BACKEND_FAILURE_458", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Changed block tracking log is in an inconsistent state.. + /// + public static string SR_BACKEND_FAILURE_459 { + get { + return ResourceManager.GetString("SR_BACKEND_FAILURE_459", resourceCulture); + } + } + /// /// Looks up a localized string similar to The VDI is not available. /// @@ -4511,6 +4583,15 @@ namespace XenAPI { } } + /// + /// Looks up a localized string similar to Cannot contact the other host using TLS on the specified address and port. + /// + public static string TLS_CONNECTION_FAILED { + get { + return ResourceManager.GetString("TLS_CONNECTION_FAILED", resourceCulture); + } + } + /// /// Looks up a localized string similar to The request was rejected because the server is too busy.. /// @@ -5159,6 +5240,15 @@ namespace XenAPI { } } + /// + /// Looks up a localized string similar to VM cannot be resumed because it has no suspend VDI. + /// + public static string VM_HAS_NO_SUSPEND_VDI { + get { + return ResourceManager.GetString("VM_HAS_NO_SUSPEND_VDI", resourceCulture); + } + } + /// /// Looks up a localized string similar to This operation could not be performed because the VM has one or more PCI devices passed through.. /// diff --git a/XenModel/XenAPI/FriendlyErrorNames.resx b/XenModel/XenAPI/FriendlyErrorNames.resx index 0b39ae067..98c090721 100644 --- a/XenModel/XenAPI/FriendlyErrorNames.resx +++ b/XenModel/XenAPI/FriendlyErrorNames.resx @@ -112,10 +112,10 @@ 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 An activation key can only be applied when the edition is set to 'free'. @@ -859,7 +859,7 @@ Failed to enable external authentication, a duplicate hostname was detected. - The pool failed to enable external authentication. + Failed to enable external authentication, the supplied account was invalid. The pool failed to enable external authentication. @@ -873,9 +873,6 @@ Failed to enable external authentication, the supplied credentials were invalid. - - Failed to enable external authentication, the supplied account was invalid. - The external authentication configuration of the server joining the pool must match the pool's own external authentication configuration. @@ -2096,4 +2093,4 @@ Authorized Roles: {1} The server failed to unmarshal the XMLRPC message; it was expecting one element and received something else. - + \ No newline at end of file