- 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 356159ada3e392d6f6c56ff812f77e67346b2063..27f2979243879d75ef568f3f88180cec1909a260 100644 (file)
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -7,10 +7,6 @@
       <source>BATHYMETRY_FILTER</source>
       <translation>Bathymetry files (*.xyz);;All files (*.* *)</translation>
     </message>
-    <message>
-      <source>CASE_BND_POLYLINE</source>
-      <translation>Boundary polyline</translation>
-    </message>
     <message>
       <source>CASE_REFERENCE_ZONES</source>
       <translation>Reference zones</translation>
@@ -61,52 +57,48 @@ does not exist or you have not enough permissions to open it.</translation>
       <translation>Polyline</translation>
     </message>
     <message>
-      <source>ZONE_BATHYMETRIES</source>
-      <translation>Bathymetries</translation>
+      <source>ZONE_BATHYMETRY</source>
+      <translation>Bathymetry</translation>
     </message>
-  </context>
-
-  <context>
-    <name>HYDROGUI_CalculationDlg</name>
     <message>
-      <source>BOUNDARY_POLYLINE</source>
-      <translation>Polyline</translation>
+      <source>MERGE_UNKNOWN</source>
+      <translation>Unresolved Conflict</translation>
     </message>
     <message>
-      <source>CALCULATION_BOUNDARY</source>
-      <translation>Domain of calculation case</translation>
+      <source>MERGE_ZMIN</source>
+      <translation>ZMIN</translation>
     </message>
     <message>
-      <source>CALCULATION_NAME</source>
-      <translation>Calculation case name</translation>
-    </message>
-    <message>
-      <source>CALCULATION_REFERENCE_ZONES</source>
-      <translation>Reference zones</translation>
-    </message>
-    <message>
-      <source>CALCULATION_REGIONS</source>
-      <translation>Regions</translation>
+      <source>MERGE_ZMAX</source>
+      <translation>ZMAX</translation>
     </message>
+  </context>
+
+  <context>
+    <name>HYDROGUI_CalculationDlg</name>
     <message>
-      <source>CALCULATION_ZONES</source>
-      <translation>Case zones</translation>
+      <source>CALCULATION_NAME</source>
+      <translation>Calculation case name</translation>
     </message>
     <message>
-      <source>DEFAULT_PREFIX_REGIONS</source>
-      <translation>Region</translation>
+      <source>CALCULATION_REFERENCE_OBJECTS</source>
+      <translation>Objects</translation>
     </message>
     <message>
       <source>NAME</source>
       <translation>Name</translation>
     </message>
     <message>
-      <source>PREFIX_REGIONS</source>
-      <translation>Prefix for regions</translation>
+      <source>BATHYMETRY</source>
+      <translation>Bathymetry</translation>
     </message>
     <message>
-      <source>SPLIT_REFERENCE_ZONES</source>
-      <translation>Split zones</translation>
+      <source>ADD</source>
+      <translation>Add</translation>
+    </message>
+    <message>
+      <source>REMOVE</source>
+      <translation>Remove</translation>
     </message>
   </context>
 
@@ -126,6 +118,18 @@ does not exist or you have not enough permissions to open it.</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>
     <name>HYDROGUI_CopyPasteOp</name>
     <message>
@@ -245,12 +249,28 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
     </message>
     <message>
       <source>MANUALLY_CARTESIAN</source>
-      <translation>Manually input Cartesian coordinates</translation>
+      <translation>Manually input Geodesic coordinates</translation>
     </message>
     <message>
       <source>MANUALLY_LAMBERT93</source>
       <translation>Manually input Lambert93 coordinates</translation>
     </message>
+    <message>
+      <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>
@@ -308,12 +328,12 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Create polyline</translation>
     </message>
     <message>
-      <source>DSK_CREATE_ZONE</source>
-      <translation>Create zone</translation>
+      <source>DSK_CREATE_IMMERSIBLE_ZONE</source>
+      <translation>Create immersible zone</translation>
     </message>
     <message>
-      <source>DSK_EDIT_ZONE</source>
-      <translation>Edit zone</translation>
+      <source>DSK_EDIT_IMMERSIBLE_ZONE</source>
+      <translation>Edit immersible zone</translation> 
     </message>
     <message>
       <source>DSK_COPY</source>
@@ -432,12 +452,12 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Create zone</translation>
     </message>
     <message>
-      <source>MEN_EDIT_ZONE</source>
-      <translation>Edit zone</translation>
+      <source>MEN_CREATE_IMMERSIBLE_ZONE</source>
+      <translation>Create immersible zone</translation>
     </message>
     <message>
-      <source>MEN_COPY</source>
-      <translation>Copy</translation>
+      <source>MEN_EDIT_IMMERSIBLE_ZONE</source>
+      <translation>Edit immersible zone</translation>
     </message>
     <message>
       <source>MEN_CUT_IMAGES</source>
@@ -552,12 +572,12 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Create polyline</translation>
     </message>
     <message>
-      <source>STB_CREATE_ZONE</source>
-      <translation>Create zone</translation>
+      <source>STB_CREATE_IMMERSIBLE_ZONE</source>
+      <translation>Create immersible zone</translation>
     </message>
     <message>
-      <source>STB_EDIT_ZONE</source>
-      <translation>Edit zone</translation>
+      <source>STB_EDIT_IMMERSIBLE_ZONE</source>
+      <translation>Edit immersible zone</translation>
     </message>
     <message>
       <source>STB_COPY</source>
@@ -830,7 +850,7 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
   </context>
 
   <context>
-    <name>HYDROGUI_ZoneDlg</name>
+    <name>HYDROGUI_ImmersibleZoneDlg</name>
     <message>
       <source>BORDER_COLOR</source>
       <translation>Border</translation>
@@ -852,8 +872,8 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Transparent</translation>
     </message>
     <message>
-      <source>ZONE_BATHYMETRIES</source>
-      <translation>Bathymetries</translation>
+      <source>ZONE_BATHYMETRY</source>
+      <translation>Bathymetry</translation>
     </message>
     <message>
       <source>ZONE_NAME</source>
@@ -870,14 +890,14 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
   </context>
 
   <context>
-    <name>HYDROGUI_ZoneOp</name>
+    <name>HYDROGUI_ImmersibleZoneOp</name>
     <message>
-      <source>CREATE_ZONE</source>
-      <translation>Create zone</translation>
+      <source>CREATE_IMMERSIBLE_ZONE</source>
+      <translation>Create immersible zone</translation>
     </message>
     <message>
-      <source>EDIT_ZONE</source>
-      <translation>Edit zone</translation>
+      <source>EDIT_IMMERSIBLE_ZONE</source>
+      <translation>Edit immersible zone</translation>
     </message>
   </context>