From 796341bf2581cfd65d7c69a187fa30d3288bfd78 Mon Sep 17 00:00:00 2001
From: rkv <rkv@opencascade.com>
Date: Fri, 1 Nov 2013 07:07:52 +0000
Subject: [PATCH] - Selected merge type translation is fixed.

---
 src/HYDROGUI/resources/HYDROGUI_msg_en.ts | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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>
-- 
2.30.2