Merge from V5_1_main branch 24/11/2010

diff --git a/configure.ac b/configure.ac
index 70fc2731ff8de7b7d3e4acaad9917f59cf945a2e..43470326a2e7e49467fe08e9d9ddb6d6eae6241a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 # Modified by : Marc Tajchman (CEA)
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project MULTIPR module],[6.1.0], [webmaster.salome@opencascade.com], [SalomeMULTIPR])
+AC_INIT([Salome2 Project MULTIPR module],[6.2.0], [webmaster.salome@opencascade.com], [SalomeMULTIPR])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -149,6 +149,14 @@ echo
 
 ENABLE_PTHREADS
 
+echo
+echo ---------------------------------------------
+echo testing MPI
+echo ---------------------------------------------
+echo
+
+CHECK_MPI
+
 echo
 echo ---------------------------------------------
 echo testing python
@@ -308,6 +316,19 @@ AC_OUTPUT_COMMANDS([ \
       chmod +x ./bin/*; \
 ])
 
+AC_CONFIG_COMMANDS([hack_libtool],[
+sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\
+  if test \"\$(echo \$[@] | grep -E '\\\-L/usr/lib(/../lib)?(64)? ')\" == \"\" \n\
+  then\n\
+    cmd=\"\1 \$[@]\"\n\
+  else\n\
+    cmd=\"\1 \"\`echo \$[@] | sed -r -e 's|(.*)-L/usr/lib(/../lib)?(64)? (.*)|\\\1\\\4 -L/usr/lib\\\3|g'\`\n\
+  fi\n\
+  \$cmd\n\
+}\n\
+CC=\"hack_libtool\"%g" libtool
+],[])
+
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
 # autoscan, the Makefile list is generated in the output file configure.scan.

diff --git a/src/MULTIPRGUI/MULTIPR_msg_en.ts b/src/MULTIPRGUI/MULTIPR_msg_en.ts
index b6e4816322191aaf2eece4e55c711dfa9910d097..fe1402e81671d9713d1b149a3d99e0e2adfed7ca 100644 (file)
--- a/src/MULTIPRGUI/MULTIPR_msg_en.ts
+++ b/src/MULTIPRGUI/MULTIPR_msg_en.ts
@@ -1,120 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<!--
-   Copyright (C) 2007-2010  CEA/DEN, EDF R&D
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License.
-
-   This library is distributed in the hope that it will be useful,
-   but MULTIPR_GUI ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--->
-
-<TS version="1.1" >
-    <context>
-        <name>@default</name>
-        <message>
-            <source>MULTIPR_BUT_OK</source>
-            <translation>OK</translation>
-        </message>
-        <message>
-            <source>MULTIPR_BUT_CANCEL</source>
-            <translation>Cancel</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_IMPORT_FROM_MED_FILE</source>
-            <translation>Import from MED file</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_IMPORT_FROM_MED_FILE</source>
-            <translation>Import from MED file</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_IMPORT_FROM_MED_FILE</source>
-            <translation>Open a sequential or a distributed MED file</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_SPLIT</source>
-            <translation>Split part</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_SPLIT</source>
-            <translation>Split part</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_SPLIT</source>
-            <translation>Split selected parts of the current distributed mesh</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_DECIMATE</source>
-            <translation>Decimate</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_DECIMATE</source>
-            <translation>Decimate</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_DECIMATE</source>
-            <translation>Decimate selected parts (build two new meshes at lower resolution)</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_REMOVE</source>
-            <translation>Remove</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_REMOVE</source>
-            <translation>Remove</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_REMOVE</source>
-            <translation>Remove selected parts</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_SAVE</source>
-            <translation>Save distributed mesh</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_SAVE</source>
-            <translation>Save distributed mesh</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_SAVE</source>
-            <translation>Save the current distributed MED file</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_FILE</source>
-            <translation>&amp;File</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_FILE_MULTIPR</source>
-            <translation>Multipr</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_MULTIPR</source>
-            <translation>Multipr</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TOOL_MULTIPR</source>
-            <translation>MULTIPR</translation>
-        </message>
-        <message>
-            <source>MULTIPR_FLT_ALL_FILES</source>
-            <translation>All Files (*.*)</translation>
-        </message>
-        <message>
-            <source>MULTIPR_FLT_MED_FILES</source>
-            <translation>MED Files (*.med)</translation>
-        </message>
-    </context>
+<TS version="2.0" language="en_US">
+<context>
+    <name>@default</name>
+    <message>
+        <source>MULTIPR_BUT_OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>MULTIPR_BUT_CANCEL</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_IMPORT_FROM_MED_FILE</source>
+        <translation>Import from MED file</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_IMPORT_FROM_MED_FILE</source>
+        <translation>Import from MED file</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_IMPORT_FROM_MED_FILE</source>
+        <translation>Open a sequential or a distributed MED file</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_SPLIT</source>
+        <translation>Split part</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_SPLIT</source>
+        <translation>Split part</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_SPLIT</source>
+        <translation>Split selected parts of the current distributed mesh</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_DECIMATE</source>
+        <translation>Decimate</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_DECIMATE</source>
+        <translation>Decimate</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_DECIMATE</source>
+        <translation>Decimate selected parts (build two new meshes at lower resolution)</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_REMOVE</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_REMOVE</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_REMOVE</source>
+        <translation>Remove selected parts</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_SAVE</source>
+        <translation>Save distributed mesh</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_SAVE</source>
+        <translation>Save distributed mesh</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_SAVE</source>
+        <translation>Save the current distributed MED file</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_FILE</source>
+        <translation>&amp;File</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_FILE_MULTIPR</source>
+        <translation>Multipr</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_MULTIPR</source>
+        <translation>Multipr</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TOOL_MULTIPR</source>
+        <translation>MULTIPR</translation>
+    </message>
+    <message>
+        <source>MULTIPR_FLT_ALL_FILES</source>
+        <translation>All Files (*.*)</translation>
+    </message>
+    <message>
+        <source>MULTIPR_FLT_MED_FILES</source>
+        <translation>MED Files (*.med)</translation>
+    </message>
+</context>
 </TS>
-
- 

diff --git a/src/MULTIPRGUI/MULTIPR_msg_fr.ts b/src/MULTIPRGUI/MULTIPR_msg_fr.ts
index b6e4816322191aaf2eece4e55c711dfa9910d097..a36230b02d949dfaa550d1658cf12f98ca3e8008 100644 (file)
--- a/src/MULTIPRGUI/MULTIPR_msg_fr.ts
+++ b/src/MULTIPRGUI/MULTIPR_msg_fr.ts
@@ -1,120 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<!--
-   Copyright (C) 2007-2010  CEA/DEN, EDF R&D
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License.
-
-   This library is distributed in the hope that it will be useful,
-   but MULTIPR_GUI ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
--->
-
-<TS version="1.1" >
-    <context>
-        <name>@default</name>
-        <message>
-            <source>MULTIPR_BUT_OK</source>
-            <translation>OK</translation>
-        </message>
-        <message>
-            <source>MULTIPR_BUT_CANCEL</source>
-            <translation>Cancel</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_IMPORT_FROM_MED_FILE</source>
-            <translation>Import from MED file</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_IMPORT_FROM_MED_FILE</source>
-            <translation>Import from MED file</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_IMPORT_FROM_MED_FILE</source>
-            <translation>Open a sequential or a distributed MED file</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_SPLIT</source>
-            <translation>Split part</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_SPLIT</source>
-            <translation>Split part</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_SPLIT</source>
-            <translation>Split selected parts of the current distributed mesh</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_DECIMATE</source>
-            <translation>Decimate</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_DECIMATE</source>
-            <translation>Decimate</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_DECIMATE</source>
-            <translation>Decimate selected parts (build two new meshes at lower resolution)</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_REMOVE</source>
-            <translation>Remove</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_REMOVE</source>
-            <translation>Remove</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_REMOVE</source>
-            <translation>Remove selected parts</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TLT_SAVE</source>
-            <translation>Save distributed mesh</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_SAVE</source>
-            <translation>Save distributed mesh</translation>
-        </message>
-        <message>
-            <source>MULTIPR_STS_SAVE</source>
-            <translation>Save the current distributed MED file</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_FILE</source>
-            <translation>&amp;File</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_FILE_MULTIPR</source>
-            <translation>Multipr</translation>
-        </message>
-        <message>
-            <source>MULTIPR_MEN_MULTIPR</source>
-            <translation>Multipr</translation>
-        </message>
-        <message>
-            <source>MULTIPR_TOOL_MULTIPR</source>
-            <translation>MULTIPR</translation>
-        </message>
-        <message>
-            <source>MULTIPR_FLT_ALL_FILES</source>
-            <translation>All Files (*.*)</translation>
-        </message>
-        <message>
-            <source>MULTIPR_FLT_MED_FILES</source>
-            <translation>MED Files (*.med)</translation>
-        </message>
-    </context>
+<TS version="2.0" language="fr_FR">
+<context>
+    <name>@default</name>
+    <message>
+        <source>MULTIPR_BUT_OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>MULTIPR_BUT_CANCEL</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_IMPORT_FROM_MED_FILE</source>
+        <translation>Importer du fichier MED</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_IMPORT_FROM_MED_FILE</source>
+        <translation>Importer du fichier MED</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_IMPORT_FROM_MED_FILE</source>
+        <translation>Ouvrir un fichier MED séquentiel ou distribué</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_SPLIT</source>
+        <translation>Séparer une partie</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_SPLIT</source>
+        <translation>Séparer une partie</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_SPLIT</source>
+        <translation>Séparer les parties choisies du maillage distribué</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_DECIMATE</source>
+        <translation>Décimer</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_DECIMATE</source>
+        <translation>Décimer</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_DECIMATE</source>
+        <translation>Décimer les parties choisies (construire deux nouveaux maillages d&apos;une résolution plus basse)</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_REMOVE</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_REMOVE</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_REMOVE</source>
+        <translation>Supprimer les parties choisies</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TLT_SAVE</source>
+        <translation>Sauvegarder le maillage distribué</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_SAVE</source>
+        <translation>Sauvegarder le maillage distribué</translation>
+    </message>
+    <message>
+        <source>MULTIPR_STS_SAVE</source>
+        <translation>Sauvegarder le fichier MED couramment distribué</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_FILE</source>
+        <translation>&amp;Fichier</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_FILE_MULTIPR</source>
+        <translation>Multipr</translation>
+    </message>
+    <message>
+        <source>MULTIPR_MEN_MULTIPR</source>
+        <translation>Multipr</translation>
+    </message>
+    <message>
+        <source>MULTIPR_TOOL_MULTIPR</source>
+        <translation>MULTIPR</translation>
+    </message>
+    <message>
+        <source>MULTIPR_FLT_ALL_FILES</source>
+        <translation>Tous les Fichiers (*.*)</translation>
+    </message>
+    <message>
+        <source>MULTIPR_FLT_MED_FILES</source>
+        <translation>Fichiers MED (*.med)</translation>
+    </message>
+</context>
 </TS>
-
-