- 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 94b4e554317fc00674ae221f0863b73b9edb682c..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'
@@ -32,24 +40,104 @@ does not exist or you have not enough permissions to open it.</translation>
       <source>INPUT_VALID_DATA</source>
       <translation>Please enter valid data and try again.</translation>
     </message>
+    <message>
+      <source>LOAD_ERROR</source>
+      <translation>Study could not be loaded</translation>
+    </message>
     <message>
       <source>OBJECT_EXISTS_IN_DOCUMENT</source>
       <translation>Object with name '%1' already exists in the document.</translation>
     </message>
+    <message>
+      <source>SAVE_ERROR</source>
+      <translation>Study could not be saved</translation>
+    </message>
+    <message>
+      <source>ZONE_POLYLINE</source>
+      <translation>Polyline</translation>
+    </message>
+    <message>
+      <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_DataModel</name>
+    <name>HYDROGUI_CalculationDlg</name>
     <message>
-      <source>LOAD_ERROR</source>
-      <translation>Study could not be loaded</translation>
+      <source>CALCULATION_NAME</source>
+      <translation>Calculation case name</translation>
     </message>
     <message>
-      <source>SAVE_ERROR</source>
-      <translation>Study could not be saved</translation>
+      <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>
+    <name>HYDROGUI_CalculationOp</name>
+    <message>
+      <source>CREATE_CALCULATION</source>
+      <translation>Create calculation case</translation>
+    </message>
+    <message>
+      <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>
+    <name>HYDROGUI_CopyPasteOp</name>
+    <message>
+      <source>COPY_PASTE</source>
+      <translation>Copy/paste</translation>
+    </message>
+  </context>
+
   <context>
     <name>HYDROGUI_DeleteOp</name>
     <message>
@@ -62,7 +150,9 @@ does not exist or you have not enough permissions to open it.</translation>
     </message>
     <message>
       <source>CONFIRM_DELETION</source>
-      <translation>Do you really want to delete the selected object(s)?</translation>
+      <translation>The following objects (including the dependencies) will be deleted:
+%1
+Do you want to continue?</translation>
     </message>
   </context>
   
@@ -106,7 +196,7 @@ does not exist or you have not enough permissions to open it.</translation>
     </message>
     <message>
       <source>IMPORT_BATHYMETRY_FROM_FILE</source>
-      <translation>Import Bathymetry from file</translation>
+      <translation>Import bathymetry from file</translation>
     </message>
     <message>
       <source>NAME</source>
@@ -118,7 +208,7 @@ does not exist or you have not enough permissions to open it.</translation>
     <name>HYDROGUI_ImportBathymetryOp</name>
     <message>
       <source>IMPORT_BATHYMETRY</source>
-      <translation>Import Bathymetry</translation>
+      <translation>Import bathymetry</translation>
     </message>
     <message>
       <source>BAD_IMPORTED_BATHYMETRY_FILE</source>
@@ -143,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>
@@ -158,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>
@@ -185,6 +291,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>IMPORT_IMAGE</source>
       <translation>Import image</translation>
     </message>
+    <message>
+      <source>IMPORTED_IMAGE</source>
+      <translation>Imported image</translation>
+    </message>
     <message>
       <source>TRANSFORM_IMAGE</source>
       <translation>Transform image</translation>
@@ -197,6 +307,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>REFERENCE_POINTS_A_B_C_BELONG_TO_SINGLE_LINE</source>
       <translation>Reference points A, B, C belong to a single line.</translation>
     </message>
+    <message>
+      <source>REFERENCE_IMAGE</source>
+      <translation>Reference image</translation>
+    </message>
     <message>
       <source>TRANSFORMATION_MATRIX_CANNOT_BE_COMPUTED</source>
       <translation>Transformation matrix cannot be computed.</translation>
@@ -205,10 +319,26 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
   
   <context>
     <name>HYDROGUI_Module</name>
+    <message>
+      <source>DSK_CREATE_CALCULATION</source>
+      <translation>Create calculation case</translation>
+    </message>
     <message>
       <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>
+    </message>
     <message>
       <source>DSK_CUT_IMAGES</source>
       <translation>Cut images</translation>
@@ -218,8 +348,16 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Delete</translation>
     </message>
     <message>
-      <source>DSK_EDIT_COMPOSITE_IMAGE</source>
-      <translation>Edit composite image</translation>
+      <source>DSK_EDIT_CALCULATION</source>
+      <translation>Edit calculation case</translation>
+    </message>
+    <message>
+      <source>DSK_EDIT_CUT_IMAGE</source>
+      <translation>Edit cut image</translation>
+    </message>
+    <message>
+      <source>DSK_EDIT_FUSED_IMAGE</source>
+      <translation>Edit fused image</translation>
     </message>
     <message>
       <source>DSK_EDIT_IMPORTED_IMAGE</source>
@@ -229,6 +367,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>DSK_EDIT_POLYLINE</source>
       <translation>Edit polyline</translation>
     </message>
+    <message>
+      <source>DSK_EDIT_SPLITTED_IMAGE</source>
+      <translation>Edit splitted image</translation>
+    </message>
     <message>
       <source>DSK_EXPORT_IMAGE</source>
       <translation>Export image</translation>
@@ -247,7 +389,7 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
     </message>
     <message>
       <source>DSK_IMPORT_BATHYMETRY</source>
-      <translation>Import Bathymetry</translation>
+      <translation>Import bathymetry</translation>
     </message>
     <message>
       <source>DSK_IMPORT_IMAGE</source>
@@ -261,6 +403,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>DSK_OBSERVE_IMAGE</source>
       <translation>Observe image</translation>
     </message>
+    <message>
+      <source>DSK_PASTE</source>
+      <translation>Paste</translation>
+    </message>
     <message>
       <source>DSK_REDO</source>
       <translation>Redo</translation>
@@ -281,18 +427,38 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>DSK_SHOW_ONLY</source>
       <translation>Show only</translation>
     </message>
+    <message>
+      <source>DSK_SPLIT_IMAGE</source>
+      <translation>Split image</translation>
+    </message>
     <message>
       <source>DSK_UNDO</source>
       <translation>Undo</translation>
     </message>
     <message>
-      <source>HYDRO_TOOLBAR</source>
-      <translation>HYDRO toolbar</translation>
+      <source>DSK_UPDATE_IMAGE</source>
+      <translation>Update image</translation>
+    </message>
+    <message>
+      <source>MEN_CREATE_CALCULATION</source>
+      <translation>Create new calculation case</translation>
     </message>
     <message>
       <source>MEN_CREATE_POLYLINE</source>
       <translation>Create polyline</translation>
     </message>
+    <message>
+      <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>
       <translation>Cut images</translation>
@@ -306,8 +472,16 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>HYDRO</translation>
     </message>
     <message>
-      <source>MEN_EDIT_COMPOSITE_IMAGE</source>
-      <translation>Edit composite image</translation>
+      <source>MEN_EDIT_CALCULATION</source>
+      <translation>Edit calculation case</translation>
+    </message>
+    <message>
+      <source>MEN_EDIT_CUT_IMAGE</source>
+      <translation>Edit cut image</translation>
+    </message>
+    <message>
+      <source>MEN_EDIT_FUSED_IMAGE</source>
+      <translation>Edit fused image</translation>
     </message>
     <message>
       <source>MEN_EDIT_IMPORTED_IMAGE</source>
@@ -317,6 +491,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>MEN_EDIT_POLYLINE</source>
       <translation>Create polyline</translation>
     </message>
+    <message>
+      <source>MEN_EDIT_SPLITTED_IMAGE</source>
+      <translation>Edit splitted image</translation>
+    </message>
     <message>
       <source>MEN_EXPORT_IMAGE</source>
       <translation>Export image</translation>
@@ -335,7 +513,7 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
     </message>
     <message>
       <source>MEN_IMPORT_BATHYMETRY</source>
-      <translation>Import Bathymetry</translation>
+      <translation>Import bathymetry</translation>
     </message>
     <message>
       <source>MEN_IMPORT_IMAGE</source>
@@ -349,6 +527,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>MEN_OBSERVE_IMAGE</source>
       <translation>Observe image</translation>
     </message>
+    <message>
+      <source>MEN_PASTE</source>
+      <translation>Paste</translation>
+    </message>
     <message>
       <source>MEN_REDO</source>
       <translation>Redo</translation>
@@ -369,14 +551,38 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>MEN_SHOW_ONLY</source>
       <translation>Show only</translation>
     </message>
+    <message>
+      <source>MEN_SPLIT_IMAGE</source>
+      <translation>Split image</translation>
+    </message>
     <message>
       <source>MEN_UNDO</source>
       <translation>Undo</translation>
     </message>
+    <message>
+      <source>MEN_UPDATE_IMAGE</source>
+      <translation>Update image</translation>
+    </message>
+    <message>
+      <source>STB_CREATE_CALCULATION</source>
+      <translation>Create new calculation case</translation>
+    </message>
     <message>
       <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>
+    </message>
     <message>
       <source>STB_CUT_IMAGES</source>
       <translation>Cut images</translation>
@@ -386,8 +592,16 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Delete</translation>
     </message>
     <message>
-      <source>STB_EDIT_COMPOSITE_IMAGE</source>
-      <translation>Edit composite image</translation>
+      <source>STB_EDIT_CALCULATION</source>
+      <translation>Edit calculation case</translation>
+    </message>
+    <message>
+      <source>STB_EDIT_CUT_IMAGE</source>
+      <translation>Edit cut image</translation>
+    </message>
+    <message>
+      <source>STB_EDIT_FUSED_IMAGE</source>
+      <translation>Edit fused image</translation>
     </message>
     <message>
       <source>STB_EDIT_IMPORTED_IMAGE</source>
@@ -397,6 +611,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>STB_EDIT_POLYLINE</source>
       <translation>Edit polyline</translation>
     </message>
+    <message>
+      <source>STB_EDIT_SPLITTED_IMAGE</source>
+      <translation>Edit splitted image</translation>
+    </message>
     <message>
       <source>STB_EXPORT_IMAGE</source>
       <translation>Export image</translation>
@@ -415,7 +633,7 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
     </message>
     <message>
       <source>STB_IMPORT_BATHYMETRY</source>
-      <translation>Import Bathymetry</translation>
+      <translation>Import bathymetry</translation>
     </message>
     <message>
       <source>STB_IMPORT_IMAGE</source>
@@ -429,6 +647,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>STB_OBSERVE_IMAGE</source>
       <translation>Observe image</translation>
     </message>
+    <message>
+      <source>STB_PASTE</source>
+      <translation>Paste</translation>
+    </message>
     <message>
       <source>STB_REDO</source>
       <translation>Redo</translation>
@@ -449,10 +671,18 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>STB_SHOW_ONLY</source>
       <translation>Show only</translation>
     </message>
+    <message>
+      <source>STB_SPLIT_IMAGE</source>
+      <translation>Split image</translation>
+    </message>
     <message>
       <source>STB_UNDO</source>
       <translation>Undo</translation>
     </message>
+    <message>
+      <source>STB_UPDATE_IMAGE</source>
+      <translation>Update image</translation>
+    </message>
   </context>
   
   <context>
@@ -501,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>
@@ -517,6 +751,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>COLOR</source>
       <translation>Color</translation>
     </message>
+    <message>
+      <source>IMAGE</source>
+      <translation>Image</translation>
+    </message>
     <message>
       <source>IMAGE_1</source>
       <translation>Image 1</translation>
@@ -529,6 +767,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>IMAGE_NAME</source>
       <translation>Image name</translation>
     </message>
+    <message>
+      <source>MODIFY_SELECTED_IMAGE</source>
+      <translation>Modify selected image</translation>
+    </message>
     <message>
       <source>NAME</source>
       <translation>Name</translation>
@@ -537,6 +779,10 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>PARAMETERS</source>
       <translation>Parameters</translation>
     </message>
+    <message>
+      <source>POLYLINE</source>
+      <translation>Polyline</translation>
+    </message>
     <message>
       <source>TRANSPARENT</source>
       <translation>Transparent</translation>
@@ -549,12 +795,48 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <source>CUT</source>
       <translation>Cut</translation>
     </message>
+    <message>
+      <source>CUT_IMAGES</source>
+      <translation>Cut images</translation>
+    </message>
+    <message>
+      <source>EDIT_CUT_IMAGE</source>
+      <translation>Edit cut image</translation>
+    </message>
+    <message>
+      <source>EDIT_FUSED_IMAGE</source>
+      <translation>Edit fused image</translation>
+    </message>
+    <message>
+      <source>EDIT_SPLITTED_IMAGE</source>
+      <translation>Edit splitted image</translation>
+    </message>
     <message>
       <source>FUSE</source>
       <translation>Fuse</translation>
     </message>
+    <message>
+      <source>FUSE_IMAGES</source>
+      <translation>Fuse images</translation>
+    </message>
+    <message>
+      <source>SPLIT</source>
+      <translation>Split</translation>
+    </message>
+    <message>
+      <source>SPLIT_IMAGE</source>
+      <translation>Split image</translation>
+    </message>
   </context>
-  
+
+  <context>
+    <name>HYDROGUI_UpdateImageOp</name>
+    <message>
+      <source>UPDATE_IMAGE</source>
+      <translation>Update image</translation>
+    </message>
+  </context>
+
   <context>
     <name>HYDROGUI_VisualStateOp</name>
     <message>
@@ -566,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>