Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -ree2ed070a1327bf82c07adb56df4f58185b9ce98 -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ee2ed070a1327bf82c07adb56df4f58185b9ce98)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -555,7 +555,7 @@
}
///
- /// Looks up a localized string similar to Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting..
+ /// Looks up a localized string similar to Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting..
///
public static string GeneralResult_ValidateTopLevelIllustrationPoints_ClosingSituation_or_windDirection_not_unique {
get {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -ree2ed070a1327bf82c07adb56df4f58185b9ce98 -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision ee2ed070a1327bf82c07adb56df4f58185b9ce98)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -385,7 +385,7 @@
Een of meerdere stochasten hebben dezelfde naam.
- Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting.
+ Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting.
Een of meerdere uitvoer variabelen hebben dezelfde naam.
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r36b0ec22415b2b46be9fa3c733933f899f397367 -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 36b0ec22415b2b46be9fa3c733933f899f397367)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -1821,7 +1821,7 @@
}
///
- /// Looks up a localized string similar to Het sluitscenario waarvoor dit illustratiepunt is berekend..
+ /// Looks up a localized string similar to De keringsituatie waarvoor dit illustratiepunt is berekend..
///
public static string IllustrationPoint_ClosingSituation_Description {
get {
@@ -1830,7 +1830,7 @@
}
///
- /// Looks up a localized string similar to Sluitscenario.
+ /// Looks up a localized string similar to Keringsituatie.
///
public static string IllustrationPoint_ClosingSituation_DisplayName {
get {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r36b0ec22415b2b46be9fa3c733933f899f397367 -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 36b0ec22415b2b46be9fa3c733933f899f397367)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -1015,10 +1015,10 @@
Invloedscoƫfficienten [-]
- Het sluitscenario waarvoor dit illustratiepunt is berekend.
+ De keringsituatie waarvoor dit illustratiepunt is berekend.
- Sluitscenario
+ Keringsituatie
De windrichting waarvoor dit illlustratiepunt is berekend.
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/GeneralResultTest.cs
===================================================================
diff -u -r831379390ac72116a2f1c3a014063bbd60ab928d -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/GeneralResultTest.cs (.../GeneralResultTest.cs) (revision 831379390ac72116a2f1c3a014063bbd60ab928d)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/GeneralResultTest.cs (.../GeneralResultTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -149,7 +149,7 @@
topLevelIllustrationPoints);
// Assert
- const string expectedMessage = "Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting.";
+ const string expectedMessage = "Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting.";
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage);
}
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointPropertiesTest.cs
===================================================================
diff -u -rfd69c584e0201271b6994b2b0d7d5ce07be23ad4 -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointPropertiesTest.cs (.../FaultTreeIllustrationPointPropertiesTest.cs) (revision fd69c584e0201271b6994b2b0d7d5ce07be23ad4)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointPropertiesTest.cs (.../FaultTreeIllustrationPointPropertiesTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -171,8 +171,8 @@
PropertyDescriptor closingScenarioProperty = dynamicProperties[closingScenarioPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(closingScenarioProperty,
illustrationPointsCategoryName,
- "Sluitscenario",
- "Het sluitscenario waarvoor dit illustratiepunt is berekend.",
+ "Keringsituatie",
+ "De keringsituatie waarvoor dit illustratiepunt is berekend.",
true);
PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex];
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/IllustrationPointPropertiesTest.cs
===================================================================
diff -u -r6fbc05ec2d0ab27a8eee7d61fc939f1798abd6ae -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/IllustrationPointPropertiesTest.cs (.../IllustrationPointPropertiesTest.cs) (revision 6fbc05ec2d0ab27a8eee7d61fc939f1798abd6ae)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/IllustrationPointPropertiesTest.cs (.../IllustrationPointPropertiesTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -148,8 +148,8 @@
PropertyDescriptor closingScenarioProperty = dynamicProperties[closingScenarioPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(closingScenarioProperty,
illustrationPointCategoryName,
- "Sluitscenario",
- "Het sluitscenario waarvoor dit illustratiepunt is berekend.",
+ "Keringsituatie",
+ "De keringsituatie waarvoor dit illustratiepunt is berekend.",
true);
}
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs
===================================================================
diff -u -r36b0ec22415b2b46be9fa3c733933f899f397367 -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs (.../SubMechanismIllustrationPointPropertiesTest.cs) (revision 36b0ec22415b2b46be9fa3c733933f899f397367)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs (.../SubMechanismIllustrationPointPropertiesTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -140,8 +140,8 @@
PropertyDescriptor closingScenarioProperty = dynamicProperties[closingScenarioPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(closingScenarioProperty,
illustrationPointsCategoryName,
- "Sluitscenario",
- "Het sluitscenario waarvoor dit illustratiepunt is berekend.",
+ "Keringsituatie",
+ "De keringsituatie waarvoor dit illustratiepunt is berekend.",
true);
PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex];
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelFaultTreeIllustrationPointPropertiesTest.cs
===================================================================
diff -u -r98337ba56cc4d4b2217c26812e96e9401a263d56 -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelFaultTreeIllustrationPointPropertiesTest.cs (.../TopLevelFaultTreeIllustrationPointPropertiesTest.cs) (revision 98337ba56cc4d4b2217c26812e96e9401a263d56)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelFaultTreeIllustrationPointPropertiesTest.cs (.../TopLevelFaultTreeIllustrationPointPropertiesTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -217,8 +217,8 @@
PropertyDescriptor closingSituationProperty = dynamicProperties[closingSituationPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(closingSituationProperty,
illustrationPointsCategoryName,
- "Sluitscenario",
- "Het sluitscenario waarvoor dit illustratiepunt is berekend.",
+ "Keringsituatie",
+ "De keringsituatie waarvoor dit illustratiepunt is berekend.",
true);
PropertyDescriptor alphasProperty = dynamicProperties[alphasPropertyIndex];
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs
===================================================================
diff -u -r36b0ec22415b2b46be9fa3c733933f899f397367 -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs (.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs) (revision 36b0ec22415b2b46be9fa3c733933f899f397367)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs (.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -244,8 +244,8 @@
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(dynamicProperties[4],
generalCategory,
- "Sluitscenario",
- "Het sluitscenario waarvoor dit illustratiepunt is berekend.",
+ "Keringsituatie",
+ "De keringsituatie waarvoor dit illustratiepunt is berekend.",
true);
TestHelper.AssertTypeConverter(nameof(TopLevelSubMechanismIllustrationPointProperties.AlphaValues));
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs
===================================================================
diff -u -r6fbc05ec2d0ab27a8eee7d61fc939f1798abd6ae -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs (.../IllustrationPointsTableControlTest.cs) (revision 6fbc05ec2d0ab27a8eee7d61fc939f1798abd6ae)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsTableControlTest.cs (.../IllustrationPointsTableControlTest.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -84,7 +84,7 @@
Assert.IsTrue(windDirectionColumn.ReadOnly);
DataGridViewColumn closingSituationColumn = dataGridView.Columns[closingScenarioColumnIndex];
- Assert.AreEqual("Sluitscenario", closingSituationColumn.HeaderText);
+ Assert.AreEqual("Keringsituatie", closingSituationColumn.HeaderText);
Assert.IsTrue(closingSituationColumn.ReadOnly);
Assert.IsFalse(closingSituationColumn.Visible);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil/GrassCoverErosionInwardsCalculationServiceTestHelper.cs
===================================================================
diff -u -r2e944cbf52d124fd501ed4ed8e991aa50299cc69 -re7cb11ec540f2b66ee32df78c5aa745252a075c5
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil/GrassCoverErosionInwardsCalculationServiceTestHelper.cs (.../GrassCoverErosionInwardsCalculationServiceTestHelper.cs) (revision 2e944cbf52d124fd501ed4ed8e991aa50299cc69)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil/GrassCoverErosionInwardsCalculationServiceTestHelper.cs (.../GrassCoverErosionInwardsCalculationServiceTestHelper.cs) (revision e7cb11ec540f2b66ee32df78c5aa745252a075c5)
@@ -64,7 +64,7 @@
public static void AssertGeneralResultWithDuplicateIllustrationPoints(string calculationDescription, string calculationName, string actual)
{
Assert.AreEqual($"Fout bij het uitlezen van de illustratiepunten voor berekening {calculationName} ({calculationDescription}): " +
- "Een of meerdere illustratiepunten hebben dezelfde combinatie van sluitscenario en windrichting. Het uitlezen van illustratiepunten wordt overgeslagen.", actual);
+ "Een of meerdere illustratiepunten hebben dezelfde combinatie van keringsituatie en windrichting. Het uitlezen van illustratiepunten wordt overgeslagen.", actual);
}
public static void AssertGeneralResultWithDuplicateIllustrationPointResults(string calculationDescription, string calculationName, string actual)