Merge from V5_1_main branch 24/11/2010

diff --git a/configure.ac b/configure.ac
index 1a119e9019971b8f91c33533b72ddbb9e5f3042a..5146116841c2f37ef8440e92527a5794e86e8142 100644 (file)
--- 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 <filename>.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 5c65fc09729731a308d292315cb16b560ff370e0..1cc4e4f59a274105650ea3c077d192ba2b95cf31 100644 (file)
--- a/src/gui/GHS3DPRLPlugin_msg_en.ts
+++ b/src/gui/GHS3DPRLPlugin_msg_en.ts
@@ -1,58 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" >
-    <context>
-        <name>@default</name>
-        <message>
-            <source>GHS3DPRL_3D_HYPOTHESIS</source>
-            <translation>GHS3DPRL 3D</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_3D_TITLE</source>
-            <translation>Hypothesis Construction</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_KeepFiles</source>
-            <translation>Keep_Files</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_Background</source>
-            <translation>Tepal_in_Background</translation>
-        </message>
-         <message>
-            <source>GHS3DPRL_ToMeshHoles</source>
-            <translation>To_Mesh_Holes</translation>
-        </message>
-       <message>
-            <source>GHS3DPRL_MEDName</source>
-            <translation>MED_Name</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_NbPart</source>
-            <translation>Nb_Part</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_WhatsThis_KeepFiles</source>
-            <translation>Keep intemediates tepal Files (.faces,.points,.msg,.noboite...)</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_WhatsThis_Background</source>
-            <translation>lanch tepal in background (for a big mesh, a long time...)</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_WhatsThis_ToMeshHoles</source>
-            <translation>tepal meshes holes</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_WhatsThis_MEDName</source>
-            <translation>Generic path/name of finals outputs files (.med)</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_WhatsThis_Name</source>
-            <translation>Name of applied hypothese</translation>
-        </message>
-        <message>
-            <source>GHS3DPRL_WhatsThis_NbPart</source>
-            <translation>Number of partitions of initial wrap</translation>
-        </message>
-    </context>
+<TS version="2.0" language="en_US">
+<context>
+    <name>@default</name>
+    <message>
+        <source>GHS3DPRL_3D_HYPOTHESIS</source>
+        <translation>GHS3DPRL 3D</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_3D_TITLE</source>
+        <translation>Hypothesis Construction</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_KeepFiles</source>
+        <translation>Keep files</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_Background</source>
+        <translation>Tepal in background</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_ToMeshHoles</source>
+        <translation>To mesh holes</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_MEDName</source>
+        <translation>MED Name</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_NbPart</source>
+        <translation>Nb partitions</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_KeepFiles</source>
+        <translation>Keep intemediates Tepal Files (.faces,.points,.msg,.noboite...)</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_Background</source>
+        <translation>Lanch Tepal in background (for a big mesh, a long time...)</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_ToMeshHoles</source>
+        <translation>Tepal meshes holes</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_MEDName</source>
+        <translation>Generic path/name of finals outputs files (.med)</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_Name</source>
+        <translation>Name of applied hypothese</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_NbPart</source>
+        <translation>Number of partitions of initial wrap</translation>
+    </message>
+</context>
 </TS>

diff --git a/src/gui/GHS3DPRLPlugin_msg_fr.ts b/src/gui/GHS3DPRLPlugin_msg_fr.ts
new file mode 100755 (executable)
index 0000000..2758ea7
--- /dev/null
+++ b/src/gui/GHS3DPRLPlugin_msg_fr.ts
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+<context>
+    <name>@default</name>
+    <message>
+        <source>GHS3DPRL_3D_HYPOTHESIS</source>
+        <translation>GHS3DPRL 3D</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_3D_TITLE</source>
+        <translation>Construction d&apos;une hypothèse</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_KeepFiles</source>
+        <translation>Sauvegarder les fichiers</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_Background</source>
+        <translation>Tepal en arrière plan</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_ToMeshHoles</source>
+        <translation>Mailler les trous</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_MEDName</source>
+        <translation>Nom MED</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_NbPart</source>
+        <translation>Nombre de partitions</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_KeepFiles</source>
+        <translation>Préserver les fichiers Tepal intermédiaires (.faces,.points,.msg,.noboite...)</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_Background</source>
+        <translation>Lancer Tepal en arrière-plan (prend du temps pour un maillage de grand volume...)</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_ToMeshHoles</source>
+        <translation>Tepal maille les trous</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_MEDName</source>
+        <translation>Chemin/nom générique des fichiers de sortie finaux (.med)</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_Name</source>
+        <translation>Nom de l&apos;hypothèse appliquée</translation>
+    </message>
+    <message>
+        <source>GHS3DPRL_WhatsThis_NbPart</source>
+        <translation>Nombre de partitions de l&apos;enveloppe initiale</translation>
+    </message>
+</context>
+</TS>

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 54ec82bedfc3860febc928226a5a80e5b066a615..f2987edb58aae343fd6e4b41359d338128aee2c0 100644 (file)
--- 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