Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Piping/PipingProfileCreator.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Piping/PipingProfileCreator.cs (.../PipingProfileCreator.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Piping/PipingProfileCreator.cs (.../PipingProfileCreator.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -48,7 +48,7 @@ { if (dSoilModelDatabaseContainsAquiferOnLayerLevel) { - var message = String.Format(Resources.PipingProfileCreator_NoAquiferLayer, soilProfile.Name); + var message = String.Format(Resources.PipingProfileCreator_No_Aquifer_Layer, soilProfile.Name); throw new PipingProfileCreatorException(message); } soilProfile.Layers.First().IsAquifer = true; Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.Designer.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -81,9 +81,9 @@ /// /// Looks up a localized string similar to Het profiel '{0}' bevat geen waterdoorlatende laag.. /// - internal static string PipingProfileCreator_NoAquiferLayer { + internal static string PipingProfileCreator_No_Aquifer_Layer { get { - return ResourceManager.GetString("PipingProfileCreator_NoAquiferLayer", resourceCulture); + return ResourceManager.GetString("PipingProfileCreator_No_Aquifer_Layer", resourceCulture); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.resx =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.resx (.../Resources.resx) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.resx (.../Resources.resx) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -123,7 +123,7 @@ Een dwarsdoorsnede moet geselecteerd zijn om een Uplift berekening uit te kunnen voeren. - + Het profiel '{0}' bevat geen waterdoorlatende laag. \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSoilProfile.cs =================================================================== diff -u -rd73739bed38c7aaf880d1c57c8904f9667ee2329 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSoilProfile.cs (.../PipingSoilProfile.cs) (revision d73739bed38c7aaf880d1c57c8904f9667ee2329) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSoilProfile.cs (.../PipingSoilProfile.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -50,7 +50,7 @@ { if (value == null || !value.Any()) { - throw new ArgumentException(string.Format(Resources.Error_CannotConstructPipingSoilProfileWithoutLayers)); + throw new ArgumentException(string.Format(Resources.Error_Cannot_Construct_PipingSoilProfile_Without_Layers)); } layers = value.OrderByDescending(l => l.Top).ToArray(); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/LognormalDistribution.cs =================================================================== diff -u -r7570b93f301f4503b1c787ecdba215f41eda684a -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/LognormalDistribution.cs (.../LognormalDistribution.cs) (revision 7570b93f301f4503b1c787ecdba215f41eda684a) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/LognormalDistribution.cs (.../LognormalDistribution.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -39,7 +39,7 @@ { if (value <= 0) { - throw new ArgumentException(Resources.NormalDistribution_StandardDeviation_Should_be_greater_then_zero); + throw new ArgumentException(Resources.NormalDistribution_StandardDeviation_Should_Be_Greater_Then_Zero); } standardDeviation = value; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/NormalDistribution.cs =================================================================== diff -u -r7570b93f301f4503b1c787ecdba215f41eda684a -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/NormalDistribution.cs (.../NormalDistribution.cs) (revision 7570b93f301f4503b1c787ecdba215f41eda684a) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Probabilistics/NormalDistribution.cs (.../NormalDistribution.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -39,7 +39,7 @@ { if (value <= 0) { - throw new ArgumentException(Resources.NormalDistribution_StandardDeviation_Should_be_greater_then_zero); + throw new ArgumentException(Resources.NormalDistribution_StandardDeviation_Should_Be_Greater_Then_Zero); } standardDeviation = value; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs =================================================================== diff -u -ra483049c20ef6d26addd0718d0f31ae1922e6f49 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a483049c20ef6d26addd0718d0f31ae1922e6f49) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -63,27 +63,27 @@ /// /// Looks up a localized string similar to Geen waterdoorlatende laag gevonden voor het profiel.. /// - internal static string Error_CannotConstructPipingSoilProfileWithoutAquiferLayer { + internal static string Error_Cannot_Construct_PipingSoilProfile_Without_Aquifer_Layer { get { - return ResourceManager.GetString("Error_CannotConstructPipingSoilProfileWithoutAquiferLayer", resourceCulture); + return ResourceManager.GetString("Error_Cannot_Construct_PipingSoilProfile_Without_Aquifer_Layer", resourceCulture); } } /// /// Looks up a localized string similar to Geen lagen gevonden voor het profiel.. /// - internal static string Error_CannotConstructPipingSoilProfileWithoutLayers { + internal static string Error_Cannot_Construct_PipingSoilProfile_Without_Layers { get { - return ResourceManager.GetString("Error_CannotConstructPipingSoilProfileWithoutLayers", resourceCulture); + return ResourceManager.GetString("Error_Cannot_Construct_PipingSoilProfile_Without_Layers", resourceCulture); } } /// /// Looks up a localized string similar to Standaard afwijking (σ) moet groter zijn dan 0.. /// - internal static string NormalDistribution_StandardDeviation_Should_be_greater_then_zero { + internal static string NormalDistribution_StandardDeviation_Should_Be_Greater_Then_Zero { get { - return ResourceManager.GetString("NormalDistribution_StandardDeviation_Should_be_greater_then_zero", resourceCulture); + return ResourceManager.GetString("NormalDistribution_StandardDeviation_Should_Be_Greater_Then_Zero", resourceCulture); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx =================================================================== diff -u -ra483049c20ef6d26addd0718d0f31ae1922e6f49 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision a483049c20ef6d26addd0718d0f31ae1922e6f49) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -117,13 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Geen waterdoorlatende laag gevonden voor het profiel. - + Geen lagen gevonden voor het profiel. - - Standaard afwijking (σ) moet groter zijn dan 0. + + Standaard afwijking (σ) moet groter zijn dan 0. \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs =================================================================== diff -u -ra483049c20ef6d26addd0718d0f31ae1922e6f49 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs (.../SoilLayer2D.cs) (revision a483049c20ef6d26addd0718d0f31ae1922e6f49) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs (.../SoilLayer2D.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -137,7 +137,7 @@ } else if (IsVerticalAtX(GetSegmentWithStartAtIndex(loop, segmentIndex), atX)) { - throw new SoilLayer2DConversionException(String.Format(Resources.Error_CanNotDetermine1DProfileWithVerticalSegmentsAtX, atX)); + throw new SoilLayer2DConversionException(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_x, atX)); } } return intersectionPointY; Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder2D.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder2D.cs (.../SoilProfileBuilder2D.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder2D.cs (.../SoilProfileBuilder2D.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -25,7 +25,7 @@ { if (double.IsNaN(atX)) { - throw new ArgumentException(Resources.Error_SoilProfileBuilderCantDetermineIntersectAtDoubleNaN); + throw new ArgumentException(Resources.Error_SoilProfileBuilder_cant_determine_intersect_at_double_NaN); } ProfileName = profileName; AtX = atX; Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/FileUtils.cs =================================================================== diff -u -r5462a7ee52b9491f269d489a094d359f4f02f270 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.IO/FileUtils.cs (.../FileUtils.cs) (revision 5462a7ee52b9491f269d489a094d359f4f02f270) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/FileUtils.cs (.../FileUtils.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -19,7 +19,7 @@ { if (String.IsNullOrWhiteSpace(path)) { - throw new ArgumentException(Resources.Error_PathMustBeSpecified); + throw new ArgumentException(Resources.Error_Path_must_be_specified); } string name; @@ -29,12 +29,12 @@ } catch (ArgumentException e) { - throw new ArgumentException(String.Format(Resources.Error_PathCannotContainCharacters_0_, + throw new ArgumentException(String.Format(Resources.Error_Path_cannot_contain_characters_0_, String.Join(", ", Path.GetInvalidFileNameChars())), e); } if (String.Empty == name) { - throw new ArgumentException(Resources.Error_PathMustNotPointToFolder); + throw new ArgumentException(Resources.Error_Path_must_not_point_to_folder); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSoilProfileReader.cs =================================================================== diff -u -rb270a71e8e53ef6d702120af0915825ce427a3bd -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSoilProfileReader.cs (.../PipingSoilProfileReader.cs) (revision b270a71e8e53ef6d702120af0915825ce427a3bd) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSoilProfileReader.cs (.../PipingSoilProfileReader.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -49,7 +49,7 @@ { if (String.IsNullOrEmpty(databaseFilePath)) { - throw new ArgumentException(Resources.Error_PathMustBeSpecified); + throw new ArgumentException(Resources.Error_Path_must_be_specified); } if (!File.Exists(databaseFilePath)) { @@ -396,9 +396,8 @@ catch (SQLiteException e) { connection.Dispose(); - var exception = new PipingSoilProfileReadException(string.Format(Resources.Error_SoilProfileReadFromDatabase, databaseFileName), e); - throw exception; - } + var exception = new PipingSoilProfileReadException(string.Format(Resources.Error_SoilProfile_read_from_database, databaseFileName), e); + throw exception; } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSurfaceLinesCsvReader.cs =================================================================== diff -u -r5462a7ee52b9491f269d489a094d359f4f02f270 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSurfaceLinesCsvReader.cs (.../PipingSurfaceLinesCsvReader.cs) (revision 5462a7ee52b9491f269d489a094d359f4f02f270) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/PipingSurfaceLinesCsvReader.cs (.../PipingSurfaceLinesCsvReader.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -149,7 +149,7 @@ { if (lCoordinates[i - 1] > lCoordinates[i]) { - var message = string.Format(Resources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Has_reclining_geometry, + var message = string.Format(Resources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_has_reclining_geometry, filePath, 2); throw new LineParseException(message); } @@ -175,7 +175,7 @@ { if (!readText.Contains(separator)) { - var message = string.Format(Resources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_separator_2_, + var message = string.Format(Resources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_separator_2_, filePath, lineNumber, separator); throw new LineParseException(message); } @@ -203,7 +203,7 @@ var worldCoordinateValues = ParseWorldCoordinateValuesAndHandleParseErrors(tokenizedString); if (worldCoordinateValues.Length % expectedValuesForPoint != 0) { - var message = string.Format(Resources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_values_for_coordinate_triplet, + var message = string.Format(Resources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_values_for_coordinate_triplet, filePath, lineNumber); throw new LineParseException(message); } @@ -233,7 +233,7 @@ var name = tokenizedString.Any() ? tokenizedString[0].Trim() : string.Empty; if (string.IsNullOrEmpty(name)) { - var message = string.Format(Resources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_NoId, + var message = string.Format(Resources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_no_ID, filePath, lineNumber); throw new LineParseException(message); } @@ -267,7 +267,7 @@ } catch (OverflowException e) { - var message = string.Format(Resources.Error_File_0_Parsing_causes_overflow_Line_1_, + var message = string.Format(Resources.Error_File_0_parsing_causes_overflow_Line_1_, filePath, lineNumber); throw new LineParseException(message, e); } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rd514ce187a1ce571355fd92ca1edf822d943ba39 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d514ce187a1ce571355fd92ca1edf822d943ba39) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -61,20 +61,20 @@ } /// - /// Looks up a localized string similar to Kan geen 2D en 1D lagen combineren in een profiel.. + /// Looks up a localized string similar to Kan geen 1D profiel bepalen wanneer segmenten in een 2D laag verticaal lopen op de gekozen positie: x = {0}.. /// - public static string Error_CannotCombine2DAnd1DLayersInProfile { + public static string Error_Can_not_determine_1D_profile_with_vertical_segments_at_x { get { - return ResourceManager.GetString("Error_CannotCombine2DAnd1DLayersInProfile", resourceCulture); + return ResourceManager.GetString("Error_Can_not_determine_1D_profile_with_vertical_segments_at_x", resourceCulture); } } /// - /// Looks up a localized string similar to Kan geen 1D profiel bepalen wanneer segmenten in een 2D laag verticaal lopen op de gekozen positie: x = {0}.. + /// Looks up a localized string similar to Kan geen 2D en 1D lagen combineren in een profiel.. /// - public static string Error_CanNotDetermine1DProfileWithVerticalSegmentsAtX { + public static string Error_Cannot_combine_2D_and_1D_layers_in_profile { get { - return ResourceManager.GetString("Error_CanNotDetermine1DProfileWithVerticalSegmentsAtX", resourceCulture); + return ResourceManager.GetString("Error_Cannot_combine_2D_and_1D_layers_in_profile", resourceCulture); } } @@ -126,9 +126,9 @@ /// /// Looks up a localized string similar to Het bestand '{0}' heeft op regel {1} een waarde dat te groot/klein is om ingelezen te worden.. /// - public static string Error_File_0_Parsing_causes_overflow_Line_1_ { + public static string Error_File_0_parsing_causes_overflow_Line_1_ { get { - return ResourceManager.GetString("Error_File_0_Parsing_causes_overflow_Line_1_", resourceCulture); + return ResourceManager.GetString("Error_File_0_parsing_causes_overflow_Line_1_", resourceCulture); } } @@ -144,54 +144,45 @@ /// /// Looks up a localized string similar to Bestandspad mag niet de volgende tekens bevatten: {0}. /// - public static string Error_PathCannotContainCharacters_0_ { + public static string Error_Path_cannot_contain_characters_0_ { get { - return ResourceManager.GetString("Error_PathCannotContainCharacters_0_", resourceCulture); + return ResourceManager.GetString("Error_Path_cannot_contain_characters_0_", resourceCulture); } } /// /// Looks up a localized string similar to Bestandspad mag niet leeg of ongedefinieerd zijn.. /// - public static string Error_PathMustBeSpecified { + public static string Error_Path_must_be_specified { get { - return ResourceManager.GetString("Error_PathMustBeSpecified", resourceCulture); + return ResourceManager.GetString("Error_Path_must_be_specified", resourceCulture); } } /// /// Looks up a localized string similar to Bestandspad mag niet naar een map verwijzen.. /// - public static string Error_PathMustNotPointToFolder { + public static string Error_Path_must_not_point_to_folder { get { - return ResourceManager.GetString("Error_PathMustNotPointToFolder", resourceCulture); + return ResourceManager.GetString("Error_Path_must_not_point_to_folder", resourceCulture); } } /// - /// Looks up a localized string similar to Geen geldige X waarde gevonden om intersectie te maken uit 2D profiel '{0}'.. - /// - public static string Error_SoilProfileBuilderCantDetermineIntersectAtDoubleNaN { - get { - return ResourceManager.GetString("Error_SoilProfileBuilderCantDetermineIntersectAtDoubleNaN", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Kon geen ondergrond profielen verkrijgen van de database '{0}'.. /// - public static string Error_SoilProfileReadFromDatabase { + public static string Error_SoilProfile_read_from_database { get { - return ResourceManager.GetString("Error_SoilProfileReadFromDatabase", resourceCulture); + return ResourceManager.GetString("Error_SoilProfile_read_from_database", resourceCulture); } } /// - /// Looks up a localized string similar to Het bestand op '{0}' heeft op regel {1} teveel tekst om in het RAM geheugen opgeslagen te worden.. + /// Looks up a localized string similar to Geen geldige X waarde gevonden om intersectie te maken uit 2D profiel '{0}'.. /// - public static string Error_Unexpected_IOError_File_0_Line_1_ { + public static string Error_SoilProfileBuilder_cant_determine_intersect_at_double_NaN { get { - return ResourceManager.GetString("Error_Unexpected_IOError_File_0_Line_1_", resourceCulture); + return ResourceManager.GetString("Error_SoilProfileBuilder_cant_determine_intersect_at_double_NaN", resourceCulture); } } @@ -216,18 +207,18 @@ /// /// Looks up a localized string similar to Ondergrondprofiel in database bevat geen geldige waarde in kolom {0}.. /// - public static string PipingSoilProfileReader_InvalidValueOnColumn { + public static string PipingSoilProfileReader_Invalid_value_on_column { get { - return ResourceManager.GetString("PipingSoilProfileReader_InvalidValueOnColumn", resourceCulture); + return ResourceManager.GetString("PipingSoilProfileReader_Invalid_value_on_column", resourceCulture); } } /// /// Looks up a localized string similar to Er is een onverwachte fout opgetreden bij het inlezen van het profiel.. /// - public static string PipingSoilProfileReader_UnexepectedErrorOccured { + public static string PipingSoilProfileReader_Unexepected_error_occured { get { - return ResourceManager.GetString("PipingSoilProfileReader_UnexepectedErrorOccured", resourceCulture); + return ResourceManager.GetString("PipingSoilProfileReader_Unexepected_error_occured", resourceCulture); } } @@ -243,37 +234,37 @@ /// /// Looks up a localized string similar to Het bestand '{0}' heeft op regel {1} een dwarsdoorsnede met teruglopende geometrie (Punten behoren een oplosende set L-coordinaten te hebben in het lokaal coordinatensteltsel).. /// - public static string PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Has_reclining_geometry { + public static string PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_has_reclining_geometry { get { - return ResourceManager.GetString("PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Has_reclining_geometry", resourceCulture); + return ResourceManager.GetString("PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_has_reclining_geometry", resourceCulture); } } /// /// Looks up a localized string similar to Het bestand '{0}' heeft op regel {1} geen verwacht scheidingsteken (het karakter: {2}).. /// - public static string PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_separator_2_ { + public static string PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_separator_2_ { get { - return ResourceManager.GetString("PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_separator_2_", resourceCulture); + return ResourceManager.GetString("PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_separator_2_", resourceCulture); } } /// /// Looks up a localized string similar to Het bestand '{0}' heeft op regel {1} ontbrekende waardes om een 3D (X,Y,Z) punt aan te maken.. /// - public static string PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_values_for_coordinate_triplet { + public static string PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_values_for_coordinate_triplet { get { - return ResourceManager.GetString("PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_values_for_coordinate_tr" + + return ResourceManager.GetString("PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_values_for_coordinate_tr" + "iplet", resourceCulture); } } /// /// Looks up a localized string similar to Het bestand '{0}' heeft op regel {1} heeft geen ID.. /// - public static string PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_NoId { + public static string PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_no_ID { get { - return ResourceManager.GetString("PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_NoId", resourceCulture); + return ResourceManager.GetString("PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_no_ID", resourceCulture); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx =================================================================== diff -u -rd514ce187a1ce571355fd92ca1edf822d943ba39 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision d514ce187a1ce571355fd92ca1edf822d943ba39) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -117,10 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Kan geen 2D en 1D lagen combineren in een profiel. - + Kan geen 1D profiel bepalen wanneer segmenten in een 2D laag verticaal lopen op de gekozen positie: x = {0}. @@ -138,49 +138,46 @@ Het bestand '{0}' heeft op regel {1} een waarde dat geen getal is. - + Het bestand '{0}' heeft op regel {1} een waarde dat te groot/klein is om ingelezen te worden. Er is een onverwachte inleesfout opgetreden tijdens het lezen van het bestand '{0}': {1} - + Bestandspad mag niet de volgende tekens bevatten: {0} - + Bestandspad mag niet leeg of ongedefinieerd zijn. - + Bestandspad mag niet naar een map verwijzen. - + Geen geldige X waarde gevonden om intersectie te maken uit 2D profiel '{0}'. - + Kon geen ondergrond profielen verkrijgen van de database '{0}'. - - Het bestand op '{0}' heeft op regel {1} teveel tekst om in het RAM geheugen opgeslagen te worden. - - + Ondergrondprofiel in database bevat geen geldige waarde in kolom {0}. - + Er is een onverwachte fout opgetreden bij het inlezen van het profiel. Het bestand op '{0}' is niet geschikt om dwarsdoorsneden uit te lezen (Verwachte header: locationid;X1;Y1;Z1). - + Het bestand '{0}' heeft op regel {1} een dwarsdoorsnede met teruglopende geometrie (Punten behoren een oplosende set L-coordinaten te hebben in het lokaal coordinatensteltsel). - + Het bestand '{0}' heeft op regel {1} geen verwacht scheidingsteken (het karakter: {2}). - + Het bestand '{0}' heeft op regel {1} ontbrekende waardes om een 3D (X,Y,Z) punt aan te maken. - + Het bestand '{0}' heeft op regel {1} heeft geen ID. Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileTest.cs =================================================================== diff -u -rd73739bed38c7aaf880d1c57c8904f9667ee2329 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision d73739bed38c7aaf880d1c57c8904f9667ee2329) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -41,7 +41,7 @@ // Assert var message = Assert.Throws(test).Message; - Assert.AreEqual(Properties.Resources.Error_CannotConstructPipingSoilProfileWithoutLayers, message); + Assert.AreEqual(Properties.Resources.Error_Cannot_Construct_PipingSoilProfile_Without_Layers, message); } [Test] @@ -52,7 +52,7 @@ // Assert var message = Assert.Throws(test).Message; - Assert.AreEqual(Properties.Resources.Error_CannotConstructPipingSoilProfileWithoutLayers, message); + Assert.AreEqual(Properties.Resources.Error_Cannot_Construct_PipingSoilProfile_Without_Layers, message); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs (.../SoilLayer2DTest.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs (.../SoilLayer2DTest.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -494,7 +494,7 @@ // Assert var exception = Assert.Throws(test); - Assert.AreEqual(String.Format(Resources.Error_CanNotDetermine1DProfileWithVerticalSegmentsAtX, atX), exception.Message); + Assert.AreEqual(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_x, atX), exception.Message); } [Test] @@ -535,7 +535,7 @@ // Assert var exception = Assert.Throws(test); - Assert.AreEqual(String.Format(Resources.Error_CanNotDetermine1DProfileWithVerticalSegmentsAtX, atX), exception.Message); + Assert.AreEqual(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_x, atX), exception.Message); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs =================================================================== diff -u -rd73739bed38c7aaf880d1c57c8904f9667ee2329 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision d73739bed38c7aaf880d1c57c8904f9667ee2329) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -23,7 +23,7 @@ // Assert var exception = Assert.Throws(test); - Assert.AreEqual(Resources.Error_SoilProfileBuilderCantDetermineIntersectAtDoubleNaN, exception.Message); + Assert.AreEqual(Resources.Error_SoilProfileBuilder_cant_determine_intersect_at_double_NaN, exception.Message); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSoilProfileReaderTest.cs =================================================================== diff -u -rd514ce187a1ce571355fd92ca1edf822d943ba39 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision d514ce187a1ce571355fd92ca1edf822d943ba39) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -40,7 +40,7 @@ // Assert var exception = Assert.Throws(test); - Assert.AreEqual(Resources.Error_PathMustBeSpecified, exception.Message); + Assert.AreEqual(Resources.Error_Path_must_be_specified, exception.Message); } [Test] @@ -59,7 +59,7 @@ // Assert var exception = Assert.Throws(test); - Assert.AreEqual(String.Format(Resources.Error_SoilProfileReadFromDatabase, dbName), exception.Message); + Assert.AreEqual(String.Format(Resources.Error_SoilProfile_read_from_database, dbName), exception.Message); Assert.IsTrue(FileHelper.CanOpenFileForWrite(dbFile)); } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs =================================================================== diff -u -r5462a7ee52b9491f269d489a094d359f4f02f270 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs (.../PipingSurfaceLinesCsvReaderTest.cs) (revision 5462a7ee52b9491f269d489a094d359f4f02f270) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs (.../PipingSurfaceLinesCsvReaderTest.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -29,7 +29,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual(IOResources.Error_PathMustBeSpecified, exception.Message); + Assert.AreEqual(IOResources.Error_Path_must_be_specified, exception.Message); } [Test] @@ -47,7 +47,7 @@ // Assert var exception = Assert.Throws(call); - var expectedMessage = String.Format(IOResources.Error_PathCannotContainCharacters_0_, + var expectedMessage = String.Format(IOResources.Error_Path_cannot_contain_characters_0_, String.Join(", ", Path.GetInvalidFileNameChars())); Assert.AreEqual(expectedMessage, exception.Message); } @@ -60,7 +60,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual(IOResources.Error_PathMustNotPointToFolder, exception.Message); + Assert.AreEqual(IOResources.Error_Path_must_not_point_to_folder, exception.Message); } [Test] @@ -443,7 +443,7 @@ // Assert var exception = Assert.Throws(call); - var expectedMessage = string.Format(IOResources.Error_File_0_Parsing_causes_overflow_Line_1_, path, 2); + var expectedMessage = string.Format(IOResources.Error_File_0_parsing_causes_overflow_Line_1_, path, 2); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); } @@ -466,11 +466,11 @@ // Assert // 1st line has no text at all: var exception = Assert.Throws(call); - var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_NoId, path, 2); + var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_no_ID, path, 2); Assert.AreEqual(expectedMessage, exception.Message); // 2nd line has only whitespace text: - expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_NoId, path, 3); + expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_no_ID, path, 3); exception = Assert.Throws(call); Assert.AreEqual(expectedMessage, exception.Message); } @@ -492,7 +492,7 @@ // Assert var exception = Assert.Throws(call); - var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_separator_2_, path, 2, ';'); + var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_separator_2_, path, 2, ';'); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -513,7 +513,7 @@ // Assert var exception = Assert.Throws(call); - var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_separator_2_, path, 2, ';'); + var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_separator_2_, path, 2, ';'); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -535,12 +535,12 @@ // Assert // 1st row lacks 1 coordinate value: var exception = Assert.Throws(call); - var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_values_for_coordinate_triplet, path, 2); + var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_values_for_coordinate_triplet, path, 2); Assert.AreEqual(expectedMessage, exception.Message); // 2nd row lacks 2 coordinate values: exception = Assert.Throws(call); - expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Lacks_values_for_coordinate_triplet, path, 3); + expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_lacks_values_for_coordinate_triplet, path, 3); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -561,7 +561,7 @@ // Assert var exception = Assert.Throws(call); - var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Has_reclining_geometry, + var expectedMessage = string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_has_reclining_geometry, path, 2); Assert.AreEqual(expectedMessage, exception.Message); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs =================================================================== diff -u -rd514ce187a1ce571355fd92ca1edf822d943ba39 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs (.../PipingSoilProfilesImporterTest.cs) (revision d514ce187a1ce571355fd92ca1edf822d943ba39) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs (.../PipingSoilProfilesImporterTest.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -124,7 +124,7 @@ Action call = () => importedItem = importer.ImportItem(corruptPath, observableSoilProfileList); // Assert - var internalErrorMessage = string.Format(WtiIOResources.Error_SoilProfileReadFromDatabase, + var internalErrorMessage = string.Format(WtiIOResources.Error_SoilProfile_read_from_database, Path.GetFileName(corruptPath)); var expectedLogMessage = string.Format(ApplicationResources.PipingSoilProfilesImporter_CriticalErrorReading_0_Cause_1_, corruptPath, internalErrorMessage); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs =================================================================== diff -u -r8df04aa7166563cc67a1b7e70f9f4b8867e454b7 -r33d4f4e7e5404dcc6470dd3d34168b30410109eb --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision 8df04aa7166563cc67a1b7e70f9f4b8867e454b7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) @@ -257,7 +257,7 @@ Action call = () => importedItem = importer.ImportItem(corruptPath, observableSurfaceLinesList); // Assert - var internalErrorMessage = String.Format(WtiIOResources.Error_PathCannotContainCharacters_0_, + var internalErrorMessage = String.Format(WtiIOResources.Error_Path_cannot_contain_characters_0_, String.Join(", ", Path.GetInvalidFileNameChars())); var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_CriticalErrorReading_0_Cause_1_, corruptPath, internalErrorMessage); @@ -485,7 +485,7 @@ Action call = () => importedItem = importer.ImportItem(path, observableSurfaceLinesList); // Assert - var internalErrorMessage = String.Format(WtiIOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_Has_reclining_geometry, + var internalErrorMessage = String.Format(WtiIOResources.PipingSurfaceLinesCsvReader_ReadLine_File_0_Line_1_has_reclining_geometry, path, 2); var expectedLogMessage = string.Format(ApplicationResources.PipingSurfaceLinesCsvImporter_ReadPipingSurfaceLines_ParseError_File_0_SurfaceLinesNumber_1_Message_2_, path, 1, internalErrorMessage);