Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterCharacteristicPoints.cs =================================================================== diff -u -r3110 -r3119 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterCharacteristicPoints.cs (.../CsvImporterCharacteristicPoints.cs) (revision 3110) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterCharacteristicPoints.cs (.../CsvImporterCharacteristicPoints.cs) (revision 3119) @@ -62,7 +62,7 @@ { if (index < 0) { - var csvHeaderFieldError = "In de header ontbreekt veld:"; + var csvHeaderFieldError = "The header misses the field: "; throw new ArgumentException(string.Format("{0} : {1} {2}", fileName, csvHeaderFieldError, fieldName)); } } @@ -73,12 +73,12 @@ errorMessages.Clear(); if (fileName == "") { - throw new ArgumentException("De filenaam voor de CharacteristicPoints csv is leeg."); + throw new ArgumentException("The file name for the Characteristic Points csv is empty."); } if (!File.Exists(fileName)) { - throw new ArgumentException(string.Format("De CharacteristicPoints csv file met naam {0} bestaat niet.", fileName)); + throw new ArgumentException(string.Format("The Characteristic Points csv file with name {0} could not be found.", fileName)); } var oldcur = Thread.CurrentThread.CurrentCulture; @@ -90,7 +90,7 @@ string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv); if (headers.Count() < minimalNumberOfColumns) { - var csvHeaderColumnCountError = string.Format("Miminum aantal kolommen in csv bestand is {0}", minimalNumberOfColumns); + var csvHeaderColumnCountError = string.Format("Minimum number of columns in the csv file is {0}", minimalNumberOfColumns); throw new ArgumentException(string.Format("{0} : {1}", fileName, csvHeaderColumnCountError)); } @@ -470,7 +470,7 @@ catch (Exception e) { var csvCharacteristicPointError = - "Tijdens het lezen van karakteristieke punten in locatie {0} in kolom {1} uit de csv trad de volgende fout op: "; + "Next error occured whilst reading characteristic points in location {0} column {1} from csv: "; errorMessages.Add(csvCharacteristicPointError + e.Message); } } Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterLocations.cs =================================================================== diff -u -r3110 -r3119 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 3110) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 3119) @@ -121,12 +121,12 @@ errorMessages.Clear(); if (fileName == "") { - throw new ArgumentException("De filenaam voor de locations csv is leeg."); + throw new ArgumentException("The file name for the Locations csv is empty."); } if (!File.Exists(fileName)) { - throw new ArgumentException(string.Format("De locations csv file met naam {0} bestaat niet.", fileName)); + throw new ArgumentException(string.Format("The Locations csv file with name {0} could not be found.", fileName)); } @@ -139,14 +139,14 @@ string[] headers = CsvImporterHelper.GetFieldHeaders(this, csv); if (headers.Count() < 3) { - var csvHeaderError = "De header van de csv file klopt niet."; + var csvHeaderError = "The header of the csv file is wrong."; throw new ArgumentException(string.Format("{0} : {1}", fileName, csvHeaderError)); } int colIndexLocationId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LocationColumnName); int colIndexSurfaceLineId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SurfaceLineColumnName); int colIndexXSoilGeometry2DOrigin = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XSoilGeometry2DOriginColumnName); - int colIndexOphoogMateriaaldijk = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeEmbankmentMaterialColumnName); + int colIndexDikeEmbankmentMaterial = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeEmbankmentMaterialColumnName); int colSoilGeometryName = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SoilGeometryNameColumnName); int colLayerMaterial = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LayerMaterialColumnName); int colLayerThickness = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LayerThicknessColumnName); @@ -165,7 +165,7 @@ */ locationRecord.LocationId = csv[colIndexLocationId]; locationRecord.SurfaceLineId = csv[colIndexSurfaceLineId]; - locationRecord.DikeEmbankmentMaterial = csv[colIndexOphoogMateriaaldijk]; + locationRecord.DikeEmbankmentMaterial = csv[colIndexDikeEmbankmentMaterial]; locationRecord.SoilGeometryName = csv[colSoilGeometryName]; locationRecord.LayerMaterial = csv[colLayerMaterial]; locationRecord.LayerThickness = Convert.ToDouble(csv[colLayerThickness]); @@ -182,7 +182,7 @@ } catch (Exception e) { - var csvLocationError = String.Format("Tijdens het lezen van locatie {0} in kolom {1} uit de csv trad de volgende fout op: ", + var csvLocationError = String.Format("Next error occured whilst reading location {0} column {1} from csv: ", locationRecord.LocationId, colIndex + 1); errorMessages.Add(csvLocationError + e.Message); } Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterSurfaceLines.cs =================================================================== diff -u -r3110 -r3119 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterSurfaceLines.cs (.../CsvImporterSurfaceLines.cs) (revision 3110) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterSurfaceLines.cs (.../CsvImporterSurfaceLines.cs) (revision 3119) @@ -74,7 +74,7 @@ { if (index < 0) { - var csvHeaderFieldError = "In de header ontbreekt veld:"; + var csvHeaderFieldError = "The header misses the field: "; throw new ArgumentException(string.Format("{0} : {1} {2}", fileName, csvHeaderFieldError, fieldName)); } } @@ -97,12 +97,12 @@ errorMessages.Clear(); if (filename == "") { - throw new ArgumentException("De filenaam voor de surfaceline csv is leeg."); + throw new ArgumentException("The file name for the Surface Lines csv is empty."); } if (!File.Exists(filename)) { - throw new ArgumentException(string.Format("De surfaceline csv file met naam {0} bestaat niet.", filename)); + throw new ArgumentException(string.Format("The Surface Lines csv file with name {0} could not be found..", filename)); } // This is a 'dynamic' csv file, i.e. the number of columns is not known and can vary per row. So make sure of a @@ -169,7 +169,7 @@ } catch (Exception e) { - var csvSurfaceLineError = String.Format("Tijdens het lezen van surface line {0} in kolom {1} uit de csv trad de volgende fout op: ", + var csvSurfaceLineError = String.Format("Next error occured whilst reading surface line {0} column {1} from csv: ", surfaceLine.SurfaceLineRecordId, colIndex + 1); errorMessages.Add(csvSurfaceLineError + e.Message); recordReadError = true; Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/SurfaceLinePoint.cs =================================================================== diff -u -r3110 -r3119 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/SurfaceLinePoint.cs (.../SurfaceLinePoint.cs) (revision 3110) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/SurfaceLinePoint.cs (.../SurfaceLinePoint.cs) (revision 3119) @@ -31,8 +31,8 @@ { None, SurfaceLevelOutside = 1, // Maaiveld buitenwaarts - BottomRiverChannel = 2, // Bodem geul NODIG? - InsertRiverChannel = 3, // Insteek geul NODIG? + BottomRiverChannel = 2, // Bodem geul + InsertRiverChannel = 3, // Insteek geul DikeToeAtRiver = 5, // Teen dijk buitenwaarts ShoulderTopOutside = 6, // Kruin buitenberm ShoulderBaseOutside = 7, // Insteek buitenberm