Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r03b746154eb249b8ffad8f9c2fd7ef1410347408 -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 03b746154eb249b8ffad8f9c2fd7ef1410347408)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -128,15 +128,6 @@
}
///
- /// Looks up a localized string similar to Oordeel.
- ///
- public static string AssemblyResult_DisplayName {
- get {
- return ResourceManager.GetString("AssemblyResult_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Waterstand met een overschrijdingsfrequentie gelijk aan de norm van het dijktraject..
///
public static string AssessmentLevel_Description {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r03b746154eb249b8ffad8f9c2fd7ef1410347408 -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 03b746154eb249b8ffad8f9c2fd7ef1410347408)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -1393,9 +1393,6 @@
berekende kans
[-]
-
- Oordeel
-
Normklassen
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs
===================================================================
diff -u -r0c9054a7f1dfd78f554eacd9a356d59c3878079c -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -79,7 +79,7 @@
}
catch (AssemblyException e)
{
- throw new AssemblyException(Resources.AssessmentSectionAssemblyFactory_Error_while_assembling_failureMechanims, e);
+ throw new AssemblyException(Resources.AssessmentSectionAssemblyFactory_Error_while_assembling_failureMechanisms, e);
}
}
@@ -129,7 +129,7 @@
}
catch (AssemblyException e)
{
- throw new AssemblyException(Resources.AssessmentSectionAssemblyFactory_Error_while_assembling_failureMechanims, e);
+ throw new AssemblyException(Resources.AssessmentSectionAssemblyFactory_Error_while_assembling_failureMechanisms, e);
}
}
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r8b131232b59ff391921dfde1a385a2e091368e1e -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8b131232b59ff391921dfde1a385a2e091368e1e)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -100,11 +100,11 @@
}
///
- /// Looks up a localized string similar to Voor een of meerdere faalmechanismen kan geen oordeel worden bepaald..
+ /// Looks up a localized string similar to Voor een of meerdere faalmechanismen kan geen assemblageresultaat worden bepaald..
///
- public static string AssessmentSectionAssemblyFactory_Error_while_assembling_failureMechanims {
+ public static string AssessmentSectionAssemblyFactory_Error_while_assembling_failureMechanisms {
get {
- return ResourceManager.GetString("AssessmentSectionAssemblyFactory_Error_while_assembling_failureMechanims", resourceCulture);
+ return ResourceManager.GetString("AssessmentSectionAssemblyFactory_Error_while_assembling_failureMechanisms", resourceCulture);
}
}
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.resx
===================================================================
diff -u -r8b131232b59ff391921dfde1a385a2e091368e1e -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 8b131232b59ff391921dfde1a385a2e091368e1e)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -153,7 +153,7 @@
Traject {0}
-
- Voor een of meerdere faalmechanismen kan geen oordeel worden bepaald.
+
+ Voor een of meerdere faalmechanismen kan geen assemblageresultaat worden bepaald.
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rf3e168c8d53e82da7e790ed7766aa38a18e417ae -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f3e168c8d53e82da7e790ed7766aa38a18e417ae)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -82,7 +82,7 @@
}
///
- /// Looks up a localized string similar to {0} Er is geen oordeel geëxporteerd..
+ /// Looks up a localized string similar to {0} Er zijn geen assemblageresultaten geëxporteerd..
///
public static string AssemblyExporter_Error_Exception_0_no_AssemblyResult_exported {
get {
@@ -91,7 +91,7 @@
}
///
- /// Looks up a localized string similar to De assemblageresultaten kunnen niet worden geëxporteerd. Inspecteer de resultaten van de individuele faalmechanismen of de gecombineerde faalkans voor meer details..
+ /// Looks up a localized string similar to De assemblageresultaten kunnen niet worden bepaald. Inspecteer de individuele faalmechanismen of de gecombineerde faalkans voor meer details..
///
public static string AssemblyExporter_No_AssemblyResult_exported_Check_results_for_details {
get {
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx
===================================================================
diff -u -rf3e168c8d53e82da7e790ed7766aa38a18e417ae -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision f3e168c8d53e82da7e790ed7766aa38a18e417ae)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -145,10 +145,10 @@
Gf
- {0} Er is geen oordeel geëxporteerd.
+ {0} Er zijn geen assemblageresultaten geëxporteerd.
- De assemblageresultaten kunnen niet worden geëxporteerd. Inspecteer de resultaten van de individuele faalmechanismen of de gecombineerde faalkans voor meer details.
+ De assemblageresultaten kunnen niet worden bepaald. Inspecteer de individuele faalmechanismen of de gecombineerde faalkans voor meer details.
Om assemblageresultaten te kunnen exporteren moeten de specifieke faalmechanismen unieke namen hebben.
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r503ad868943eed11fb553c6fdab2f4cfc4c87ab4 -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 503ad868943eed11fb553c6fdab2f4cfc4c87ab4)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -82,15 +82,6 @@
}
///
- /// Looks up a localized string similar to gml.
- ///
- public static string AssemblyResult_file_filter_Extension {
- get {
- return ResourceManager.GetString("AssemblyResult_file_filter_Extension", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap AssemblyResultPerSection {
@@ -122,13 +113,22 @@
///
/// Looks up a localized string similar to Assemblage.
///
- public static string AssemblyResultsCategoryTreeFolder_DisplayName {
+ public static string AssemblyResults_DisplayName {
get {
- return ResourceManager.GetString("AssemblyResultsCategoryTreeFolder_DisplayName", resourceCulture);
+ return ResourceManager.GetString("AssemblyResults_DisplayName", resourceCulture);
}
}
///
+ /// Looks up a localized string similar to gml.
+ ///
+ public static string AssemblyResults_file_filter_Extension {
+ get {
+ return ResourceManager.GetString("AssemblyResults_file_filter_Extension", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap AssemblyResultTotal {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r503ad868943eed11fb553c6fdab2f4cfc4c87ab4 -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 503ad868943eed11fb553c6fdab2f4cfc4c87ab4)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -210,10 +210,10 @@
xml:space="preserve">
Hydraulische belastingen zijn niet samengevoegd omdat het huidige traject meer gegevens bevat.
-
+
gml
-
+
Assemblage
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -rc3f08e70a6d335dbe6fea08cdffe636586ea64da -rf3189a75fc3328f097ff4ae1222d8e2035c3ca3f
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision c3f08e70a6d335dbe6fea08cdffe636586ea64da)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision f3189a75fc3328f097ff4ae1222d8e2035c3ca3f)
@@ -594,12 +594,12 @@
yield return new ExportInfo
{
- Name = context => RiskeerCommonFormsResources.AssemblyResult_DisplayName,
- Extension = Resources.AssemblyResult_file_filter_Extension,
+ Name = context => Resources.AssemblyResults_DisplayName,
+ Extension = Resources.AssemblyResults_file_filter_Extension,
CreateFileExporter = (context, filePath) => new AssemblyExporter(context.WrappedData, filePath),
IsEnabled = context => HasGeometry(context.WrappedData.ReferenceLine),
- GetExportPath = () => ExportHelper.GetFilePath(GetInquiryHelper(), new FileFilterGenerator(Resources.AssemblyResult_file_filter_Extension,
- RiskeerCommonFormsResources.AssemblyResult_DisplayName))
+ GetExportPath = () => ExportHelper.GetFilePath(GetInquiryHelper(), new FileFilterGenerator(Resources.AssemblyResults_file_filter_Extension,
+ Resources.AssemblyResults_DisplayName))
};
yield return CreateHydraulicBoundaryLocationCalculationsForTargetProbabilityExportInfo<
@@ -1030,7 +1030,7 @@
yield return new TreeNodeInfo
{
- Text = context => Resources.AssemblyResultsCategoryTreeFolder_DisplayName,
+ Text = context => Resources.AssemblyResults_DisplayName,
Image = context => RiskeerCommonFormsResources.GeneralFolderIcon,
ChildNodeObjects = AssemblyResultsContextChildNodeObjects,
ExpandOnCreate = context => true,