Index: Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj =================================================================== diff -u -r0f77a5dd4b2d08fc2f472799fe8ce05b2e4f65e6 -rb76b51303f577a68b207969d2cebef702bdc1526 --- Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj (.../Application.Riskeer.Setup.wixproj) (revision 0f77a5dd4b2d08fc2f472799fe8ce05b2e4f65e6) +++ Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj (.../Application.Riskeer.Setup.wixproj) (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -186,12 +186,12 @@ - - - - - - + + + + + + @@ -294,7 +294,7 @@ - + Fisheye: Tag b76b51303f577a68b207969d2cebef702bdc1526 refers to a dead (removed) revision in file `Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Dijken en dammen - Stabiliteit steenzetting/vakindeling ZST traject 50-1.cpg'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Dijken en dammen - Stabiliteit steenzetting/vakindeling ZST traject 50-1.dbf =================================================================== diff -u -r9ab427330c78cbb0fac7814b590d350454917d3a -rb76b51303f577a68b207969d2cebef702bdc1526 Binary files differ Fisheye: Tag b76b51303f577a68b207969d2cebef702bdc1526 refers to a dead (removed) revision in file `Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Dijken en dammen - Stabiliteit steenzetting/vakindeling ZST traject 50-1.prj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b76b51303f577a68b207969d2cebef702bdc1526 refers to a dead (removed) revision in file `Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Dijken en dammen - Stabiliteit steenzetting/vakindeling ZST traject 50-1.qpj'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Dijken en dammen - Stabiliteit steenzetting/vakindeling ZST traject 50-1.shp =================================================================== diff -u -r9ab427330c78cbb0fac7814b590d350454917d3a -rb76b51303f577a68b207969d2cebef702bdc1526 Binary files differ Index: Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Dijken en dammen - Stabiliteit steenzetting/vakindeling ZST traject 50-1.shx =================================================================== diff -u -r9ab427330c78cbb0fac7814b590d350454917d3a -rb76b51303f577a68b207969d2cebef702bdc1526 Binary files differ Index: Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.cpg =================================================================== diff -u --- Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.cpg (revision 0) +++ Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.cpg (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -0,0 +1 @@ +System \ No newline at end of file Index: Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.dbf =================================================================== diff -u Binary files differ Index: Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.prj =================================================================== diff -u --- Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.prj (revision 0) +++ Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.prj (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -0,0 +1 @@ +PROJCS["Amersfoort_RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Double_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["Meter",1]] \ No newline at end of file Index: Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.qpj =================================================================== diff -u --- Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.qpj (revision 0) +++ Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.qpj (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -0,0 +1 @@ +PROJCS["Amersfoort / RD New",GEOGCS["Amersfoort",DATUM["Amersfoort",SPHEROID["Bessel 1841",6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],TOWGS84[565.2369,50.0087,465.658,-0.406857,0.350733,-1.87035,4.0812],AUTHORITY["EPSG","6289"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4289"]],PROJECTION["Oblique_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],AUTHORITY["EPSG","28992"]] Index: Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.shp =================================================================== diff -u Binary files differ Index: Application/Riskeer/src/Application.Riskeer.Setup/Examples/Voorbeeld Traject 50-1 - Assembleren/04. Gegevens - Stabiliteit steenzetting/vakindeling ZST traject 50-1.shx =================================================================== diff -u Binary files differ Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs =================================================================== diff -u -r354e43927c20c4e341db023e0d5fefe3aa6026c4 -rb76b51303f577a68b207969d2cebef702bdc1526 --- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 354e43927c20c4e341db023e0d5fefe3aa6026c4) +++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -230,7 +230,7 @@ } /// - /// Gets or sets the "Dijken en dammen - Stabiliteit steenzetting" failure mechanism. + /// Gets or sets the "Stabiliteit steenzetting" failure mechanism. /// /// Thrown when the contribution of /// is not equal to the contribution of the current failure mechanism. Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -r97ebacf8fe8568ca69c3e45a2973e14c7554bac5 -rb76b51303f577a68b207969d2cebef702bdc1526 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 97ebacf8fe8568ca69c3e45a2973e14c7554bac5) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -220,7 +220,7 @@ Assert.AreEqual("Gegevens van het generieke faalpad 'Dijken en dammen - Macrostabiliteit binnenwaarts' zijn vervangen.", msgs[3]); Assert.AreEqual("Gegevens van het generieke faalpad 'Dijken en dammen - Macrostabiliteit buitenwaarts' zijn vervangen.", msgs[4]); Assert.AreEqual("Gegevens van het generieke faalpad 'Dijken en dammen - Microstabiliteit' zijn vervangen.", msgs[5]); - Assert.AreEqual("Gegevens van het generieke faalpad 'Dijken en dammen - Stabiliteit steenzetting' zijn vervangen.", msgs[6]); + Assert.AreEqual("Gegevens van het generieke faalpad 'Stabiliteit steenzetting' zijn vervangen.", msgs[6]); Assert.AreEqual("Gegevens van het generieke faalpad 'Dijken en dammen - Golfklappen op asfaltbekleding' zijn vervangen.", msgs[7]); Assert.AreEqual("Gegevens van het generieke faalpad 'Dijken en dammen - Wateroverdruk bij asfaltbekleding' zijn vervangen.", msgs[8]); Assert.AreEqual("Gegevens van het generieke faalpad 'Dijken en dammen - Grasbekleding erosie buitentalud' zijn vervangen.", msgs[9]); Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r2ef21b0f4d85a5c9689720d539254a1d5c907be7 -rb76b51303f577a68b207969d2cebef702bdc1526 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2ef21b0f4d85a5c9689720d539254a1d5c907be7) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -91,7 +91,7 @@ } /// - /// Looks up a localized string similar to Dijken en dammen - Stabiliteit steenzetting. + /// Looks up a localized string similar to Stabiliteit steenzetting. /// public static string StabilityStoneCoverFailureMechanism_DisplayName { get { Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/Properties/Resources.resx =================================================================== diff -u -r0fcb2757dba40aee48c8f924908c0bf2a522a672 -rb76b51303f577a68b207969d2cebef702bdc1526 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/Properties/Resources.resx (.../Resources.resx) (revision 0fcb2757dba40aee48c8f924908c0bf2a522a672) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/Properties/Resources.resx (.../Resources.resx) (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -121,7 +121,7 @@ ZST - Dijken en dammen - Stabiliteit steenzetting + Stabiliteit steenzetting Steen (blokken) Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs =================================================================== diff -u -r2ef21b0f4d85a5c9689720d539254a1d5c907be7 -rb76b51303f577a68b207969d2cebef702bdc1526 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision 2ef21b0f4d85a5c9689720d539254a1d5c907be7) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -42,7 +42,7 @@ // Assert Assert.IsInstanceOf(failureMechanism); Assert.IsInstanceOf>(failureMechanism); - Assert.AreEqual("Dijken en dammen - Stabiliteit steenzetting", failureMechanism.Name); + Assert.AreEqual("Stabiliteit steenzetting", failureMechanism.Name); Assert.AreEqual("ZST", failureMechanism.Code); Assert.AreEqual(3, failureMechanism.Group); Assert.IsInstanceOf(failureMechanism.GeneralInput); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs =================================================================== diff -u -r20ea79f3c64fb650fe8335d4cec53273c60a6457 -rb76b51303f577a68b207969d2cebef702bdc1526 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs (.../StabilityStoneCoverFailureMechanismViewTest.cs) (revision 20ea79f3c64fb650fe8335d4cec53273c60a6457) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs (.../StabilityStoneCoverFailureMechanismViewTest.cs) (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -628,7 +628,7 @@ private static void AssertEmptyMapData(MapDataCollection mapDataCollection) { - Assert.AreEqual("Dijken en dammen - Stabiliteit steenzetting", mapDataCollection.Name); + Assert.AreEqual("Stabiliteit steenzetting", mapDataCollection.Name); List mapDataList = mapDataCollection.Collection.ToList(); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailurePathViewTest.cs =================================================================== diff -u -r20ea79f3c64fb650fe8335d4cec53273c60a6457 -rb76b51303f577a68b207969d2cebef702bdc1526 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailurePathViewTest.cs (.../StabilityStoneCoverFailurePathViewTest.cs) (revision 20ea79f3c64fb650fe8335d4cec53273c60a6457) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailurePathViewTest.cs (.../StabilityStoneCoverFailurePathViewTest.cs) (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -732,7 +732,7 @@ private static void AssertEmptyMapData(MapDataCollection mapDataCollection) { - Assert.AreEqual("Dijken en dammen - Stabiliteit steenzetting", mapDataCollection.Name); + Assert.AreEqual("Stabiliteit steenzetting", mapDataCollection.Name); List mapDataList = mapDataCollection.Collection.ToList(); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs =================================================================== diff -u -r908128c12181e0cdbde997a6b53eff17bb80e4ac -rb76b51303f577a68b207969d2cebef702bdc1526 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs) (revision 908128c12181e0cdbde997a6b53eff17bb80e4ac) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailurePathContextTreeNodeInfoTest.cs) (revision b76b51303f577a68b207969d2cebef702bdc1526) @@ -98,7 +98,7 @@ string text = info.Text(context); // Assert - Assert.AreEqual("Dijken en dammen - Stabiliteit steenzetting", text); + Assert.AreEqual("Stabiliteit steenzetting", text); mocks.VerifyAll(); }