Merge pull request #1034 from GaborApatiNagy/master_batch_new2

CA-214077: Typo in Messages.resx
This commit is contained in:
Mihaela Stoica 2016-06-22 16:24:16 +01:00 committed by GitHub
commit 476f145bc7
3 changed files with 11 additions and 11 deletions

View File

@ -499,7 +499,7 @@ namespace XenAdmin.Wizards.PatchingWizard
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine(); sb.AppendLine();
sb.AppendLine(errorActions.Count > 1 ? Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURED : Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURED); sb.AppendLine(errorActions.Count > 1 ? Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURRED : Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURRED);
foreach (var action in errorActions) foreach (var action in errorActions)
{ {

View File

@ -25613,20 +25613,20 @@ namespace XenAdmin {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Following error occured while automatic upgrade was in progress: . /// Looks up a localized string similar to Following error occurred while automatic upgrade was in progress: .
/// </summary> /// </summary>
public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURED { public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURRED {
get { get {
return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURED", resourceCulture); return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURRED", resourceCulture);
} }
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Following errors occured while automatic upgrade was in progress:. /// Looks up a localized string similar to Following errors occurred while automatic upgrade was in progress:.
/// </summary> /// </summary>
public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURED { public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURRED {
get { get {
return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURED", resourceCulture); return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURRED", resourceCulture);
} }
} }

View File

@ -8859,11 +8859,11 @@ However, there is not enough space to perform the repartitioning, so the current
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR" xml:space="preserve"> <data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR" xml:space="preserve">
<value>Update process was not completed successfully.</value> <value>Update process was not completed successfully.</value>
</data> </data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURED" xml:space="preserve"> <data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURRED" xml:space="preserve">
<value>Following errors occured while automatic upgrade was in progress:</value> <value>Following errors occurred while automatic upgrade was in progress:</value>
</data> </data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURED" xml:space="preserve"> <data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURRED" xml:space="preserve">
<value>Following error occured while automatic upgrade was in progress: </value> <value>Following error occurred while automatic upgrade was in progress: </value>
</data> </data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_FAILED" xml:space="preserve"> <data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_FAILED" xml:space="preserve">
<value>Update was not completed successfully</value> <value>Update was not completed successfully</value>