Mise à jour des messages et défaut

diff --git a/src/SMESH/MG_ADAPT.cxx b/src/SMESH/MG_ADAPT.cxx
index 2445d8cdba0ef42666fd66ca74baf6a9c7867b72..b59fde86655b48ec0bbd8367c8a6e544566b6aae 100644 (file)
--- a/src/SMESH/MG_ADAPT.cxx
+++ b/src/SMESH/MG_ADAPT.cxx
@@ -45,14 +45,14 @@ static std::string removeFile(std::string fileName, int& notOk)
        notOk = std::remove(fileName.c_str());
        if (notOk) errStr = ToComment(" \n error while removing file : ")
                  << fileName;
-    else errStr= ToComment("\n file : ")<< fileName << " succesfully deleted! \n ";      
-    
-    return errStr; 
+    else errStr= ToComment("\n file : ")<< fileName << " succesfully deleted! \n ";
+
+    return errStr;
 }
 std::string remove_extension(const std::string& filename) {
     size_t lastdot = filename.find_last_of(".");
     if (lastdot == std::string::npos) return filename;
-    return filename.substr(0, lastdot); 
+    return filename.substr(0, lastdot);
 }
 namespace
 {
@@ -176,7 +176,7 @@ void MgAdapt::buildModel()
 
     _defaultOptionValues["adaptation"                         ] = "both";
     _defaultOptionValues["components"                         ] = "outside components";
-    _defaultOptionValues["compute_ridges"                         ] = "yes";
+    _defaultOptionValues["compute_ridges"                     ] = "yes";
     _defaultOptionValues["max_memory"                         ] = ToComment(defaultMaximumMemory());
 }
 
@@ -295,11 +295,11 @@ void MgAdapt::setTimeStepRankLast()
        myUseNoTimeStep = false;
        //~med_int aRank, tmst;
        //~std::string fieldFile = useBackgroundMap ? sizeMapFile : medFileIn;
-       //~getTimeStepInfos(fieldFile, tmst, aRank);    
+       //~getTimeStepInfos(fieldFile, tmst, aRank);
        //~setRankTimeStep((int) tmst, (int) aRank);
 }
 void MgAdapt::setNoTimeStep()
-{      
+{
        myUseLastTimeStep = false;
        myUseChosenTimeStep = false;
        myUseNoTimeStep = true;
@@ -308,7 +308,7 @@ void MgAdapt::setNoTimeStep()
        //~setRankTimeStep(tmst, aRank);
 }
 void MgAdapt::setChosenTimeStepRank()
-{      
+{
        myUseLastTimeStep = false;
        myUseChosenTimeStep = true;
        myUseNoTimeStep = false;
@@ -481,7 +481,7 @@ bool MgAdapt::setAll()
     else if (data->myUseLastTimeStep)
         setTimeStepRankLast();
     else
-       {    
+       {
                setChosenTimeStepRank();
                setRankTimeStep(data->myTimeStep, data->myRank);
        }
@@ -521,7 +521,7 @@ throw (std::invalid_argument)
 
     if (op_val->second != optionValue)
     {
-               
+
                std::string lowerOptionValue = toLowerStr(optionValue);
         const char* ptr = lowerOptionValue.c_str();
         // strip white spaces
@@ -536,7 +536,7 @@ throw (std::invalid_argument)
         if (i == 0) {
             // empty string
         } else if (_charOptions.count(optionName)) {
-            // do not check strings 
+            // do not check strings
         } else if (_doubleOptions.count(optionName)) {
             // check if value is double
             toDbl(ptr, &typeOk);
@@ -621,7 +621,7 @@ throw (std::invalid_argument)
 }
 //================================================================================
 /*!
- * \brief Converts a string to a lower 
+ * \brief Converts a string to a lower
  */
 //================================================================================
 std::string MgAdapt::toLowerStr(const std::string& str)
@@ -743,10 +743,10 @@ void MgAdapt::execCmd( const char* cmd, int& err)
        }
        else
        {
-          buf = std::cout.rdbuf();     
+          buf = std::cout.rdbuf();
        }
        std::ostream logStream(buf);
-       
+
     std::unique_ptr <FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose );
     if(!pipe)
     {
@@ -759,9 +759,9 @@ void MgAdapt::execCmd( const char* cmd, int& err)
     err = 0;
 }
 /*
- * to delete tmp files .mesh, .sol and if needed  
+ * to delete tmp files .mesh, .sol and if needed
  * the log file
- * 
+ *
  */
 void MgAdapt::cleanUp()
 {
@@ -769,9 +769,9 @@ void MgAdapt::cleanUp()
        std::string errStr;
        if(toKeepWorkingFiles)
            return;
-       if(removeOnSuccess && printLogInFile) 
+       if(removeOnSuccess && printLogInFile)
            tmpFilesToBeDeleted.push_back(logFile);
-       
+
        std::vector< std::string>::iterator it = tmpFilesToBeDeleted.begin();
        for (; it!=tmpFilesToBeDeleted.end(); ++it)
        {
@@ -780,16 +780,16 @@ void MgAdapt::cleanUp()
                {
                        appendMsgToLogFile(errStr);
                }
-               
+
        }
 }
 
 void MgAdapt::appendMsgToLogFile(std::string& msg)
 {
-       std::ofstream logStream;        
+       std::ofstream logStream;
        logStream.open(logFile, std::ofstream::out | std::ofstream::app);
        logStream<< msg;
-    logStream.close(); 
+    logStream.close();
 }
 //================================================================================
 /*!
@@ -849,13 +849,13 @@ std::string MgAdapt::getCommandToRun()
         cmd+= " --write_sizemap "+ solFileOut;
                solFormatOutput.push_back(solFileOut);
                tmpFilesToBeDeleted.push_back(solFileOut);
-       } 
+       }
     if (verbosityLevel != defaultVerboseLevel())
     {
 
         cmd+= " --verbose "+ ToComment(verbosityLevel);
     }
-       
+
     std::string option, value;
     bool isDefault;
     const TOptionValues* options[] = { &_option2value, &_customOption2value };
@@ -1261,7 +1261,7 @@ void MgAdapt::restorefams(MEDCoupling::MEDFileMesh* fileMesh) const
     std::vector<family>::const_iterator fIt = famVec.begin();
 
     for (; fIt!=famVec.end(); ++fIt)
-    {  
+    {
                try  //
         {
                        std::string givenFamNameFromMeshGemConverter = fileMesh->getFamilyNameGivenId( std::abs(fIt->_famId) );
@@ -1271,7 +1271,7 @@ void MgAdapt::restorefams(MEDCoupling::MEDFileMesh* fileMesh) const
         catch (const std::exception& e)
         {
             std::cerr<<e.what();
-        }  
+        }
     }
 }
 
@@ -1295,7 +1295,7 @@ void MgAdapt::buildConstantSizeMapSolFile(const std::string& solFormatFieldFileN
     int fileId = writer.GmfOpenMesh( solFormatFieldFileName.c_str(), GmfWrite, version, dim);
     int typTab[] = {GmfSca};
     writer.GmfSetKwd(fileId, MeshFormat::GmfSolAtVertices, (int)nbNodes, 1, typTab);
-    for (mcIdType i = 0; i<nbNodes; i++) 
+    for (mcIdType i = 0; i<nbNodes; i++)
     {
                double valTab[1] = {constantValue};
                writer.GmfSetLin( fileId, MeshFormat::GmfSolAtVertices, valTab);
@@ -1322,7 +1322,7 @@ void MgAdapt::buildBackGroundMeshAndSolFiles(const std::vector<std::string>& fie
        tmpWriter.setMeshFileName(meshFormatsizeMapFile);
        tmpWriter.setFieldFileNames( fieldFileNames);
        tmpWriter.setMEDFileDS(tmpMfd);
-       tmpWriter.write();      
+       tmpWriter.write();
 }
 // =======================================================================
 med_idt MgAdapt::openMedFile(const std::string aFile)
@@ -1413,8 +1413,8 @@ void MgAdapt::getTimeStepInfos(std::string aFile, med_int& numdt, med_int& numit
                if(tmp_numdt > numdt)
                {
                    numdt = tmp_numdt;
-                       numit = tmp_numit;          
-               } 
+                       numit = tmp_numit;
+               }
        }
     if ( erreur < 0 )
     {
@@ -1434,7 +1434,7 @@ void MgAdapt::getTimeStepInfos(std::string aFile, med_int& numdt, med_int& numit
 
 void MgAdapt::updateTimeStepRank()
 {
-       
+
     med_int arank;
     med_int tmst;
     if (myUseNoTimeStep)

diff --git a/src/SMESHGUI/MG_ADAPTGUI.cxx b/src/SMESHGUI/MG_ADAPTGUI.cxx
index dcca5a7a6db6daf149270db16c00030bb72e5e8e..1e4b4a5dfae517662215702a5bea43c78ab5e317 100644 (file)
--- a/src/SMESHGUI/MG_ADAPTGUI.cxx
+++ b/src/SMESHGUI/MG_ADAPTGUI.cxx
@@ -124,12 +124,12 @@ void  SMESHGUI_MgAdaptDlg::buildDlg()
     SMESH::str_array* str = model->getOptionValuesStrVec();
     SMESH::str_array* str2 = model->getCustomOptionValuesStrVec();
     std::vector<std::string> s;
-    for (int i = 0; i< str->length(); i++) s.push_back( (*str)[i].in()); 
-    for (int j = str->length(); j< str2->length(); j++) s.push_back((*str2)[ j - str->length() ].in() ); 
+    for (int i = 0; i< str->length(); i++) s.push_back( (*str)[i].in());
+    for (int j = str->length(); j< str2->length(); j++) s.push_back((*str2)[ j - str->length() ].in() );
     //~str.insert( str.end(), str2.begin(), str2.end() );
 
     myAdvOpt = new MgAdaptAdvWidget(myTabWidget, &s);
-        
+
     int argsTab = myTabWidget->addTab( myArgs, tr( "Args" ) );
     int advTab = myTabWidget->addTab( myAdvOpt, tr( "ADVOP" ) );
 
@@ -597,6 +597,7 @@ SMESHGUI_MgAdaptArguments::SMESHGUI_MgAdaptArguments( QWidget* parent )
     // Initial state
     setMode( Mesh, Local);
     medFileCheckBox->setChecked(true);
+    visibleTimeStepRankLabel (false);
 
     // Connections
     connect( meshInGroup, SIGNAL( buttonClicked( int ) ),  this, SLOT( modeChanged( int ) ) );
@@ -622,46 +623,39 @@ void SMESHGUI_MgAdaptArguments::onNoTimeStep(bool disableOther)
 {
     noTimeStep->setChecked(true);
 
-    rankLabel->setVisible(0);
-    rankSpinBox->setVisible(0);
+    visibleTimeStepRankLabel (false);
     rankSpinBox->setValue(-2);
-
-    timeStepLabel->setVisible(0);
-    timeStep->setVisible(0);
     timeStep->setValue(-2);
 
     lastTimeStep->setDisabled(disableOther);
     chosenTimeStep->setDisabled(disableOther);
-
-
 }
 void SMESHGUI_MgAdaptArguments::onLastTimeStep(bool disableOther)
 {
     lastTimeStep->setChecked(true);
 
-    rankLabel->setVisible(0);
-    rankSpinBox->setVisible(0);
+    visibleTimeStepRankLabel (false);
     rankSpinBox->setValue(-1);
-
-    timeStepLabel->setVisible(0);
-    timeStep->setVisible(0);
     timeStep->setValue(-1);
     noTimeStep->setDisabled(disableOther);
 }
-
 void SMESHGUI_MgAdaptArguments::onChosenTimeStep(bool disableOther, int max)
 {
     chosenTimeStep->setChecked(true);
 
-    rankLabel->setVisible(1);
-    rankSpinBox->setVisible(1);
+    visibleTimeStepRankLabel (true);
     rankSpinBox->setValue(0);
-
-    timeStepLabel->setVisible(1);
-    timeStep->setVisible(1);
     timeStep->setValue(0);
     if (max) timeStep->setMaximum(max);
+}
 
+void SMESHGUI_MgAdaptArguments::visibleTimeStepRankLabel(bool visible)
+{
+    rankLabel->setVisible(visible);
+    rankSpinBox->setVisible(visible);
+
+    timeStepLabel->setVisible(visible);
+    timeStep->setVisible(visible);
 }
 
 void SMESHGUI_MgAdaptArguments::onSelectOutMedFilebutton()
@@ -994,12 +988,12 @@ void MgAdaptAdvWidget::AddOption( const char* option, bool isCustom )
                if(it != optionTreeWidgetItem.end()) return; // option exist
                else
                {
-                       row = getNewQTreeWidgetItem(table, option, name, isCustom); 
-               } 
+                       row = getNewQTreeWidgetItem(table, option, name, isCustom);
+               }
        }
-       else 
+       else
        {
-               row = getNewQTreeWidgetItem(table, option, name, isCustom); 
+               row = getNewQTreeWidgetItem(table, option, name, isCustom);
        }
     row->setText( 0, tr( name.toLatin1().constData() ));
     row->setText( 1, tr( value.toLatin1().constData() ));
@@ -1019,8 +1013,8 @@ QTreeWidgetItem* MgAdaptAdvWidget::getNewQTreeWidgetItem(QTreeWidget* table, con
        QTreeWidgetItem* row = new QTreeWidgetItem( table );
        row->setData( NAME_COL, EDITABLE_ROLE, int( isCustom && !option ));
        row->setFlags( row->flags() | Qt::ItemIsEditable );
-       optionTreeWidgetItem.insert(std::pair <QString, QTreeWidgetItem*> (name, row)); 
-       
+       optionTreeWidgetItem.insert(std::pair <QString, QTreeWidgetItem*> (name, row));
+
        return row;
 }
 
@@ -1167,34 +1161,34 @@ void MgAdaptAdvWidget::onMeshDimChanged(ADAPTATION_MODE aMode)
        /* default adaptation mode
         * assume that if meshDim == 2 -->adaptation surface
         * if meshDim == 3 and  if there is not 2D mesh -->VOLUME
-        * else BOTH 
+        * else BOTH
         */
-        
+
         QString adaptation("adaptation"), value;
         switch(aMode)
         {
         case ADAPTATION_MODE::SURFACE:
-        {      
-            value ="surface";           
+        {
+            value ="surface";
             setOptionValue(adaptation, value);
             break;
         }
         case ADAPTATION_MODE::BOTH :
         {
-                value = "both";         
+                value = "both";
                 setOptionValue(adaptation, value);
                 break;
         }
         case ADAPTATION_MODE::VOLUME :
         {
-                value = "volume"; 
+                value = "volume";
                 setOptionValue(adaptation, value);
                 break;
         }
-        } 
+        }
 }
 void MgAdaptAdvWidget::setOptionValue(QString& option, QString& value)
-{       
+{
 
        std::map<QString, QTreeWidgetItem *>::iterator it = optionTreeWidgetItem.find(option);
        if (it != optionTreeWidgetItem.end())
@@ -1450,7 +1444,7 @@ std::map<QString, int> GetListeChamps(QString aFile, bool errorMessage)
 std::string remove_extension(const std::string& filename) {
     size_t lastdot = filename.find_last_of(".");
     if (lastdot == std::string::npos) return filename;
-    return filename.substr(0, lastdot); 
+    return filename.substr(0, lastdot);
 }
 
 

diff --git a/src/SMESHGUI/MG_ADAPTGUI.hxx b/src/SMESHGUI/MG_ADAPTGUI.hxx
index 7b50a32a502575ce50598386793a55f1d7a05953..2319d735c09cffa666531f99a4b1df9e6194bf60 100644 (file)
--- a/src/SMESHGUI/MG_ADAPTGUI.hxx
+++ b/src/SMESHGUI/MG_ADAPTGUI.hxx
@@ -102,10 +102,10 @@ med_idt OuvrirFichier(QString aFile);
 std::string remove_extension(const std::string& filename);\r
 \r
 \r
-enum ADAPTATION_MODE{
+enum ADAPTATION_MODE{\r
        SURFACE, // surface adaption when meshDim == 2\r
-       VOLUME, //  \r
-       BOTH   
+       VOLUME, //\r
+       BOTH\r
 };\r
 //=================================================================================\r
 // class    : SMESHGUI_MgAdaptDlg\r
@@ -238,6 +238,7 @@ private slots:
     void onNoTimeStep(bool disableOther = false);\r
     void onLastTimeStep(bool disableOther = false);\r
     void onChosenTimeStep(bool disableOther = false, int max = 0);\r
+    void visibleTimeStepRankLabel(bool visible);\r
 \r
 private:\r
 \r
@@ -297,7 +298,7 @@ private slots:
 private:\r
     void setOptionValue(QString& option, QString& value);\r
     std::map<QString, QTreeWidgetItem *> optionTreeWidgetItem;\r
-    \r
+\r
     QTreeWidgetItem* getNewQTreeWidgetItem(QTreeWidget* table, const char* option, QString& name, bool isCustom);\r
 \r
 };\r

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index fde42d2f404b8363f10c85844cb1db000bc35390..90a784488f3c68750d009cfbf6a69efaed4ca936 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -396,7 +396,7 @@
         <source>Publish_MG_ADAPT</source>
         <translation>Publish</translation>
     </message>
-<message>
+    <message>
         <source>SIZE_MAP_FIELD</source>
         <translation>Size map field</translation>
     </message>
@@ -3137,37 +3137,13 @@ Check algorithm documentation for supported geometry</translation>
         <source>ADAPT_PREF_MG_ADAPT_SIZE_MAP_BACKGROUND</source>
         <translation>Background</translation>
     </message>
-    <message>
-        <source>ADAPT_PREF_MG_ADAPT_MED_SIZE_MAP_BACKGROUND</source>
-        <translation>MED file background size map</translation>
-    </message>
-    <message>
-        <source>ADAPT_PREF_MG_ADAPT_TIME_STEP</source>
-        <translation>Time step</translation>
-    </message>
-    <message>
-        <source>ADAPT_PREF_MG_ADAPT_NO_TIME_STEP</source>
-        <translation>No time step</translation>
-    </message>
     <message>
         <source>ADAPT_PREF_MG_ADAPT_TIME_STEP_LAST</source>
         <translation>Last</translation>
     </message>
     <message>
-        <source>ADAPT_PREF_MG_ADAPT_AR</source>
-        <translation>Arguments</translation>
-    </message>
-    <message>
-        <source>ADAPT_PREF_MG_ADAPT_ADVOP</source>
-        <translation>Advanced Options</translation>
-    </message>
-    <message>
-        <source>ADAPT_PREF_MG_ADAPT_TIME_LAST_STEP</source>
-        <translation>Last time step</translation>
-    </message>
-    <message>
-        <source>ADAPT_PREF_MG_ADAPT_TIME_C_STEP</source>
-        <translation>Chosen time step</translation>
+        <source>ADAPT_PREF_MG_ADAPT_TIME_STEP</source>
+        <translation>Choosen time step</translation>
     </message>
     <message>
         <source>ADAPT_PREF_MG_ADAPT_TIME_STEP_C</source>
@@ -3177,6 +3153,10 @@ Check algorithm documentation for supported geometry</translation>
         <source>MG_ADAPT_SELECT_FILE_0</source>
         <translation>MG-ADAPT select file</translation>
     </message>
+    <message>
+        <source>ADAPT_PREF_MG_ADAPT_ADVOP</source>
+        <translation>Advanced Options</translation>
+    </message>
     <message>
         <source>SMESH_VISU_PROBLEM</source>
         <translation>Mesh visualization failed</translation>

diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index 4177ac636e6dfdc10e47261370cd7c040b1b6fbe..a23d20e5a1184e1b91aeb64a20eaeb87a38477ba 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -340,6 +340,150 @@
         <source>MEN_CONSTRUCT_GROUP</source>
         <translation>Construire un groupe</translation>
     </message>
+    <message>
+        <source>MEN_REF_ALL</source>
+        <translation>Raffinement uniforme</translation>
+    </message>
+    <message>
+        <source>MEN_REF_HOMARD</source>
+        <translation>Raffinement avec HOMARD</translation>
+    </message>
+    <message>
+        <source>MEN_HOMARD_CREATE_CASE</source>
+        <translation>Création d'un cas d'adaptation</translation>
+    </message>
+    <message>
+        <source>MEN_HOMARD_FOLLOW_ITERATION</source>
+        <translation>Poursuite d'une itération d'adaptation</translation>
+    </message>
+    <message>
+        <source>MEN_HOMARD_NEW_ITERATION</source>
+        <translation>Création d'une itération d'adaptation</translation>
+    </message>
+    <message>
+        <source>MEN_HOMARD_COMPUTE</source>
+        <translation>Calculer</translation>
+    </message>
+    <message>
+        <source>MEN_HOMARD_COMPUTE_PUBLISH</source>
+        <translation>Calculer et publier</translation>
+    </message>
+    <message>
+        <source>MEN_MG_ADAPT</source>
+        <translation>Remaillage avec MG_Adapt</translation>
+    </message>
+    <message>
+        <source>Args</source>
+        <translation>Arguments</translation>
+    </message>
+    <message>
+        <source>MeshOut</source>
+        <translation>Maillage en sortie</translation>
+    </message>
+    <message>
+        <source>MeshIn</source>
+        <translation>Maillage en entrée</translation>
+    </message>
+    <message>
+        <source>MEDFile</source>
+        <translation>Fichier MED</translation>
+    </message>
+    <message>
+        <source>Browser</source>
+        <translation>Arbre d'études</translation>
+    </message>
+    <message>
+        <source>Publish_MG_ADAPT</source>
+        <translation>Publication</translation>
+    </message>
+    <message>
+        <source>SIZE_MAP_FIELD</source>
+        <translation>Champ de la carte de taille</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_FIELD_NAME</source>
+        <translation>Nom du champ</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_MED_FILE_1</source>
+        <translation>Ce fichier MED est illisible.</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_MED_FILE_2</source>
+        <translation>Ce fichier MED ne contient aucun maillage.</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_MED_FILE_3</source>
+        <translation>Ce fichier MED contient plus d'un maillage.</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_MED_FILE_4</source>
+        <translation>Impossible de lire le maillage de ce fichier MED.</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_MED_FILE_5</source>
+        <translation>Ce fichier MED ne contient aucun champ.</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_MED_FILE_6</source>
+        <translation>Impossible de lire le(s) champ(s) de ce fichier MED.</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_ERROR</source>
+        <translation>Erreur</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_CH_ST</source>
+        <translation>Pas de temps choisi</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_RANK</source>
+        <translation>Numéro d'ordre</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_TSTP</source>
+        <translation>Pas de temps </translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_NO_T_ST</source>
+        <translation>Sans pas de temps</translation>
+    </message>
+    <message>
+        <source>MG_ADAPT_L_ST</source>
+        <translation>Dernier pas de temps</translation>
+    </message>
+    <message>
+        <source>MeshName</source>
+        <translation>Nom du maillage</translation>
+    </message>
+    <message>
+        <source>LOCAL_MG_ADAPT</source>
+        <translation>Locale</translation>
+    </message>
+    <message>
+        <source>BACKGRND_MG_ADAPT</source>
+        <translation>Arrière-plan</translation>
+    </message>
+    <message>
+        <source>CNST_MG_ADAPT</source>
+        <translation>Constante</translation>
+    </message>
+    <message>
+        <source>MED_FILE_BCKG</source>
+        <translation>Fichier MED de la carte en arrière-plan</translation>
+    </message>
+    <message>
+        <source>VALUE_MG_ADAPT</source>
+        <translation>Valeur</translation>
+    </message>
+    <message>
+        <source>SIZE_MAP_DEF</source>
+        <translation>Définition de la carte de taille</translation>
+    </message>
+    <message>
+        <source>ADVOP</source>
+        <translation>Options avancées</translation>
+    </message>
     <message>
         <source>MEN_CONV_TO_QUAD</source>
         <translation>Convertir vers/depuis quadratique</translation>
@@ -792,114 +936,6 @@
         <source>MEN_ADAPT</source>
         <translation>Adaptation</translation>
     </message>
-    <message>
-        <source>Args</source>
-        <translation>Arguments</translation>
-    </message>
-    <message>
-        <source>MeshOut</source>
-        <translation>Maillage en sortie</translation>
-    </message>
-    <message>
-        <source>MEDFile</source>
-        <translation>Fichier MED</translation>
-    </message>
-    <message>
-        <source>Browser</source>
-        <translation>Arbre d'études</translation>
-    </message>
-    <message>
-        <source>BACKGRND_MG_ADAPT</source>
-        <translation>Arrière-plan</translation>
-    </message>
-    <message>
-        <source>CNST_MG_ADAPT</source>
-        <translation>Constante</translation>
-    </message>
-<message>
-        <source>SIZE_MAP_FIELD</source>
-        <translation>Champ de la carte de taille</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_FIELD_NAME</source>
-        <translation>Nom du champ</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_MED_FILE_1</source>
-        <translation>Ce fichier MED est illisible.</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_MED_FILE_2</source>
-        <translation>Ce fichier MED ne contient aucun maillage.</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_MED_FILE_3</source>
-        <translation>Ce fichier MED contient plus d'un maillage.</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_MED_FILE_4</source>
-        <translation>Impossible de lire le maillage de ce fichier MED.</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_MED_FILE_5</source>
-        <translation>Ce fichier MED ne contient aucun champ.</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_MED_FILE_6</source>
-        <translation>Impossible de lire le(s) champ(s) de ce fichier MED.</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_NO_T_ST</source>
-        <translation>Sans pas de temps</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_CH_ST</source>
-        <translation>Pas de temps choisi</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_RANK</source>
-        <translation>Numéro d'ordre</translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_TSTP</source>
-        <translation>Pas de temps </translation>
-    </message>
-    <message>
-        <source>MG_ADAPT_L_ST</source>
-        <translation>Dernier pas de temps</translation>
-    </message>
-    <message>
-        <source>MED_FILE_BCKG</source>
-        <translation>fichier MED de la carte en arrière-plan</translation>
-    </message>
-    <message>
-        <source>VALUE_MG_ADAPT</source>
-        <translation>Valeur</translation>
-    </message>
-    <message>
-        <source>Publish_MG_ADAPT</source>
-        <translation>Publication</translation>
-    </message>
-    <message>
-        <source>LOCAL_MG_ADAPT</source>
-        <translation>locale</translation>
-    </message>
-    <message>
-        <source>MeshName</source>
-        <translation>Nom du maillage</translation>
-    </message>
-    <message>
-        <source>MeshIn</source>
-        <translation>Maillage en entrée</translation>
-    </message>
-    <message>
-        <source>SIZE_MAP_DEF</source>
-        <translation>Définition de la carte de taille</translation>
-    </message>
-    <message>
-        <source>ADVOP</source>
-        <translation>Advanced Options</translation>
-    </message>
     <message>
         <source>MEN_MEASURE</source>
         <translation>Outils de mesure</translation>
@@ -1240,38 +1276,6 @@
         <source>MEN_TRANSF</source>
         <translation>Transformation</translation>
     </message>
-    <message>
-        <source>MEN_REF_ALL</source>
-        <translation>Raffinement uniforme</translation>
-    </message>
-    <message>
-        <source>MEN_REF_HOMARD</source>
-        <translation>Raffinement avec HOMARD</translation>
-    </message>
-    <message>
-        <source>MEN_HOMARD_CREATE_CASE</source>
-        <translation>Création d'un cas d'adaptation</translation>
-    </message>
-    <message>
-        <source>MEN_HOMARD_FOLLOW_ITERATION</source>
-        <translation>Poursuite d'une itération d'adaptation</translation>
-    </message>
-    <message>
-        <source>MEN_HOMARD_NEW_ITERATION</source>
-        <translation>Création d'une itération d'adaptation</translation>
-    </message>
-    <message>
-        <source>MEN_HOMARD_COMPUTE</source>
-        <translation>Calculer</translation>
-    </message>
-    <message>
-        <source>MEN_HOMARD_COMPUTE_PUBLISH</source>
-        <translation>Calculer et publier</translation>
-    </message>
-    <message>
-        <source>MEN_MG_ADAPT</source>
-        <translation>Remaillage avec MG_Adapt</translation>
-    </message>
     <message>
         <source>MEN_TRANSP</source>
         <translation>Transparence</translation>
@@ -3105,15 +3109,15 @@ Référez-vous à la documentation sur l'algorithme et la géométrie supportée
     </message>
     <message>
         <source>max_memory</source>
-        <translation>Maximum memoire (Mb)</translation>
+        <translation>Maximum mémoire (Mb)</translation>
     </message>
     <message>
-        <source>components</source>
-        <translation>Composants</translation>
+        <source>Adaption</source>
+        <translation>Adaptation</translation>
     </message>
-        <message>
-        <source>Adapation</source>
-        <translation>adaptation</translation>
+    <message>
+        <source>components</source>
+        <translation>Composantes</translation>
     </message>
     <message>
         <source>ADAPT_PREF_MG_ADAPT_SIZE_MAP</source>
@@ -3127,14 +3131,14 @@ Référez-vous à la documentation sur l'algorithme et la géométrie supportée
         <source>ADAPT_PREF_MG_ADAPT_SIZE_MAP_BACKGROUND</source>
         <translation>Arrière-plan</translation>
     </message>
-    <message>
-        <source>ADAPT_PREF_MG_ADAPT_TIME_STEP</source>
-        <translation>Choix du pas de temps</translation>
-    </message>
     <message>
         <source>ADAPT_PREF_MG_ADAPT_TIME_STEP_LAST</source>
         <translation>Dernier</translation>
     </message>
+    <message>
+        <source>ADAPT_PREF_MG_ADAPT_TIME_STEP</source>
+        <translation>Choix du pas de temps</translation>
+    </message>
     <message>
         <source>ADAPT_PREF_MG_ADAPT_TIME_STEP_C</source>
         <translation>Valeur</translation>
@@ -3143,6 +3147,10 @@ Référez-vous à la documentation sur l'algorithme et la géométrie supportée
         <source>MG_ADAPT_SELECT_FILE_0</source>
         <translation>MG-ADAPT selection fichier MED</translation>
     </message>
+    <message>
+        <source>ADAPT_PREF_MG_ADAPT_ADVOP</source>
+        <translation>Options avancées</translation>
+    </message>
     <message>
         <source>SMESH_VISU_PROBLEM</source>
         <translation>Impossible de visualiser le maillage, probablement à cause d'un manque de mémoire</translation>