Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 15:29:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor language corrections and removal of duplicate message.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2018-09-21 02:08:54 +01:00
parent 1d7008beab
commit eedba61938
5 changed files with 49 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
XenModel/FriendlyNames.Designer.cs generated
View File

@ -19,7 +19,7 @@ namespace XenAdmin {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class FriendlyNames {
@ -3663,7 +3663,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Server &apos;{0}&apos; is taking too long to respond to the HA networking heartbeat and may fence..
/// Looks up a localized string similar to Server &apos;{0}&apos; is taking too long to respond to the HA networking heartbeat and may become fenced..
/// </summary>
public static string Message_body_ha_heartbeat_approaching_timeout {
get {
@ -3744,7 +3744,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Server &apos;{0}&apos; is taking too long to write to the heartbeat storage and may fence..
/// Looks up a localized string similar to Server &apos;{0}&apos; is taking too long to write to the heartbeat storage and may become fenced..
/// </summary>
public static string Message_body_ha_statefile_approaching_timeout {
get {
@ -3762,7 +3762,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Server &apos;{0}&apos; is taking too long to respond and may fence..
/// Looks up a localized string similar to Server &apos;{0}&apos; is taking too long to respond and may become fenced..
/// </summary>
public static string Message_body_ha_xapi_healthcheck_approaching_timeout {
get {

6
XenModel/FriendlyNames.resx
View File

@ -990,7 +990,7 @@
<value>A grace license was issued for {0}. This was because the license server could not be reached, it is an out-of-date version, or because the host has recently been upgraded.</value>
</data>
<data name="Message.body-ha_heartbeat_approaching_timeout" xml:space="preserve">
<value>Server '{0}' is taking too long to respond to the HA networking heartbeat and may fence.</value>
<value>Server '{0}' is taking too long to respond to the HA networking heartbeat and may become fenced.</value>
</data>
<data name="Message.body-ha_host_failed" xml:space="preserve">
<value>Server '{0}' has failed.</value>
@ -1017,13 +1017,13 @@
<value>Virtual machine '{0}', which is protected under HA, has failed to start.</value>
</data>
<data name="Message.body-ha_statefile_approaching_timeout" xml:space="preserve">
<value>Server '{0}' is taking too long to write to the heartbeat storage and may fence.</value>
<value>Server '{0}' is taking too long to write to the heartbeat storage and may become fenced.</value>
</data>
<data name="Message.body-ha_statefile_lost" xml:space="preserve">
<value>The servers in pool '{0}' cannot access the heartbeat SR. HA protection is severely impaired without it.</value>
</data>
<data name="Message.body-ha_xapi_healthcheck_approaching_timeout" xml:space="preserve">
<value>Server '{0}' is taking too long to respond and may fence.</value>
<value>Server '{0}' is taking too long to respond and may become fenced.</value>
</data>
<data name="Message.body-host_clock_skew_detected" xml:space="preserve">
<value>The clock on server '{0}' is not synchronized with the other servers in pool '{1}'. This can lead to errors when migrating virtual machines, and also affect any performance data collected in the future.</value>

52
XenModel/Messages.Designer.cs generated
View File

@ -19,7 +19,7 @@ namespace XenAdmin {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Messages {
@ -8291,15 +8291,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Could not find server running on {0}..
/// </summary>
public static string CONNECT_NO_XAPI_FAILURE {
get {
return ResourceManager.GetString("CONNECT_NO_XAPI_FAILURE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Could not find {0}..
/// </summary>
@ -23900,7 +23891,6 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to You must shut down and then restart the VM to finish the installation of the new DVD drive.
///Once the VM has restarted click the Install [Citrix VM Tools] menu item once again..
/// </summary>
@ -26313,7 +26303,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Server cannot create any more disks for this VM.
/// Looks up a localized string similar to The server cannot create any more disks for this VM.
/// </summary>
public static string NO_MORE_USERDEVICES {
get {
@ -29224,7 +29214,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to The use of StorageLink SRs was removed in server. Remove StorageLink SRs before upgrading..
/// Looks up a localized string similar to The use of StorageLink SRs has been deprecated. Please remove StorageLink SRs before upgrading..
/// </summary>
public static string PROBLEM_UNSUPPORTED_STORAGELINK_SR {
get {
@ -32410,7 +32400,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Check the proxy settings and that server is configured correctly on &apos;{0}&apos; and try again..
/// Looks up a localized string similar to Check the proxy settings and that the server is configured correctly on &apos;{0}&apos; and try again..
/// </summary>
public static string SOLUTION_CHECK_XENSERVER_WITH_PROXY {
get {
@ -35816,7 +35806,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Upgrade your server license to enable Dynamic Memory Control. Dynamic Memory Control allows server to adjust the memory of live virtual machines, and respond dynamically to changing demands on the server..
/// Looks up a localized string similar to Upgrade your server license to enable Dynamic Memory Control. Dynamic Memory Control allows the server to adjust the memory of live virtual machines, and respond dynamically to changing demands on the server..
/// </summary>
public static string UPSELL_BLURB_DMC {
get {
@ -35834,7 +35824,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Upgrade your server license to enable StorageLink™ Technology. StorageLink allows server to leverage all the power of your existing storage hardware and offload storage operations automatically. This allows for high performance and space efficient storage provisioning, cloning, and snapshot capabilities to be handled in hardware using your storage hardware&apos;s native features..
/// Looks up a localized string similar to Upgrade your server license to enable StorageLink™ Technology. StorageLink allows the server to leverage all the power of your existing storage hardware and offload storage operations automatically. This allows for high performance and space efficient storage provisioning, cloning, and snapshot capabilities to be handled in hardware using your storage hardware&apos;s native features..
/// </summary>
public static string UPSELL_BLURB_ENHANCEDSR {
get {
@ -37537,7 +37527,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Server can send you email notifications when alerts associated with snapshot schedule jobs are raised, such as when a VM snapshot is created or when a snapshot operation fails..
/// Looks up a localized string similar to The server can send you email notifications when alerts associated with snapshot schedule jobs are raised, such as when a VM snapshot is created or when a snapshot operation fails..
/// </summary>
public static string VMSS_EMAIL_PAGE_TEXT {
get {
@ -38364,7 +38354,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to An error occurred when WLB tried to establish a session with server..
/// Looks up a localized string similar to An error occurred when WLB tried to establish a session with the server..
/// </summary>
public static string WLB_ERROR_4001 {
get {
@ -38373,7 +38363,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB could not log into server. It could be due to invalid credentials..
/// Looks up a localized string similar to WLB could not log into the server. It could be due to invalid credentials..
/// </summary>
public static string WLB_ERROR_4002 {
get {
@ -38382,7 +38372,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB cannot connect to server. It could be the server being offline or an incorrect TCP/IP address..
/// Looks up a localized string similar to WLB cannot connect to the server. It could be due to the server being offline or an incorrect TCP/IP address..
/// </summary>
public static string WLB_ERROR_4003 {
get {
@ -38391,7 +38381,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB received a null argument from server, which is not allowed..
/// Looks up a localized string similar to WLB received a null argument from the server..
/// </summary>
public static string WLB_ERROR_4004 {
get {
@ -38409,7 +38399,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB received an invalid argument from server..
/// Looks up a localized string similar to WLB received an invalid argument from the server..
/// </summary>
public static string WLB_ERROR_4007 {
get {
@ -38436,7 +38426,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB received an invalid operation from server..
/// Looks up a localized string similar to WLB received an invalid operation from the server..
/// </summary>
public static string WLB_ERROR_4010 {
get {
@ -38445,7 +38435,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB received an out of range argument from server..
/// Looks up a localized string similar to WLB received an out of range argument from the server..
/// </summary>
public static string WLB_ERROR_4011 {
get {
@ -38499,7 +38489,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB cannot find a host that has required storage repositories to place a VM. .
/// Looks up a localized string similar to WLB cannot find a host that has the required storage repositories for placing a VM. .
/// </summary>
public static string WLB_ERROR_4017 {
get {
@ -38508,7 +38498,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB cannot find required free CPUs to place a VM..
/// Looks up a localized string similar to WLB cannot find the required free CPUs for placing a VM..
/// </summary>
public static string WLB_ERROR_4018 {
get {
@ -38517,7 +38507,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB cannot find required free memory to place a VM..
/// Looks up a localized string similar to WLB cannot find the required free memory for placing a VM..
/// </summary>
public static string WLB_ERROR_4019 {
get {
@ -38535,7 +38525,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB could not connect to server because the supplied credentials were invalid..
/// Looks up a localized string similar to WLB could not connect to the server because the supplied credentials were invalid..
/// </summary>
public static string WLB_ERROR_4021 {
get {
@ -38544,7 +38534,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to WLB unable to evacuate an explicitly excluded host..
/// Looks up a localized string similar to WLB is unable to evacuate an explicitly excluded host..
/// </summary>
public static string WLB_ERROR_4022 {
get {
@ -38562,7 +38552,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Server cannot connect to the WLB Server with the supplied WLB Server credentials..
/// Looks up a localized string similar to The server cannot connect to the WLB Server with the supplied WLB Server credentials..
/// </summary>
public static string WLB_ERROR_5 {
get {
@ -38571,7 +38561,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to The user WLB uses to connect to server either doesn&apos;t have sufficient privileges or doesn&apos;t have access to server. Please re-initialize WLB with an valid user..
/// Looks up a localized string similar to The user WLB uses to connect to the server has either insufficient privileges or no access to the server. Please re-initialize WLB with a valid user..
/// </summary>
public static string WLB_ERROR_6 {
get {

43
XenModel/Messages.resx
View File

@ -3108,9 +3108,6 @@ You can only connect to a single [Citrix XenServer] Express Edition server at a
<data name="CONNECTION_WILL_RETRY_SLAVE" xml:space="preserve">
<value>Connection to {0}: will try to connect to another pool member in {1} seconds</value>
</data>
<data name="CONNECT_NO_XAPI_FAILURE" xml:space="preserve">
<value>Could not find server running on {0}.</value>
</data>
<data name="CONNECT_RESOLUTION_FAILURE" xml:space="preserve">
<value>Could not find {0}.</value>
</data>
@ -9305,7 +9302,7 @@ However, there is not enough space to perform the repartitioning, so the current
<value>There are no system alerts available to dismiss.</value>
</data>
<data name="NO_MORE_USERDEVICES" xml:space="preserve">
<value>Server cannot create any more disks for this VM</value>
<value>The server cannot create any more disks for this VM</value>
</data>
<data name="NO_NAME" xml:space="preserve">
<value>(No Name)</value>
@ -10149,7 +10146,7 @@ Please reconnect the host and try again</value>
<value>An error has occurred while attempting to connect to Storage Link Gateway: \n\n{0}\n\nPlease review the settings for this host and reconnect.</value>
</data>
<data name="PROBLEM_UNSUPPORTED_STORAGELINK_SR" xml:space="preserve">
<value>The use of StorageLink SRs was removed in server. Remove StorageLink SRs before upgrading.</value>
<value>The use of StorageLink SRs has been deprecated. Please remove StorageLink SRs before upgrading.</value>
</data>
<data name="PROBLEM_VMAPPLIANCEPROBLEM_TITLE" xml:space="preserve">
<value>vApp {0}</value>
@ -11244,7 +11241,7 @@ Do you want to connect to the pool master '{1}'?</value>
<value>Check that [XenServer] is configured correctly on '{0}' and try again.</value>
</data>
<data name="SOLUTION_CHECK_XENSERVER_WITH_PROXY" xml:space="preserve">
<value>Check the proxy settings and that server is configured correctly on '{0}' and try again.</value>
<value>Check the proxy settings and that the server is configured correctly on '{0}' and try again.</value>
</data>
<data name="SOLUTION_HOST_STILL_BOOTING" xml:space="preserve">
<value>Please wait and then try again.</value>
@ -12394,13 +12391,13 @@ Note that if RBAC is enabled, only updates which you have privileges to dismiss
<value>Upgrade your server license to enable Heterogeneous Pools. Heterogeneous Pools allows hosts with different CPUs to form a resource pool, and allows virtual machines to migrate between them.</value>
</data>
<data name="UPSELL_BLURB_DMC" xml:space="preserve">
<value>Upgrade your server license to enable Dynamic Memory Control. Dynamic Memory Control allows server to adjust the memory of live virtual machines, and respond dynamically to changing demands on the server.</value>
<value>Upgrade your server license to enable Dynamic Memory Control. Dynamic Memory Control allows the server to adjust the memory of live virtual machines, and respond dynamically to changing demands on the server.</value>
</data>
<data name="UPSELL_BLURB_DR" xml:space="preserve">
<value>Upgrade your server license to enable Disaster Recovery. The Disaster Recovery feature allows you to recover your critical VMs and vApps at your DR site in the event of a disaster at your primary production site.</value>
</data>
<data name="UPSELL_BLURB_ENHANCEDSR" xml:space="preserve">
<value>Upgrade your server license to enable StorageLink™ Technology. StorageLink allows server to leverage all the power of your existing storage hardware and offload storage operations automatically. This allows for high performance and space efficient storage provisioning, cloning, and snapshot capabilities to be handled in hardware using your storage hardware's native features.</value>
<value>Upgrade your server license to enable StorageLink™ Technology. StorageLink allows the server to leverage all the power of your existing storage hardware and offload storage operations automatically. This allows for high performance and space efficient storage provisioning, cloning, and snapshot capabilities to be handled in hardware using your storage hardware's native features.</value>
</data>
<data name="UPSELL_BLURB_GPU" xml:space="preserve">
<value>Upgrade your server license to enable GPU pass-through. The GPU pass-through feature allows you to assign a dedicated graphics processing unit to a VM for higher graphics performance.</value>
@ -12750,7 +12747,7 @@ To start a [XenServer] trial, click the button below.</value>
<value>Send &amp;email notifications about snapshot schedule job alerts</value>
</data>
<data name="VMSS_EMAIL_PAGE_TEXT" xml:space="preserve">
<value>Server can send you email notifications when alerts associated with snapshot schedule jobs are raised, such as when a VM snapshot is created or when a snapshot operation fails.</value>
<value>The server can send you email notifications when alerts associated with snapshot schedule jobs are raised, such as when a VM snapshot is created or when a snapshot operation fails.</value>
</data>
<data name="VMSS_FINISH_PAGE_CHECKBOX_TEXT" xml:space="preserve">
<value>&amp;Run the new snapshot schedule job when I click Finish</value>
@ -13286,22 +13283,22 @@ A {1} user cannot alter the Workload Balancing settings.</value>
<value>WLB unknown error.</value>
</data>
<data name="WLB_ERROR_4001" xml:space="preserve">
<value>An error occurred when WLB tried to establish a session with server.</value>
<value>An error occurred when WLB tried to establish a session with the server.</value>
</data>
<data name="WLB_ERROR_4002" xml:space="preserve">
<value>WLB could not log into server. It could be due to invalid credentials.</value>
<value>WLB could not log into the server. It could be due to invalid credentials.</value>
</data>
<data name="WLB_ERROR_4003" xml:space="preserve">
<value>WLB cannot connect to server. It could be the server being offline or an incorrect TCP/IP address.</value>
<value>WLB cannot connect to the server. It could be due to the server being offline or an incorrect TCP/IP address.</value>
</data>
<data name="WLB_ERROR_4004" xml:space="preserve">
<value>WLB received a null argument from server, which is not allowed.</value>
<value>WLB received a null argument from the server.</value>
</data>
<data name="WLB_ERROR_4005" xml:space="preserve">
<value>WLB registry key is missing.</value>
</data>
<data name="WLB_ERROR_4007" xml:space="preserve">
<value>WLB received an invalid argument from server.</value>
<value>WLB received an invalid argument from the server.</value>
</data>
<data name="WLB_ERROR_4008" xml:space="preserve">
<value>WLB data collection service cannot retrieve server data.</value>
@ -13310,10 +13307,10 @@ A {1} user cannot alter the Workload Balancing settings.</value>
<value>WLB configuration data is missing in WLB database.</value>
</data>
<data name="WLB_ERROR_4010" xml:space="preserve">
<value>WLB received an invalid operation from server.</value>
<value>WLB received an invalid operation from the server.</value>
</data>
<data name="WLB_ERROR_4011" xml:space="preserve">
<value>WLB received an out of range argument from server.</value>
<value>WLB received an out of range argument from the server.</value>
</data>
<data name="WLB_ERROR_4012" xml:space="preserve">
<value>WLB data collection service is not properly initialized.</value>
@ -13331,31 +13328,31 @@ A {1} user cannot alter the Workload Balancing settings.</value>
<value>WLB does not have current metrics.</value>
</data>
<data name="WLB_ERROR_4017" xml:space="preserve">
<value>WLB cannot find a host that has required storage repositories to place a VM. </value>
<value>WLB cannot find a host that has the required storage repositories for placing a VM. </value>
</data>
<data name="WLB_ERROR_4018" xml:space="preserve">
<value>WLB cannot find required free CPUs to place a VM.</value>
<value>WLB cannot find the required free CPUs for placing a VM.</value>
</data>
<data name="WLB_ERROR_4019" xml:space="preserve">
<value>WLB cannot find required free memory to place a VM.</value>
<value>WLB cannot find the required free memory for placing a VM.</value>
</data>
<data name="WLB_ERROR_4020" xml:space="preserve">
<value>One or more hosts in the pool do not have an appropriate license.</value>
</data>
<data name="WLB_ERROR_4021" xml:space="preserve">
<value>WLB could not connect to server because the supplied credentials were invalid.</value>
<value>WLB could not connect to the server because the supplied credentials were invalid.</value>
</data>
<data name="WLB_ERROR_4022" xml:space="preserve">
<value>WLB unable to evacuate an explicitly excluded host.</value>
<value>WLB is unable to evacuate an explicitly excluded host.</value>
</data>
<data name="WLB_ERROR_4023" xml:space="preserve">
<value>WLB cannot save your configuration at this time. Verify all Workload Balancing services are running, and try reentering your configuration in a few minutes.</value>
</data>
<data name="WLB_ERROR_5" xml:space="preserve">
<value>Server cannot connect to the WLB Server with the supplied WLB Server credentials.</value>
<value>The server cannot connect to the WLB Server with the supplied WLB Server credentials.</value>
</data>
<data name="WLB_ERROR_6" xml:space="preserve">
<value>The user WLB uses to connect to server either doesn't have sufficient privileges or doesn't have access to server. Please re-initialize WLB with an valid user.</value>
<value>The user WLB uses to connect to the server has either insufficient privileges or no access to the server. Please re-initialize WLB with a valid user.</value>
</data>
<data name="WLB_ERROR_SERVER_NOT_FOUND" xml:space="preserve">
<value>The specified WLB Server could not be found. Please check your settings.</value>

2
XenModel/Network/XenConnection.cs
View File

@ -899,7 +899,7 @@ namespace XenAdmin.Network
}
else if (w.Status == WebExceptionStatus.ReceiveFailure)
{
return string.Format(Messages.CONNECT_NO_XAPI_FAILURE, this.Hostname);
return string.Format(Messages.ERROR_NO_XENSERVER, this.Hostname);
}
else if (w.Status == WebExceptionStatus.SecureChannelFailure)
{