Fisheye: Tag bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.IO/FailureMechanismSectionsImporter.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs =================================================================== diff -u -re0160ade0c675f727ae61944b7f294f457ea3b51 -rbc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e0160ade0c675f727ae61944b7f294f457ea3b51) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -97,81 +97,6 @@ } /// - /// Looks up a localized string similar to {0} - ///Er is geen vakindeling geïmporteerd.. - /// - public static string FailureMechanismSectionsImporter_CriticalErrorMessage_0_No_sections_imported { - get { - return ResourceManager.GetString("FailureMechanismSectionsImporter_CriticalErrorMessage_0_No_sections_imported", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Vakindeling importeren afgebroken. Geen data ingelezen.. - /// - public static string FailureMechanismSectionsImporter_Import_cancelled_no_data_read { - get { - return ResourceManager.GetString("FailureMechanismSectionsImporter_Import_cancelled_no_data_read", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Vakindeling komt niet overeen met de huidige referentielijn.. - /// - public static string FailureMechanismSectionsImporter_Import_Imported_sections_do_not_correspond_to_current_referenceline { - get { - return ResourceManager.GetString("FailureMechanismSectionsImporter_Import_Imported_sections_do_not_correspond_to_cu" + - "rrent_referenceline", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Er is geen referentielijn beschikbaar om een vakindeling voor te definiëren.. - /// - public static string FailureMechanismSectionsImporter_Import_Required_referenceline_missing { - get { - return ResourceManager.GetString("FailureMechanismSectionsImporter_Import_Required_referenceline_missing", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Geïmporteerde data toevoegen aan het toetsspoor.. - /// - public static string FailureMechanismSectionsImporter_ProgressText_Adding_imported_data_to_failureMechanism { - get { - return ResourceManager.GetString("FailureMechanismSectionsImporter_ProgressText_Adding_imported_data_to_failureMech" + - "anism", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Inlezen vakindeling.. - /// - public static string FailureMechanismSectionsImporter_ProgressText_Reading_file { - get { - return ResourceManager.GetString("FailureMechanismSectionsImporter_ProgressText_Reading_file", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Valideren ingelezen vakindeling.. - /// - public static string FailureMechanismSectionsImporter_ProgressText_Validating_imported_sections { - get { - return ResourceManager.GetString("FailureMechanismSectionsImporter_ProgressText_Validating_imported_sections", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Het bestand heeft geen vakindeling.. - /// - public static string FailureMechanismSectionsImporter_ReadFile_File_is_empty { - get { - return ResourceManager.GetString("FailureMechanismSectionsImporter_ReadFile_File_is_empty", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Als u de referentielijn vervangt, zullen alle vakindelingen, berekende hydraulische randvoorwaarden en berekeningsresultaten worden verwijderd. /// ///Weet u zeker dat u wilt doorgaan?. Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx =================================================================== diff -u -re0160ade0c675f727ae61944b7f294f457ea3b51 -rbc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision e0160ade0c675f727ae61944b7f294f457ea3b51) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019) @@ -159,29 +159,4 @@ {0} shape bestand (*.shp)|*.shp - - {0} -Er is geen vakindeling geïmporteerd. - - - Vakindeling importeren afgebroken. Geen data ingelezen. - - - Vakindeling komt niet overeen met de huidige referentielijn. - - - Er is geen referentielijn beschikbaar om een vakindeling voor te definiëren. - - - Geïmporteerde data toevoegen aan het toetsspoor. - - - Inlezen vakindeling. - - - Valideren ingelezen vakindeling. - - - Het bestand heeft geen vakindeling. - \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj =================================================================== diff -u -re0160ade0c675f727ae61944b7f294f457ea3b51 -rbc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 --- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision e0160ade0c675f727ae61944b7f294f457ea3b51) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019) @@ -48,7 +48,6 @@ Properties\GlobalAssembly.cs - True Fisheye: Tag bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.IO.Test/FailureMechanismSectionsImporterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj =================================================================== diff -u -re0160ade0c675f727ae61944b7f294f457ea3b51 -rbc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj (.../Ringtoets.Common.IO.Test.csproj) (revision e0160ade0c675f727ae61944b7f294f457ea3b51) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj (.../Ringtoets.Common.IO.Test.csproj) (revision bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019) @@ -50,7 +50,6 @@ - Fisheye: Tag e0160ade0c675f727ae61944b7f294f457ea3b51 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/FailureMechanismSectionsImporter.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -re0160ade0c675f727ae61944b7f294f457ea3b51 -rbc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e0160ade0c675f727ae61944b7f294f457ea3b51) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019) @@ -70,6 +70,35 @@ } /// + /// Looks up a localized string similar to {0} + ///Er is geen vakindeling geïmporteerd.. + /// + public static string FailureMechanismSectionsImporter_CriticalErrorMessage_0_No_sections_imported { + get { + return ResourceManager.GetString("FailureMechanismSectionsImporter_CriticalErrorMessage_0_No_sections_imported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Vakindeling importeren afgebroken. Geen data ingelezen.. + /// + public static string FailureMechanismSectionsImporter_Import_cancelled_no_data_read { + get { + return ResourceManager.GetString("FailureMechanismSectionsImporter_Import_cancelled_no_data_read", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Vakindeling komt niet overeen met de huidige referentielijn.. + /// + public static string FailureMechanismSectionsImporter_Import_Imported_sections_do_not_correspond_to_current_referenceline { + get { + return ResourceManager.GetString("FailureMechanismSectionsImporter_Import_Imported_sections_do_not_correspond_to_cu" + + "rrent_referenceline", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Er is geen referentielijn beschikbaar om een vakindeling voor de definiëren.. /// public static string FailureMechanismSectionsImporter_Import_Required_reference_line_is_missing { @@ -79,6 +108,52 @@ } /// + /// Looks up a localized string similar to Er is geen referentielijn beschikbaar om een vakindeling voor te definiëren.. + /// + public static string FailureMechanismSectionsImporter_Import_Required_referenceline_missing { + get { + return ResourceManager.GetString("FailureMechanismSectionsImporter_Import_Required_referenceline_missing", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Geïmporteerde data toevoegen aan het toetsspoor.. + /// + public static string FailureMechanismSectionsImporter_ProgressText_Adding_imported_data_to_failureMechanism { + get { + return ResourceManager.GetString("FailureMechanismSectionsImporter_ProgressText_Adding_imported_data_to_failureMech" + + "anism", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Inlezen vakindeling.. + /// + public static string FailureMechanismSectionsImporter_ProgressText_Reading_file { + get { + return ResourceManager.GetString("FailureMechanismSectionsImporter_ProgressText_Reading_file", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Valideren ingelezen vakindeling.. + /// + public static string FailureMechanismSectionsImporter_ProgressText_Validating_imported_sections { + get { + return ResourceManager.GetString("FailureMechanismSectionsImporter_ProgressText_Validating_imported_sections", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Het bestand heeft geen vakindeling.. + /// + public static string FailureMechanismSectionsImporter_ReadFile_File_is_empty { + get { + return ResourceManager.GetString("FailureMechanismSectionsImporter_ReadFile_File_is_empty", resourceCulture); + } + } + + /// /// Looks up a localized string similar to {0} Het bestand wordt overgeslagen.. /// public static string HydraulicBoundaryDatabaseImporter_ErrorMessage_0_file_skipped { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -re0160ade0c675f727ae61944b7f294f457ea3b51 -rbc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision e0160ade0c675f727ae61944b7f294f457ea3b51) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019) @@ -126,9 +126,34 @@ {0} Het bestand wordt overgeslagen. + + {0} +Er is geen vakindeling geïmporteerd. + Er is geen referentielijn beschikbaar om een vakindeling voor de definiëren. + + Er is geen referentielijn beschikbaar om een vakindeling voor te definiëren. + + + Het bestand heeft geen vakindeling. + + + Vakindeling komt niet overeen met de huidige referentielijn. + + + Vakindeling importeren afgebroken. Geen data ingelezen. + + + Inlezen vakindeling. + + + Valideren ingelezen vakindeling. + + + Geïmporteerde data toevoegen aan het toetsspoor. + Het bijbehorende HLCD bestand is niet gevonden in dezelfde map als het HRD bestand. Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj =================================================================== diff -u -re0160ade0c675f727ae61944b7f294f457ea3b51 -rbc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision e0160ade0c675f727ae61944b7f294f457ea3b51) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019) @@ -54,6 +54,7 @@ Properties\GlobalAssembly.cs + Fisheye: Tag e0160ade0c675f727ae61944b7f294f457ea3b51 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/FailureMechanismSectionsImporterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj =================================================================== diff -u -re0160ade0c675f727ae61944b7f294f457ea3b51 -rbc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision e0160ade0c675f727ae61944b7f294f457ea3b51) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019) @@ -62,6 +62,7 @@ + Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj =================================================================== diff -u -r49f905d3363336d44ef828259692644dcf5f9edc -rbc7bdcd2b6c23afc7f3e92b31e583cf0453a3019 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj (.../Ringtoets.Piping.IO.csproj) (revision 49f905d3363336d44ef828259692644dcf5f9edc) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj (.../Ringtoets.Piping.IO.csproj) (revision bc7bdcd2b6c23afc7f3e92b31e583cf0453a3019) @@ -113,10 +113,6 @@ - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll