From: vsr Date: Thu, 25 Nov 2010 12:49:21 +0000 (+0000) Subject: Merge from V5_1_main branch 24/11/2010 X-Git-Tag: V6_2_0a1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7481655bb2bdca871a4e85c416b60596db2d58e3;p=plugins%2Fghs3dprlplugin.git Merge from V5_1_main branch 24/11/2010 --- diff --git a/configure.ac b/configure.ac index 1a119e9..5146116 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # --- # -AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [6.1.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN]) +AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [6.2.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -431,6 +431,19 @@ echo # chmod +x ./bin/salome/*; #]) +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/gui/GHS3DPRLPlugin_msg_en.ts b/src/gui/GHS3DPRLPlugin_msg_en.ts index 5c65fc0..1cc4e4f 100644 --- a/src/gui/GHS3DPRLPlugin_msg_en.ts +++ b/src/gui/GHS3DPRLPlugin_msg_en.ts @@ -1,58 +1,59 @@ + - - - @default - - GHS3DPRL_3D_HYPOTHESIS - GHS3DPRL 3D - - - GHS3DPRL_3D_TITLE - Hypothesis Construction - - - GHS3DPRL_KeepFiles - Keep_Files - - - GHS3DPRL_Background - Tepal_in_Background - - - GHS3DPRL_ToMeshHoles - To_Mesh_Holes - - - GHS3DPRL_MEDName - MED_Name - - - GHS3DPRL_NbPart - Nb_Part - - - GHS3DPRL_WhatsThis_KeepFiles - Keep intemediates tepal Files (.faces,.points,.msg,.noboite...) - - - GHS3DPRL_WhatsThis_Background - lanch tepal in background (for a big mesh, a long time...) - - - GHS3DPRL_WhatsThis_ToMeshHoles - tepal meshes holes - - - GHS3DPRL_WhatsThis_MEDName - Generic path/name of finals outputs files (.med) - - - GHS3DPRL_WhatsThis_Name - Name of applied hypothese - - - GHS3DPRL_WhatsThis_NbPart - Number of partitions of initial wrap - - + + + @default + + GHS3DPRL_3D_HYPOTHESIS + GHS3DPRL 3D + + + GHS3DPRL_3D_TITLE + Hypothesis Construction + + + GHS3DPRL_KeepFiles + Keep files + + + GHS3DPRL_Background + Tepal in background + + + GHS3DPRL_ToMeshHoles + To mesh holes + + + GHS3DPRL_MEDName + MED Name + + + GHS3DPRL_NbPart + Nb partitions + + + GHS3DPRL_WhatsThis_KeepFiles + Keep intemediates Tepal Files (.faces,.points,.msg,.noboite...) + + + GHS3DPRL_WhatsThis_Background + Lanch Tepal in background (for a big mesh, a long time...) + + + GHS3DPRL_WhatsThis_ToMeshHoles + Tepal meshes holes + + + GHS3DPRL_WhatsThis_MEDName + Generic path/name of finals outputs files (.med) + + + GHS3DPRL_WhatsThis_Name + Name of applied hypothese + + + GHS3DPRL_WhatsThis_NbPart + Number of partitions of initial wrap + + diff --git a/src/gui/GHS3DPRLPlugin_msg_fr.ts b/src/gui/GHS3DPRLPlugin_msg_fr.ts new file mode 100755 index 0000000..2758ea7 --- /dev/null +++ b/src/gui/GHS3DPRLPlugin_msg_fr.ts @@ -0,0 +1,59 @@ + + + + + @default + + GHS3DPRL_3D_HYPOTHESIS + GHS3DPRL 3D + + + GHS3DPRL_3D_TITLE + Construction d'une hypothèse + + + GHS3DPRL_KeepFiles + Sauvegarder les fichiers + + + GHS3DPRL_Background + Tepal en arrière plan + + + GHS3DPRL_ToMeshHoles + Mailler les trous + + + GHS3DPRL_MEDName + Nom MED + + + GHS3DPRL_NbPart + Nombre de partitions + + + GHS3DPRL_WhatsThis_KeepFiles + Préserver les fichiers Tepal intermédiaires (.faces,.points,.msg,.noboite...) + + + GHS3DPRL_WhatsThis_Background + Lancer Tepal en arrière-plan (prend du temps pour un maillage de grand volume...) + + + GHS3DPRL_WhatsThis_ToMeshHoles + Tepal maille les trous + + + GHS3DPRL_WhatsThis_MEDName + Chemin/nom générique des fichiers de sortie finaux (.med) + + + GHS3DPRL_WhatsThis_Name + Nom de l'hypothèse appliquée + + + GHS3DPRL_WhatsThis_NbPart + Nombre de partitions de l'enveloppe initiale + + + diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 54ec82b..f2987ed 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -66,4 +66,5 @@ libGHS3DPRLPluginGUI_la_LDFLAGS = \ # resources files nodist_salomeres_DATA = \ GHS3DPRLPlugin_images.qm \ - GHS3DPRLPlugin_msg_en.qm + GHS3DPRLPlugin_msg_en.qm \ + GHS3DPRLPlugin_msg_fr.qm