X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2Fresources%2FHYDROGUI_msg_en.ts;h=27f2979243879d75ef568f3f88180cec1909a260;hb=796341bf2581cfd65d7c69a187fa30d3288bfd78;hp=c99e1aa067336c30ce03e89b9281a6910f068447;hpb=0c76593b1d11353467fe978da4ad99549c59899e;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index c99e1aa0..27f29792 100644
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -60,6 +60,18 @@ does not exist or you have not enough permissions to open it.</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>
@@ -88,18 +100,6 @@ does not exist or you have not enough permissions to open it.</translation>
       <source>REMOVE</source>
       <translation>Remove</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>