Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelperOld.cs =================================================================== diff -u -r16350bb8bad254e52da022cc575250b2be1d0d5f -r5b91276721f50b18173bdaab2bb1af91193ac551 --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelperOld.cs (.../FailureMechanismSectionResultRowHelperOld.cs) (revision 16350bb8bad254e52da022cc575250b2be1d0d5f) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailureMechanismSectionResultRowHelperOld.cs (.../FailureMechanismSectionResultRowHelperOld.cs) (revision 5b91276721f50b18173bdaab2bb1af91193ac551) @@ -72,22 +72,22 @@ if (relevantScenarios.Length == 0) { - return Resources.FailureMechanismResultView_DataGridViewCellFormatting_No_relevant_calculation_scenarios_present; + return Resources.InitialFailureMechanismResultErrorProvider_No_relevant_calculation_scenarios_present; } if (Math.Abs(getTotalContributionFunc(relevantScenarios) - 1.0) > 1e-6) { - return Resources.FailureMechanismResultView_DataGridViewCellFormatting_Scenario_contribution_for_this_section_not_100; + return Resources.InitialFailureMechanismResultErrorProvider_Scenario_contribution_for_this_section_not_100; } if (!relevantScenarios.All(s => s.HasOutput)) { - return Resources.FailureMechanismResultView_DataGridViewCellFormatting_Not_all_relevant_calculation_scenarios_have_been_executed; + return Resources.InitialFailureMechanismResultErrorProvider_Not_all_relevant_calculation_scenarios_have_been_executed; } if (double.IsNaN(getDetailedAssessmentProbabilityFunc(relevantScenarios))) { - return Resources.FailureMechanismResultView_DataGridViewCellFormatting_All_relevant_calculation_scenarios_must_have_valid_output; + return Resources.InitialFailureMechanismResultErrorProvider_All_relevant_calculation_scenarios_must_have_valid_output; } return string.Empty; Index: Riskeer/Common/src/Riskeer.Common.Forms/InitialFailureMechanismResultErrorProvider.cs =================================================================== diff -u -r355050bc6f1bc1ec47be03cd6c9a63d6fe136680 -r5b91276721f50b18173bdaab2bb1af91193ac551 --- Riskeer/Common/src/Riskeer.Common.Forms/InitialFailureMechanismResultErrorProvider.cs (.../InitialFailureMechanismResultErrorProvider.cs) (revision 355050bc6f1bc1ec47be03cd6c9a63d6fe136680) +++ Riskeer/Common/src/Riskeer.Common.Forms/InitialFailureMechanismResultErrorProvider.cs (.../InitialFailureMechanismResultErrorProvider.cs) (revision 5b91276721f50b18173bdaab2bb1af91193ac551) @@ -87,22 +87,22 @@ if (relevantScenarios.Length == 0) { - return Resources.FailureMechanismResultView_DataGridViewCellFormatting_No_relevant_calculation_scenarios_present; + return Resources.InitialFailureMechanismResultErrorProvider_No_relevant_calculation_scenarios_present; } if (Math.Abs(CalculationScenarioHelper.GetTotalContribution(relevantScenarios) - 1.0) > 1e-6) { - return Resources.FailureMechanismResultView_DataGridViewCellFormatting_Scenario_contribution_for_this_section_not_100; + return Resources.InitialFailureMechanismResultErrorProvider_Scenario_contribution_for_this_section_not_100; } if (!relevantScenarios.All(s => s.HasOutput)) { - return Resources.FailureMechanismResultView_DataGridViewCellFormatting_Not_all_relevant_calculation_scenarios_have_been_executed; + return Resources.InitialFailureMechanismResultErrorProvider_Not_all_relevant_calculation_scenarios_have_been_executed; } if (double.IsNaN(getProbabilityFunc())) { - return Resources.FailureMechanismResultView_DataGridViewCellFormatting_All_relevant_calculation_scenarios_must_have_valid_output; + return Resources.InitialFailureMechanismResultErrorProvider_All_relevant_calculation_scenarios_must_have_valid_output; } return string.Empty; Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -ra72b307db87c39742683f2d8b2b332c8ebcf273b -r5b91276721f50b18173bdaab2bb1af91193ac551 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a72b307db87c39742683f2d8b2b332c8ebcf273b) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5b91276721f50b18173bdaab2bb1af91193ac551) @@ -1693,46 +1693,6 @@ } /// - /// Looks up a localized string similar to Alle maatgevende berekeningen voor dit vak moeten een geldige uitkomst hebben.. - /// - public static string FailureMechanismResultView_DataGridViewCellFormatting_All_relevant_calculation_scenarios_must_have_valid_output { - get { - return ResourceManager.GetString("FailureMechanismResultView_DataGridViewCellFormatting_All_relevant_calculation_sc" + - "enarios_must_have_valid_output", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Er moet minimaal één maatgevende berekening voor dit vak worden gedefinieerd.. - /// - public static string FailureMechanismResultView_DataGridViewCellFormatting_No_relevant_calculation_scenarios_present { - get { - return ResourceManager.GetString("FailureMechanismResultView_DataGridViewCellFormatting_No_relevant_calculation_sce" + - "narios_present", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Alle maatgevende berekeningen voor dit vak moeten uitgevoerd zijn.. - /// - public static string FailureMechanismResultView_DataGridViewCellFormatting_Not_all_relevant_calculation_scenarios_have_been_executed { - get { - return ResourceManager.GetString("FailureMechanismResultView_DataGridViewCellFormatting_Not_all_relevant_calculatio" + - "n_scenarios_have_been_executed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to De bijdragen van de maatgevende scenario's voor dit vak moeten opgeteld gelijk zijn aan 100%.. - /// - public static string FailureMechanismResultView_DataGridViewCellFormatting_Scenario_contribution_for_this_section_not_100 { - get { - return ResourceManager.GetString("FailureMechanismResultView_DataGridViewCellFormatting_Scenario_contribution_for_t" + - "his_section_not_100", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Toetsoordeel ///gedetailleerde toets per vak. /// @@ -2771,6 +2731,46 @@ } /// + /// Looks up a localized string similar to Alle maatgevende berekeningen voor dit vak moeten een geldige uitkomst hebben.. + /// + public static string InitialFailureMechanismResultErrorProvider_All_relevant_calculation_scenarios_must_have_valid_output { + get { + return ResourceManager.GetString("InitialFailureMechanismResultErrorProvider_All_relevant_calculation_scenarios_mus" + + "t_have_valid_output", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Er moet minimaal één maatgevende berekening voor dit vak worden gedefinieerd.. + /// + public static string InitialFailureMechanismResultErrorProvider_No_relevant_calculation_scenarios_present { + get { + return ResourceManager.GetString("InitialFailureMechanismResultErrorProvider_No_relevant_calculation_scenarios_pres" + + "ent", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Alle maatgevende berekeningen voor dit vak moeten uitgevoerd zijn.. + /// + public static string InitialFailureMechanismResultErrorProvider_Not_all_relevant_calculation_scenarios_have_been_executed { + get { + return ResourceManager.GetString("InitialFailureMechanismResultErrorProvider_Not_all_relevant_calculation_scenarios" + + "_have_been_executed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De bijdragen van de maatgevende scenario's voor dit vak moeten opgeteld gelijk zijn aan 100%.. + /// + public static string InitialFailureMechanismResultErrorProvider_Scenario_contribution_for_this_section_not_100 { + get { + return ResourceManager.GetString("InitialFailureMechanismResultErrorProvider_Scenario_contribution_for_this_section" + + "_not_100", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap InputFolderIcon { Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -ra72b307db87c39742683f2d8b2b332c8ebcf273b -r5b91276721f50b18173bdaab2bb1af91193ac551 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision a72b307db87c39742683f2d8b2b332c8ebcf273b) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5b91276721f50b18173bdaab2bb1af91193ac551) @@ -1,4 +1,4 @@ - +