Minor corrections

diff --git a/i18n/adao_en.qm b/i18n/adao_en.qm
index a07e9a9d07752de3ad5d1f168d27a4ae7bab1753..c9842f85f6c062a017777402bf4497cfa2544fb2 100644 (file)
Binary files a/i18n/adao_en.qm and b/i18n/adao_en.qm differ

diff --git a/i18n/adao_en.ts b/i18n/adao_en.ts
index a6443a478105091ee7a423a80104824d014592ff..5de60c93b1dbf0f811220f54f379c2696601daef 100644 (file)
--- a/i18n/adao_en.ts
+++ b/i18n/adao_en.ts
@@ -1,22 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="en" sourcelanguage="">
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
 <context>
     <name>@default</name>
     <message>
+        <location filename="." line="144"/>
         <source>ASSIMILATION_STUDY</source>
         <translation>Data assimilation</translation>
     </message>
     <message>
+        <location filename="." line="144"/>
         <source>OPTIMIZATION_STUDY</source>
         <translation>Optimisation methods</translation>
     </message>
     <message>
+        <location filename="." line="144"/>
         <source>REDUCTION_STUDY</source>
         <translation>Methods with reduction</translation>
     </message>
     <message>
+        <location filename="." line="144"/>
         <source>CHECKING_STUDY</source>
         <translation>Verification</translation>
     </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>New case</source>
+        <translation>New case</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Open a case</source>
+        <translation>Open a case</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Save the case</source>
+        <translation>Save the case</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Save the case as</source>
+        <translation>Save the case as</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Validate the case</source>
+        <translation>Validate the case</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Show tree</source>
+        <translation>Show tree</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Export the case to TUI</source>
+        <translation>Export the case to TUI</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Close the case</source>
+        <translation>Close the case</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Export the case to YACS</source>
+        <translation>Export the case to YACS</translation>
+    </message>
 </context>
 </TS>

diff --git a/i18n/adao_fr.qm b/i18n/adao_fr.qm
index 85a3ed0018c8aa80daffd3f7e45ab8c76fb6ced7..91cfed20704e22bd3354af125c029b9fde84d777 100644 (file)
Binary files a/i18n/adao_fr.qm and b/i18n/adao_fr.qm differ

diff --git a/i18n/adao_fr.ts b/i18n/adao_fr.ts
index 2728cedfe04f88c734b5d75540eba83431221f8e..2c7d00762c8d6f23a1bd537ee7b425e523f4f6b2 100644 (file)
--- a/i18n/adao_fr.ts
+++ b/i18n/adao_fr.ts
@@ -1,22 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="fr" sourcelanguage="">
+<!DOCTYPE TS>
+<TS version="2.1" language="fr">
 <context>
     <name>@default</name>
     <message>
+        <location filename="." line="7667809"/>
         <source>ASSIMILATION_STUDY</source>
-        <translation>Assimilation de donnees</translation>
+        <translation>Assimilation de données</translation>
     </message>
     <message>
+        <location filename="." line="7667809"/>
         <source>OPTIMIZATION_STUDY</source>
-        <translation>Methodes d'optimisation</translation>
+        <translation>Méthodes d&apos;optimisation</translation>
     </message>
     <message>
+        <location filename="." line="7667809"/>
         <source>REDUCTION_STUDY</source>
-        <translation>Methodes avec reduction</translation>
+        <translation>Méthodes avec réduction</translation>
     </message>
     <message>
+        <location filename="." line="7667809"/>
         <source>CHECKING_STUDY</source>
-        <translation>Verification</translation>
+        <translation>Vérification</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>New case</source>
+        <translation>Nouveau cas</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Open a case</source>
+        <translation>Ouvrir un cas</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Save the case</source>
+        <translation>Enregistrer le cas</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Save the case as</source>
+        <translation>Enregistrer le cas sous</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Validate the case</source>
+        <translation>Valider le cas</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Show tree</source>
+        <translation>Montrer l&apos;arbre</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Export the case to TUI</source>
+        <translation>Exporter le cas en TUI</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Close the case</source>
+        <translation>Fermer le cas</translation>
+    </message>
+    <message>
+        <location filename="." line="144"/>
+        <source>Export the case to YACS</source>
+        <translation>Exporter le cas en YACS</translation>
     </message>
 </context>
 </TS>

diff --git a/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
index 9078e9501a6e71f0e6fb5f2e3e6da607c771f8b1..d9955045dcee1c35748d2a529670d7d1ec0117e8 100644 (file)
--- a/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
+++ b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
@@ -75,11 +75,13 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             typecast = str,
             message  = "Critère de qualité utilisé",
             listval  = [
-                "AugmentedWeightedLeastSquares","AWLS","DA",
-                "WeightedLeastSquares","WLS",
-                "LeastSquares","LS","L2",
-                "AbsoluteValue","L1",
-                "MaximumError","ME"],
+                "DA",
+                "AugmentedWeightedLeastSquares", "AWLS",
+                "WeightedLeastSquares", "WLS",
+                "LeastSquares", "LS", "L2",
+                "AbsoluteValue", "L1",
+                "MaximumError", "ME",
+                ],
             listadv  = [
                 "AugmentedPonderatedLeastSquares","APLS",
                 "PonderatedLeastSquares","PLS",

diff --git a/src/daComposant/daAlgorithms/SamplingTest.py b/src/daComposant/daAlgorithms/SamplingTest.py
index 279f789af1c489a77464a8b052a0926d8cd4cafa..e70b5ba949bb173e9ce03a0b01b9b76452486e53 100644 (file)
--- a/src/daComposant/daAlgorithms/SamplingTest.py
+++ b/src/daComposant/daAlgorithms/SamplingTest.py
@@ -59,11 +59,18 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             default  = "AugmentedWeightedLeastSquares",
             typecast = str,
             message  = "Critère de qualité utilisé",
-            listval  = ["AugmentedWeightedLeastSquares","AWLS","AugmentedPonderatedLeastSquares","APLS","DA",
-                        "WeightedLeastSquares","WLS","PonderatedLeastSquares","PLS",
-                        "LeastSquares","LS","L2",
-                        "AbsoluteValue","L1",
-                        "MaximumError","ME"],
+            listval  = [
+                "DA",
+                "AugmentedWeightedLeastSquares", "AWLS",
+                "WeightedLeastSquares","WLS",
+                "LeastSquares", "LS", "L2",
+                "AbsoluteValue", "L1",
+                "MaximumError", "ME",
+                ],
+            listadv  = [
+                "AugmentedPonderatedLeastSquares", "APLS",
+                "PonderatedLeastSquares", "PLS",
+                ],
             )
         self.defineRequiredParameter(
             name     = "SetDebug",