- Selected merge type translation is fixed.

[modules/hydro.git] / src / HYDROGUI / resources / HYDROGUI_msg_en.ts

diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index 18d81f7f5f2cff3aa75e555e3453766ddebe45f2..27f2979243879d75ef568f3f88180cec1909a260 100644 (file)
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -7,6 +7,14 @@
       <source>BATHYMETRY_FILTER</source>
       <translation>Bathymetry files (*.xyz);;All files (*.* *)</translation>
     </message>
+    <message>
+      <source>CASE_REFERENCE_ZONES</source>
+      <translation>Reference zones</translation>
+    </message>
+    <message>
+      <source>CASE_REGIONS</source>
+      <translation>Regions</translation>
+    </message>
     <message>
       <source>FILE_NOT_EXISTS_OR_CANT_BE_READ</source>
       <translation>The file '%1'
@@ -44,26 +52,54 @@ does not exist or you have not enough permissions to open it.</translation>
       <source>SAVE_ERROR</source>
       <translation>Study could not be saved</translation>
     </message>
-  </context>
-
-  <context>
-    <name>HYDROGUI_CalculationDlg</name>
     <message>
-      <source>BOUNDARY_POLYLINE</source>
+      <source>ZONE_POLYLINE</source>
       <translation>Polyline</translation>
     </message>
     <message>
-      <source>CALCULATION_BOUNDARY</source>
-      <translation>Domain of calculation case</translation>
+      <source>ZONE_BATHYMETRY</source>
+      <translation>Bathymetry</translation>
+    </message>
+    <message>
+      <source>MERGE_UNKNOWN</source>
+      <translation>Unresolved Conflict</translation>
+    </message>
+    <message>
+      <source>MERGE_ZMIN</source>
+      <translation>ZMIN</translation>
+    </message>
+    <message>
+      <source>MERGE_ZMAX</source>
+      <translation>ZMAX</translation>
     </message>
+  </context>
+
+  <context>
+    <name>HYDROGUI_CalculationDlg</name>
     <message>
       <source>CALCULATION_NAME</source>
       <translation>Calculation case name</translation>
     </message>
+    <message>
+      <source>CALCULATION_REFERENCE_OBJECTS</source>
+      <translation>Objects</translation>
+    </message>
     <message>
       <source>NAME</source>
       <translation>Name</translation>
     </message>
+    <message>
+      <source>BATHYMETRY</source>
+      <translation>Bathymetry</translation>
+    </message>
+    <message>
+      <source>ADD</source>
+      <translation>Add</translation>
+    </message>
+    <message>
+      <source>REMOVE</source>
+      <translation>Remove</translation>
+    </message>
   </context>
 
   <context>
@@ -76,6 +112,22 @@ does not exist or you have not enough permissions to open it.</translation>
       <source>EDIT_CALCULATION</source>
       <translation>Edit calculation case</translation>
     </message>
+    <message>
+      <source>PREVIEW_CASE_ZONES</source>
+      <translation>Preview case zones</translation>
+    </message>
+  </context>
+
+  <context>
+    <name>HYDROGUI_DataBrowser</name>
+    <message>
+      <source>REF_OBJECT_COLUMN</source>
+      <translation>Ref.Object</translation>
+    </message>
+    <message>
+      <source>BATHYMETRY_COLUMN</source>
+      <translation>Bathymetry</translation>
+    </message>
   </context>
 
   <context>
@@ -181,7 +233,7 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
     </message>
     <message>
       <source>BY_REFERENCE_IMAGE</source>
-      <translation>By reference image</translation>
+      <translation>Choose points on the reference image</translation>
     </message>
     <message>
       <source>FILE_NAME</source>
@@ -196,16 +248,32 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Import image from file</translation>
     </message>
     <message>
-      <source>MANUALLY</source>
-      <translation>Manually</translation>
+      <source>MANUALLY_CARTESIAN</source>
+      <translation>Manually input Geodesic coordinates</translation>
     </message>
     <message>
-      <source>NAME</source>
-      <translation>Name</translation>
+      <source>MANUALLY_LAMBERT93</source>
+      <translation>Manually input Lambert93 coordinates</translation>
     </message>
     <message>
-      <source>REFERENCE_IMAGE</source>
-      <translation>Reference image</translation>
+      <source>IMAGE_CS</source>
+      <translation>Image CS</translation>
+    </message>
+    <message>
+      <source>GEODESIC</source>
+      <translation>Geodesic</translation>
+    </message>
+    <message>
+      <source>LAMBERT93</source>
+      <translation>Lambert93</translation>
+    </message>
+    <message>
+      <source>REFERENCE_IMAGE_CS</source>
+      <translation>Reference Image CS</translation>
+    </message>
+    <message>
+      <source>NAME</source>
+      <translation>Name</translation>
     </message>
     <message>
       <source>TRANSFORM_IMAGE</source>
@@ -259,6 +327,14 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>DSK_CREATE_POLYLINE</source>
       <translation>Create polyline</translation>
     </message>
+    <message>
+      <source>DSK_CREATE_IMMERSIBLE_ZONE</source>
+      <translation>Create immersible zone</translation>
+    </message>
+    <message>
+      <source>DSK_EDIT_IMMERSIBLE_ZONE</source>
+      <translation>Edit immersible zone</translation> 
+    </message>
     <message>
       <source>DSK_COPY</source>
       <translation>Copy</translation>
@@ -372,8 +448,16 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Create polyline</translation>
     </message>
     <message>
-      <source>MEN_COPY</source>
-      <translation>Copy</translation>
+      <source>MEN_CREATE_ZONE</source>
+      <translation>Create zone</translation>
+    </message>
+    <message>
+      <source>MEN_CREATE_IMMERSIBLE_ZONE</source>
+      <translation>Create immersible zone</translation>
+    </message>
+    <message>
+      <source>MEN_EDIT_IMMERSIBLE_ZONE</source>
+      <translation>Edit immersible zone</translation>
     </message>
     <message>
       <source>MEN_CUT_IMAGES</source>
@@ -487,6 +571,14 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>STB_CREATE_POLYLINE</source>
       <translation>Create polyline</translation>
     </message>
+    <message>
+      <source>STB_CREATE_IMMERSIBLE_ZONE</source>
+      <translation>Create immersible zone</translation>
+    </message>
+    <message>
+      <source>STB_EDIT_IMMERSIBLE_ZONE</source>
+      <translation>Edit immersible zone</translation>
+    </message>
     <message>
       <source>STB_COPY</source>
       <translation>Copy</translation>
@@ -639,6 +731,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
   
   <context>
     <name>HYDROGUI_PolylineDlg</name>
+    <message>
+      <source>ADD_ELEMENT</source>
+      <translation>Add element</translation>
+    </message>
     <message>
       <source>CURVE_NAME_TLT</source>
       <translation>Name</translation>
@@ -752,5 +848,57 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Save visual state</translation>
     </message>
   </context>
-  
+
+  <context>
+    <name>HYDROGUI_ImmersibleZoneDlg</name>
+    <message>
+      <source>BORDER_COLOR</source>
+      <translation>Border</translation>
+    </message>
+    <message>
+      <source>COLOR</source>
+      <translation>Color</translation>
+    </message>
+    <message>
+      <source>FILLING_COLOR</source>
+      <translation>Filling color</translation>
+    </message>
+    <message>
+      <source>NAME</source>
+      <translation>Name</translation>
+    </message>
+    <message>
+      <source>TRANSPARENT</source>
+      <translation>Transparent</translation>
+    </message>
+    <message>
+      <source>ZONE_BATHYMETRY</source>
+      <translation>Bathymetry</translation>
+    </message>
+    <message>
+      <source>ZONE_NAME</source>
+      <translation>Zone name</translation>
+    </message>
+    <message>
+      <source>ZONE_PARAMETERS</source>
+      <translation>Parameters</translation>
+    </message>
+    <message>
+      <source>ZONE_POLYLINE</source>
+      <translation>Polyline</translation>
+    </message>
+  </context>
+
+  <context>
+    <name>HYDROGUI_ImmersibleZoneOp</name>
+    <message>
+      <source>CREATE_IMMERSIBLE_ZONE</source>
+      <translation>Create immersible zone</translation>
+    </message>
+    <message>
+      <source>EDIT_IMMERSIBLE_ZONE</source>
+      <translation>Edit immersible zone</translation>
+    </message>
+  </context>
+
 </TS>