Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r85b624333ba752fe65f0ea5af5bf5305d974037c -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 85b624333ba752fe65f0ea5af5bf5305d974037c) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -2141,7 +2141,7 @@ } /// - /// Looks up a localized string similar to Coördinaten van de hydraulische randvoorwaardenlocatie.. + /// Looks up a localized string similar to Coördinaten van de hydraulische belastingenlocatie.. /// public static string HydraulicBoundaryDatabase_Location_Coordinates_Description { get { @@ -2159,7 +2159,7 @@ } /// - /// Looks up a localized string similar to ID van de hydraulische randvoorwaardenlocatie in de database.. + /// Looks up a localized string similar to ID van de hydraulische belastingenlocatie in de database.. /// public static string HydraulicBoundaryDatabase_Location_Id_Description { get { @@ -2177,7 +2177,7 @@ } /// - /// Looks up a localized string similar to Naam van de hydraulische randvoorwaardenlocatie.. + /// Looks up a localized string similar to Naam van de hydraulische belastingenlocatie.. /// public static string HydraulicBoundaryDatabase_Location_Name_Description { get { @@ -2278,7 +2278,7 @@ } /// - /// Looks up a localized string similar to Hydraulische randvoorwaardenlocatie. + /// Looks up a localized string similar to Hydraulische belastingenlocatie. /// public static string HydraulicBoundaryLocationSelectionDialog_Location_Name { get { @@ -2287,7 +2287,7 @@ } /// - /// Looks up a localized string similar to Selecteer hydraulische randvoorwaardenlocaties. + /// Looks up a localized string similar to Selecteer hydraulische belastingenlocaties. /// public static string HydraulicBoundaryLocationSelectionDialog_Select_HydraulicBoundaryLocations { get { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r85b624333ba752fe65f0ea5af5bf5305d974037c -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 85b624333ba752fe65f0ea5af5bf5305d974037c) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -501,7 +501,7 @@ N [-] - Coördinaten van de hydraulische randvoorwaardenlocatie. + Coördinaten van de hydraulische belastingenlocatie. Coördinaten [m] @@ -513,13 +513,13 @@ Locaties - ID van de hydraulische randvoorwaardenlocatie in de database. + ID van de hydraulische belastingenlocatie in de database. ID - Naam van de hydraulische randvoorwaardenlocatie. + Naam van de hydraulische belastingenlocatie. Naam @@ -654,7 +654,7 @@ Annuleren - Hydraulische randvoorwaardenlocatie + Hydraulische belastingenlocatie Genereer belastingenberekeningen. @@ -702,7 +702,7 @@ ..\Resources\Structures.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Selecteer hydraulische randvoorwaardenlocaties + Selecteer hydraulische belastingenlocaties De coördinaten van de locatie van het kunstwerk in het Rijksdriehoeksstelsel. Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/HydraulicBoundaryLocationSelectionDialogTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/HydraulicBoundaryLocationSelectionDialogTest.cs (.../HydraulicBoundaryLocationSelectionDialogTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/HydraulicBoundaryLocationSelectionDialogTest.cs (.../HydraulicBoundaryLocationSelectionDialogTest.cs) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -73,7 +73,7 @@ // Assert Assert.IsInstanceOf>(dialog); CollectionAssert.IsEmpty(dialog.SelectedItems); - Assert.AreEqual("Selecteer hydraulische randvoorwaardenlocaties", dialog.Text); + Assert.AreEqual("Selecteer hydraulische belastingenlocaties", dialog.Text); } } } @@ -100,7 +100,7 @@ Assert.IsFalse(locationCalculateColumn.ReadOnly); var nameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex]; - Assert.AreEqual("Hydraulische randvoorwaardenlocatie", nameColumn.HeaderText); + Assert.AreEqual("Hydraulische belastingenlocatie", nameColumn.HeaderText); Assert.AreEqual("Name", nameColumn.DataPropertyName); Assert.AreEqual(DataGridViewAutoSizeColumnMode.Fill, nameColumn.AutoSizeMode); Assert.IsTrue(nameColumn.ReadOnly); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationBasePropertiesTest.cs =================================================================== diff -u -r07ee3d6f4986ef01277906824f02ef1fe7406221 -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationBasePropertiesTest.cs (.../HydraulicBoundaryLocationBasePropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationBasePropertiesTest.cs (.../HydraulicBoundaryLocationBasePropertiesTest.cs) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -100,21 +100,21 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(idProperty, generalCategory, "ID", - "ID van de hydraulische randvoorwaardenlocatie in de database.", + "ID van de hydraulische belastingenlocatie in de database.", true); PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty, generalCategory, "Naam", - "Naam van de hydraulische randvoorwaardenlocatie.", + "Naam van de hydraulische belastingenlocatie.", true); PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(coordinatesProperty, generalCategory, "Coördinaten [m]", - "Coördinaten van de hydraulische randvoorwaardenlocatie.", + "Coördinaten van de hydraulische belastingenlocatie.", true); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs =================================================================== diff -u -r455f0b475090de0095a1f221858d96c3bf84177a -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs (.../HydraulicBoundaryLocationCalculationPropertiesTest.cs) (revision 455f0b475090de0095a1f221858d96c3bf84177a) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs (.../HydraulicBoundaryLocationCalculationPropertiesTest.cs) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -85,21 +85,21 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(idProperty, generalCategory, "ID", - "ID van de hydraulische randvoorwaardenlocatie in de database.", + "ID van de hydraulische belastingenlocatie in de database.", true); PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty, generalCategory, "Naam", - "Naam van de hydraulische randvoorwaardenlocatie.", + "Naam van de hydraulische belastingenlocatie.", true); PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(coordinatesProperty, generalCategory, "Coördinaten [m]", - "Coördinaten van de hydraulische randvoorwaardenlocatie.", + "Coördinaten van de hydraulische belastingenlocatie.", true); PropertyDescriptor resultProperty = dynamicProperties[resultPropertyIndex]; @@ -175,21 +175,21 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(idProperty, generalCategory, "ID", - "ID van de hydraulische randvoorwaardenlocatie in de database.", + "ID van de hydraulische belastingenlocatie in de database.", true); PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty, generalCategory, "Naam", - "Naam van de hydraulische randvoorwaardenlocatie.", + "Naam van de hydraulische belastingenlocatie.", true); PropertyDescriptor coordinatesProperty = dynamicProperties[coordinatesPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(coordinatesProperty, generalCategory, "Coördinaten [m]", - "Coördinaten van de hydraulische randvoorwaardenlocatie.", + "Coördinaten van de hydraulische belastingenlocatie.", true); PropertyDescriptor resultProperty = dynamicProperties[resultPropertyIndex]; Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs =================================================================== diff -u -r649b0974fb71df7368d19682bc255618f44d49c1 -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs (.../DuneLocationCalculationPropertiesTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs (.../DuneLocationCalculationPropertiesTest.cs) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -197,14 +197,14 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(idProperty, "Algemeen", "ID", - "ID van de hydraulische randvoorwaardenlocatie in de database.", + "ID van de hydraulische belastingenlocatie in de database.", true); PropertyDescriptor nameProperty = dynamicProperties[requiredNamePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty, "Algemeen", "Naam", - "Naam van de hydraulische randvoorwaardenlocatie.", + "Naam van de hydraulische belastingenlocatie.", true); PropertyDescriptor coastalAreaIdProperty = dynamicProperties[requiredCoastalAreaIdPropertyIndex]; @@ -225,7 +225,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(locationProperty, "Algemeen", "Coördinaten [m]", - "Coördinaten van de hydraulische randvoorwaardenlocatie.", + "Coördinaten van de hydraulische belastingenlocatie.", true); PropertyDescriptor waterLevelProperty = dynamicProperties[requiredWaterLevelPropertyIndex]; Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -ree730cee74df3aa7ed3488aff60db34ed755b0af -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ee730cee74df3aa7ed3488aff60db34ed755b0af) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -274,7 +274,7 @@ } /// - /// Looks up a localized string similar to Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties zijn verwijderd.. + /// Looks up a localized string similar to Alle berekende hydraulische belastingen zijn verwijderd.. /// public static string FailureMechanismContributionNormChangeHandler_Waveheight_and_design_water_level_results_cleared { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -ree730cee74df3aa7ed3488aff60db34ed755b0af -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision ee730cee74df3aa7ed3488aff60db34ed755b0af) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -139,7 +139,7 @@ De resultaten van {0} berekeningen zijn verwijderd. - Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties zijn verwijderd. + Alle berekende hydraulische belastingen zijn verwijderd. Als u de norm aanpast, dan worden alle rekenresultaten van alle hydraulische randvoorwaarden en toetssporen verwijderd. Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs (.../NormPropertiesIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs (.../NormPropertiesIntegrationTest.cs) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -46,7 +46,7 @@ [TestFixture] public class NormPropertiesIntegrationTest : NUnitFormTest { - private const string messageAllHydraulicBoundaryOutputCleared = "Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties zijn verwijderd."; + private const string messageAllHydraulicBoundaryOutputCleared = "Alle berekende hydraulische belastingen zijn verwijderd."; private const string messageCalculationsRemoved = "De resultaten van {0} berekeningen zijn verwijderd."; private const NormType newNormativeNorm = NormType.Signaling; private const double newLowerLimitNorm = 0.01; Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs =================================================================== diff -u -r13324d5ed933135fbcaa668298069a9f68baf63b -rb2658b8630cc0658edfa5c778678ac6b1dd1b9e9 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 13324d5ed933135fbcaa668298069a9f68baf63b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision b2658b8630cc0658edfa5c778678ac6b1dd1b9e9) @@ -160,7 +160,7 @@ var expectedMessages = new[] { "De resultaten van 36 berekeningen zijn verwijderd.", - "Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties zijn verwijderd." + "Alle berekende hydraulische belastingen zijn verwijderd." }; TestHelper.AssertLogMessagesAreGenerated(call, expectedMessages, 2); @@ -210,7 +210,7 @@ Action call = () => affectedObjects = handler.SetPropertyValueAfterConfirmation(() => {}); // Assert - TestHelper.AssertLogMessageIsGenerated(call, "Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties zijn verwijderd.", 1); + TestHelper.AssertLogMessageIsGenerated(call, "Alle berekende hydraulische belastingenlocaties zijn verwijderd.", 1); AssertHydraulicBoundaryLocationCalculationOutput(assessmentSection, false); DuneLocationsTestHelper.AssertDuneLocationCalculationsHaveNoOutputs(assessmentSection.DuneErosion);