Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs =================================================================== diff -u -rc5c91f8ca724aef52a6cd9055a2a32bcd6bc0c03 -ra18e01acd69d8d0500f7cdc0420a8543786fcda1 --- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c5c91f8ca724aef52a6cd9055a2a32bcd6bc0c03) +++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a18e01acd69d8d0500f7cdc0420a8543786fcda1) @@ -127,6 +127,16 @@ } /// + /// Looks up a localized string similar to Stap {0} van {1} | {2}. + /// + public static string Activity_UpdateProgressText_CurrentStepNumber_0_of_TotalStepsNumber_1_StepDescription_2_ { + get { + return ResourceManager.GetString("Activity_UpdateProgressText_CurrentStepNumber_0_of_TotalStepsNumber_1_StepDescrip" + + "tion_2_", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Bevestigen. /// public static string Confirm { Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx =================================================================== diff -u -rc5c91f8ca724aef52a6cd9055a2a32bcd6bc0c03 -ra18e01acd69d8d0500f7cdc0420a8543786fcda1 --- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision c5c91f8ca724aef52a6cd9055a2a32bcd6bc0c03) +++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision a18e01acd69d8d0500f7cdc0420a8543786fcda1) @@ -183,4 +183,7 @@ {0} moeten een unieke {1} hebben. Gevonden dubbele elementen: {2}. + + Stap {0} van {1} | {2} + \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/OpenProjectActivity.cs =================================================================== diff -u -r569a286badd9b3494f5465cc2767a8cf6a77f618 -ra18e01acd69d8d0500f7cdc0420a8543786fcda1 --- Core/Common/src/Core.Common.Gui/OpenProjectActivity.cs (.../OpenProjectActivity.cs) (revision 569a286badd9b3494f5465cc2767a8cf6a77f618) +++ Core/Common/src/Core.Common.Gui/OpenProjectActivity.cs (.../OpenProjectActivity.cs) (revision a18e01acd69d8d0500f7cdc0420a8543786fcda1) @@ -27,6 +27,7 @@ using Core.Common.Base.Storage; using Core.Common.Gui.Properties; using log4net; +using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Core.Common.Gui { @@ -229,7 +230,7 @@ private void UpdateProgressText(string currentStepName, int currentStep, int totalSteps) { ProgressText = string.Format(CultureInfo.CurrentCulture, - Resources.Activity_UpdateProgressText_CurrentStepNumber_0_of_TotalStepsNumber_1_StepDescriptionName_2_, + CoreCommonBaseResources.Activity_UpdateProgressText_CurrentStepNumber_0_of_TotalStepsNumber_1_StepDescription_2_, currentStep, totalSteps, currentStepName); } Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -ra083279a13d4efdd702c50f37a5a8ae059e5d0ef -ra18e01acd69d8d0500f7cdc0420a8543786fcda1 --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a083279a13d4efdd702c50f37a5a8ae059e5d0ef) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a18e01acd69d8d0500f7cdc0420a8543786fcda1) @@ -40,7 +40,7 @@ // 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 Resources { @@ -82,16 +82,6 @@ } /// - /// Looks up a localized string similar to Stap {0} van {1} | {2}. - /// - public static string Activity_UpdateProgressText_CurrentStepNumber_0_of_TotalStepsNumber_1_StepDescriptionName_2_ { - get { - return ResourceManager.GetString("Activity_UpdateProgressText_CurrentStepNumber_0_of_TotalStepsNumber_1_StepDescrip" + - "tionName_2_", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Bezig met het afronden van huidige taak, daarna annuleren.... /// public static string ActivityProgressDialog_CancelActivities_Quit_after_finishing_current_activity { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -ra083279a13d4efdd702c50f37a5a8ae059e5d0ef -ra18e01acd69d8d0500f7cdc0420a8543786fcda1 --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision a083279a13d4efdd702c50f37a5a8ae059e5d0ef) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision a18e01acd69d8d0500f7cdc0420a8543786fcda1) @@ -565,9 +565,6 @@ Initialiseren van leeg project - - Stap {0} van {1} | {2} - Opslaan van bestaand project Index: Core/Common/src/Core.Common.Gui/SaveProjectActivity.cs =================================================================== diff -u -r76948e8765899b35776102ecd211d3d7575a9e4d -ra18e01acd69d8d0500f7cdc0420a8543786fcda1 --- Core/Common/src/Core.Common.Gui/SaveProjectActivity.cs (.../SaveProjectActivity.cs) (revision 76948e8765899b35776102ecd211d3d7575a9e4d) +++ Core/Common/src/Core.Common.Gui/SaveProjectActivity.cs (.../SaveProjectActivity.cs) (revision a18e01acd69d8d0500f7cdc0420a8543786fcda1) @@ -27,6 +27,7 @@ using Core.Common.Base.Storage; using Core.Common.Gui.Properties; using log4net; +using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Core.Common.Gui { @@ -170,7 +171,7 @@ private void UpdateProgressText(string currentStepName, int currentStep, int totalSteps) { ProgressText = string.Format(CultureInfo.CurrentCulture, - Resources.Activity_UpdateProgressText_CurrentStepNumber_0_of_TotalStepsNumber_1_StepDescriptionName_2_, + CoreCommonBaseResources.Activity_UpdateProgressText_CurrentStepNumber_0_of_TotalStepsNumber_1_StepDescription_2_, currentStep, totalSteps, currentStepName); } } Index: Ringtoets/Common/src/Ringtoets.Common.Service/CalculatableActivity.cs =================================================================== diff -u -r4aca01a706f23d3ba928d2c5fd405681bc3ba55d -ra18e01acd69d8d0500f7cdc0420a8543786fcda1 --- Ringtoets/Common/src/Ringtoets.Common.Service/CalculatableActivity.cs (.../CalculatableActivity.cs) (revision 4aca01a706f23d3ba928d2c5fd405681bc3ba55d) +++ Ringtoets/Common/src/Ringtoets.Common.Service/CalculatableActivity.cs (.../CalculatableActivity.cs) (revision a18e01acd69d8d0500f7cdc0420a8543786fcda1) @@ -21,6 +21,7 @@ using Core.Common.Base.Service; using Ringtoets.Common.Data.Calculation; +using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Ringtoets.Common.Service { @@ -50,7 +51,7 @@ /// The total numbers of steps. protected void UpdateProgressText(string currentStepName, int currentStep, int totalSteps) { - ProgressText = string.Format(Resources.HydraRingActivityBase_UpdateProgressText_Step_0_of_TotalSteps_1_CurrentStepName_2, + ProgressText = string.Format(CoreCommonBaseResources.Activity_UpdateProgressText_CurrentStepNumber_0_of_TotalStepsNumber_1_StepDescription_2_, currentStep, totalSteps, currentStepName); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs =================================================================== diff -u -rd16d146d545cf86ad58c5e2c73cb5bc1b784ce67 -ra18e01acd69d8d0500f7cdc0420a8543786fcda1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d16d146d545cf86ad58c5e2c73cb5bc1b784ce67) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a18e01acd69d8d0500f7cdc0420a8543786fcda1) @@ -110,16 +110,6 @@ } /// - /// Looks up a localized string similar to Stap {0} van {1} | {2}. - /// - internal static string HydraRingActivityBase_UpdateProgressText_Step_0_of_TotalSteps_1_CurrentStepName_2 { - get { - return ResourceManager.GetString("HydraRingActivityBase_UpdateProgressText_Step_0_of_TotalSteps_1_CurrentStepName_2" + - "", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Het besturingssysteem geeft de volgende melding: ///{0}. /// Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx =================================================================== diff -u -rd16d146d545cf86ad58c5e2c73cb5bc1b784ce67 -ra18e01acd69d8d0500f7cdc0420a8543786fcda1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx (.../Resources.resx) (revision d16d146d545cf86ad58c5e2c73cb5bc1b784ce67) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx (.../Resources.resx) (revision a18e01acd69d8d0500f7cdc0420a8543786fcda1) @@ -120,9 +120,6 @@ Kan het Hydra-Ring last_error bestand {0} niet lezen uit de map {1}. - - Stap {0} van {1} | {2} - Er kon geen resultaat gelezen worden uit de Hydra-Ring uitvoerdatabase.