From 5d972755c31afca2fd6e1a697a75afaee00cb59e Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 25 Nov 2010 12:41:29 +0000 Subject: [PATCH] Merge from V5_1_main branch 24/11/2010 --- configure.ac | 23 +++- src/MULTIPRGUI/MULTIPR_msg_en.ts | 215 ++++++++++++++----------------- src/MULTIPRGUI/MULTIPR_msg_fr.ts | 215 ++++++++++++++----------------- 3 files changed, 216 insertions(+), 237 deletions(-) diff --git a/configure.ac b/configure.ac index 70fc273..4347032 100644 --- 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 .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 b6e4816..fe1402e 100644 --- a/src/MULTIPRGUI/MULTIPR_msg_en.ts +++ b/src/MULTIPRGUI/MULTIPR_msg_en.ts @@ -1,120 +1,99 @@ + - - - - - @default - - MULTIPR_BUT_OK - OK - - - MULTIPR_BUT_CANCEL - Cancel - - - MULTIPR_MEN_IMPORT_FROM_MED_FILE - Import from MED file - - - MULTIPR_TLT_IMPORT_FROM_MED_FILE - Import from MED file - - - MULTIPR_STS_IMPORT_FROM_MED_FILE - Open a sequential or a distributed MED file - - - MULTIPR_TLT_SPLIT - Split part - - - MULTIPR_MEN_SPLIT - Split part - - - MULTIPR_STS_SPLIT - Split selected parts of the current distributed mesh - - - MULTIPR_TLT_DECIMATE - Decimate - - - MULTIPR_MEN_DECIMATE - Decimate - - - MULTIPR_STS_DECIMATE - Decimate selected parts (build two new meshes at lower resolution) - - - MULTIPR_TLT_REMOVE - Remove - - - MULTIPR_MEN_REMOVE - Remove - - - MULTIPR_STS_REMOVE - Remove selected parts - - - MULTIPR_TLT_SAVE - Save distributed mesh - - - MULTIPR_MEN_SAVE - Save distributed mesh - - - MULTIPR_STS_SAVE - Save the current distributed MED file - - - MULTIPR_MEN_FILE - &File - - - MULTIPR_MEN_FILE_MULTIPR - Multipr - - - MULTIPR_MEN_MULTIPR - Multipr - - - MULTIPR_TOOL_MULTIPR - MULTIPR - - - MULTIPR_FLT_ALL_FILES - All Files (*.*) - - - MULTIPR_FLT_MED_FILES - MED Files (*.med) - - + + + @default + + MULTIPR_BUT_OK + OK + + + MULTIPR_BUT_CANCEL + Cancel + + + MULTIPR_MEN_IMPORT_FROM_MED_FILE + Import from MED file + + + MULTIPR_TLT_IMPORT_FROM_MED_FILE + Import from MED file + + + MULTIPR_STS_IMPORT_FROM_MED_FILE + Open a sequential or a distributed MED file + + + MULTIPR_TLT_SPLIT + Split part + + + MULTIPR_MEN_SPLIT + Split part + + + MULTIPR_STS_SPLIT + Split selected parts of the current distributed mesh + + + MULTIPR_TLT_DECIMATE + Decimate + + + MULTIPR_MEN_DECIMATE + Decimate + + + MULTIPR_STS_DECIMATE + Decimate selected parts (build two new meshes at lower resolution) + + + MULTIPR_TLT_REMOVE + Remove + + + MULTIPR_MEN_REMOVE + Remove + + + MULTIPR_STS_REMOVE + Remove selected parts + + + MULTIPR_TLT_SAVE + Save distributed mesh + + + MULTIPR_MEN_SAVE + Save distributed mesh + + + MULTIPR_STS_SAVE + Save the current distributed MED file + + + MULTIPR_MEN_FILE + &File + + + MULTIPR_MEN_FILE_MULTIPR + Multipr + + + MULTIPR_MEN_MULTIPR + Multipr + + + MULTIPR_TOOL_MULTIPR + MULTIPR + + + MULTIPR_FLT_ALL_FILES + All Files (*.*) + + + MULTIPR_FLT_MED_FILES + MED Files (*.med) + + - - diff --git a/src/MULTIPRGUI/MULTIPR_msg_fr.ts b/src/MULTIPRGUI/MULTIPR_msg_fr.ts index b6e4816..a36230b 100644 --- a/src/MULTIPRGUI/MULTIPR_msg_fr.ts +++ b/src/MULTIPRGUI/MULTIPR_msg_fr.ts @@ -1,120 +1,99 @@ + - - - - - @default - - MULTIPR_BUT_OK - OK - - - MULTIPR_BUT_CANCEL - Cancel - - - MULTIPR_MEN_IMPORT_FROM_MED_FILE - Import from MED file - - - MULTIPR_TLT_IMPORT_FROM_MED_FILE - Import from MED file - - - MULTIPR_STS_IMPORT_FROM_MED_FILE - Open a sequential or a distributed MED file - - - MULTIPR_TLT_SPLIT - Split part - - - MULTIPR_MEN_SPLIT - Split part - - - MULTIPR_STS_SPLIT - Split selected parts of the current distributed mesh - - - MULTIPR_TLT_DECIMATE - Decimate - - - MULTIPR_MEN_DECIMATE - Decimate - - - MULTIPR_STS_DECIMATE - Decimate selected parts (build two new meshes at lower resolution) - - - MULTIPR_TLT_REMOVE - Remove - - - MULTIPR_MEN_REMOVE - Remove - - - MULTIPR_STS_REMOVE - Remove selected parts - - - MULTIPR_TLT_SAVE - Save distributed mesh - - - MULTIPR_MEN_SAVE - Save distributed mesh - - - MULTIPR_STS_SAVE - Save the current distributed MED file - - - MULTIPR_MEN_FILE - &File - - - MULTIPR_MEN_FILE_MULTIPR - Multipr - - - MULTIPR_MEN_MULTIPR - Multipr - - - MULTIPR_TOOL_MULTIPR - MULTIPR - - - MULTIPR_FLT_ALL_FILES - All Files (*.*) - - - MULTIPR_FLT_MED_FILES - MED Files (*.med) - - + + + @default + + MULTIPR_BUT_OK + OK + + + MULTIPR_BUT_CANCEL + Annuler + + + MULTIPR_MEN_IMPORT_FROM_MED_FILE + Importer du fichier MED + + + MULTIPR_TLT_IMPORT_FROM_MED_FILE + Importer du fichier MED + + + MULTIPR_STS_IMPORT_FROM_MED_FILE + Ouvrir un fichier MED séquentiel ou distribué + + + MULTIPR_TLT_SPLIT + Séparer une partie + + + MULTIPR_MEN_SPLIT + Séparer une partie + + + MULTIPR_STS_SPLIT + Séparer les parties choisies du maillage distribué + + + MULTIPR_TLT_DECIMATE + Décimer + + + MULTIPR_MEN_DECIMATE + Décimer + + + MULTIPR_STS_DECIMATE + Décimer les parties choisies (construire deux nouveaux maillages d'une résolution plus basse) + + + MULTIPR_TLT_REMOVE + Supprimer + + + MULTIPR_MEN_REMOVE + Supprimer + + + MULTIPR_STS_REMOVE + Supprimer les parties choisies + + + MULTIPR_TLT_SAVE + Sauvegarder le maillage distribué + + + MULTIPR_MEN_SAVE + Sauvegarder le maillage distribué + + + MULTIPR_STS_SAVE + Sauvegarder le fichier MED couramment distribué + + + MULTIPR_MEN_FILE + &Fichier + + + MULTIPR_MEN_FILE_MULTIPR + Multipr + + + MULTIPR_MEN_MULTIPR + Multipr + + + MULTIPR_TOOL_MULTIPR + MULTIPR + + + MULTIPR_FLT_ALL_FILES + Tous les Fichiers (*.*) + + + MULTIPR_FLT_MED_FILES + Fichiers MED (*.med) + + - - -- 2.39.2