From: pascale.noyret <pascale.noyret@edf.fr>
Date: Fri, 12 Jun 2015 14:24:51 +0000 (+0200)
Subject: dernieres modifs
X-Git-Tag: PSEN_V1~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3fd4828d38ccea805a15c45e0517bf15b4e8f828;p=modules%2Feficas.git

dernieres modifs
---

diff --git a/CarmelCND/CarmelCND_Cata.py b/CarmelCND/CarmelCND_Cata.py
index 6348bc82..a8413ce9 100644
--- a/CarmelCND/CarmelCND_Cata.py
+++ b/CarmelCND/CarmelCND_Cata.py
@@ -64,7 +64,7 @@ VCUT=OPER(nom='VCUT',op=None,sd_prod=vcut,UIinfo = { "groupes" : ( "CACHE", ) },
 )
 ZS=OPER(nom='ZS',op=None,sd_prod=zs,UIinfo = { "groupes" : ( "CACHE", ) },
                 Conductivite=SIMP(statut='o',typ='R',),
-                Permeabilite=SIMP(statut='o',typ='R',),
+                PermeabiliteRelative=SIMP(statut='o',typ='R',),
 )
 PARAMETRES=PROC(nom='PARAMETRES',op=None, UIinfo = { "groupes" : ( "CACHE", ) },
              RepCarmel=SIMP(typ='Repertoire',fr= "Repertoire Carmel",ang= "Carmel Directory",statut= "o",defaut="/projets/projets.002/carmel3d.001/frequentiel/V_240/Compil"),
diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 2be9a3c0..9f6d10ba 100644
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -1004,7 +1004,7 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
             the name of the saved file
         """
 
-        #self.modified=1
+        self.modified=1
         if not self.modified and not saveas:
             return (0, None)      # do nothing if text wasn't changed
 
diff --git a/UiQT4/eficas_en.ts b/UiQT4/eficas_en.ts
index e88eda07..a59f7212 100644
--- a/UiQT4/eficas_en.ts
+++ b/UiQT4/eficas_en.ts
@@ -1925,7 +1925,7 @@ Le fichier associe n&apos;est pas defini</source>
     <message>
         <location filename="../../Noyau/N_VALIDATOR.py" line="274"/>
         <source>La valeur : %s  ne fait pas partie des choix possibles %s</source>
-        <translation>value %s is not valid</translation>
+        <translation>value %s is not valid. must be in %s</translation>
     </message>
     <message>
         <location filename="../../Noyau/N_VALIDATOR.py" line="306"/>
@@ -2300,7 +2300,7 @@ Le fichier associe n&apos;est pas defini</source>
     <message>
         <location filename="../../UiQT4/desChoixCommandes.ui" line="73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Affichage&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Order&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../../UiQT4/desChoixCommandes.ui" line="82"/>