From: isn <isn@opencascade.com>
Date: Tue, 23 Jun 2015 08:36:17 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/BR_v14_rc' into BR_SHP_FORMAT
X-Git-Tag: v1.4.2~34^2~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=91509fc95d80a88365f84eb941df6139d8a87dde;p=modules%2Fhydro.git

Merge remote-tracking branch 'remotes/origin/BR_v14_rc' into BR_SHP_FORMAT

Conflicts:
	src/HYDROGUI/resources/HYDROGUI_msg_en.ts
---

91509fc95d80a88365f84eb941df6139d8a87dde
diff --cc src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index 0490b1e6,f8e4a527..2353cfe9
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@@ -2251,7 -2222,14 +2255,14 @@@ file cannot be correctly imported for a
      </message>
    </context>
  
+   <context>
+     <name>HYDROGUI_ExportFileOp</name>
+     <message>
+       <source>EXPORT_POLYLINE</source>
+       <translation>Export polyline</translation>
+     </message>
+   </context>
 -   
 +  
    <context>
      <name>HYDROGUI_GeoreferencementDlg</name>
      <message>