Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.resx =================================================================== diff -u -r71a599531208a0fb34cbfbe6881009d5ddf2213a -r02cd29a58902822d716022fbf7334046c7b7e9f0 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.resx (.../AssessmentSectionMergeDataProviderDialog.resx) (revision 71a599531208a0fb34cbfbe6881009d5ddf2213a) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.resx (.../AssessmentSectionMergeDataProviderDialog.resx) (revision 02cd29a58902822d716022fbf7334046c7b7e9f0) @@ -298,7 +298,7 @@ 0 - Selecteer toetssporen: + Selecteer faalmechanismen: MiddleLeft Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rec3cdad79a768b4e033bd56836446198df108609 -r02cd29a58902822d716022fbf7334046c7b7e9f0 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ec3cdad79a768b4e033bd56836446198df108609) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 02cd29a58902822d716022fbf7334046c7b7e9f0) @@ -446,7 +446,7 @@ } /// - /// Looks up a localized string similar to Toetsspoor. + /// Looks up a localized string similar to Faalmechanisme. /// public static string FailureMechanism_Name_DisplayName { get { Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -rec3cdad79a768b4e033bd56836446198df108609 -r02cd29a58902822d716022fbf7334046c7b7e9f0 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision ec3cdad79a768b4e033bd56836446198df108609) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 02cd29a58902822d716022fbf7334046c7b7e9f0) @@ -257,7 +257,7 @@ Faalkans [1/jaar] - Toetsspoor + Faalmechanisme Resultaten verversen Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs =================================================================== diff -u -ra904f682c476b8f86ff235286a39d8b74d723913 -r02cd29a58902822d716022fbf7334046c7b7e9f0 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision a904f682c476b8f86ff235286a39d8b74d723913) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision 02cd29a58902822d716022fbf7334046c7b7e9f0) @@ -108,7 +108,7 @@ var panelForLabels = (Panel) tableLayoutPanel.GetControlFromPosition(0, 1); var failureMechanismSelectionLabel = (Label) panelForLabels.Controls[0]; - Assert.AreEqual("Selecteer toetssporen:", failureMechanismSelectionLabel.Text); + Assert.AreEqual("Selecteer faalmechanismen:", failureMechanismSelectionLabel.Text); Assert.IsInstanceOf(tableLayoutPanel.GetControlFromPosition(0, 2)); var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; @@ -121,7 +121,7 @@ Assert.IsInstanceOf(dataGridView.Columns[numberOfCalculationsIndex]); Assert.AreEqual("Selecteer", dataGridView.Columns[isSelectedIndex].HeaderText); - Assert.AreEqual("Toetsspoor", dataGridView.Columns[failurePathNameIndex].HeaderText); + Assert.AreEqual("Faalmechanisme", dataGridView.Columns[failurePathNameIndex].HeaderText); Assert.AreEqual("In assemblage", dataGridView.Columns[inAssemblyIndex].HeaderText); Assert.AreEqual("Heeft vakindeling", dataGridView.Columns[hasSectionsIndex].HeaderText); Assert.AreEqual("Aantal berekeningen", dataGridView.Columns[numberOfCalculationsIndex].HeaderText); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs =================================================================== diff -u -ref5bcb41ef403368174e2b12507785e8d1904a7b -r02cd29a58902822d716022fbf7334046c7b7e9f0 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision ef5bcb41ef403368174e2b12507785e8d1904a7b) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultTotalViewTest.cs (.../AssemblyResultTotalViewTest.cs) (revision 02cd29a58902822d716022fbf7334046c7b7e9f0) @@ -150,7 +150,7 @@ Assert.IsInstanceOf(dataGridViewColumns[failureMechanismCodeColumnIndex]); Assert.IsInstanceOf(dataGridViewColumns[failureMechanismProbabilityColumnIndex]); - Assert.AreEqual("Toetsspoor", dataGridViewColumns[failureMechanismNameColumnIndex].HeaderText); + Assert.AreEqual("Faalmechanisme", dataGridViewColumns[failureMechanismNameColumnIndex].HeaderText); Assert.AreEqual("Label", dataGridViewColumns[failureMechanismCodeColumnIndex].HeaderText); Assert.AreEqual("Faalkans [1/jaar]", dataGridViewColumns[failureMechanismProbabilityColumnIndex].HeaderText);