]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Merge remote-tracking branch 'remotes/origin/BR_v14_rc' into BR_SHP_FORMAT
authorisn <isn@opencascade.com>
Tue, 23 Jun 2015 08:36:17 +0000 (11:36 +0300)
committerisn <isn@opencascade.com>
Tue, 23 Jun 2015 08:36:17 +0000 (11:36 +0300)
Conflicts:
src/HYDROGUI/resources/HYDROGUI_msg_en.ts

1  2 
src/HYDROGUI/resources/HYDROGUI_msg_en.ts

index 0490b1e6fe3a763283da15c410c2b008a34ac2bf,f8e4a527edb17b47c82e3c56b76a2a49186aa984..2353cfe96b90728753b8de46cd08f5e0bb60cab1
@@@ -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>