From 3cc1e145ff6c8818871a9f726aba8236ee93aca7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Date: Thu, 30 Sep 2021 14:28:06 +0200
Subject: [PATCH] Minor corrections

---
 i18n/adao_en.qm                               | Bin 388 -> 1127 bytes
 i18n/adao_en.ts                               |  52 ++++++++++++++-
 i18n/adao_fr.qm                               | Bin 408 -> 1185 bytes
 i18n/adao_fr.ts                               |  60 ++++++++++++++++--
 .../daAlgorithms/ParticleSwarmOptimization.py |  12 ++--
 src/daComposant/daAlgorithms/SamplingTest.py  |  17 +++--
 6 files changed, 125 insertions(+), 16 deletions(-)

diff --git a/i18n/adao_en.qm b/i18n/adao_en.qm
index a07e9a9d07752de3ad5d1f168d27a4ae7bab1753..c9842f85f6c062a017777402bf4497cfa2544fb2 100644
GIT binary patch
literal 1127
zcma)*K~EDw6vy8dv$P-;dH{kXj+huoh#$akux>ZFQM&4GN$N!=?KEA|cAM@%@e{}g
z0K7l~7mVM)i+b{)iHRPJ2V;!!$bpOT;K~1N%z|vUA)B|8eVh5c|9{?_g_qUI_s6^2
zAFfWnSvh$1?Ku&pMC&$|y7s;D4(o#p`^~pR15fppU)%UQtFMYD$bZ$J{V<WY^~1|Q
ziL{%8e~tzIzs?-(y}<XUq3cboM8hA=Ipk{>clJIbzdLf}2prnV{?1&({*;H;mjPsE
zs6d<~f*}Gt9yJk-Fzb;|t+WE_h+N)rtR?GS-nH!FW5+EO%7aL!Z&gK&uQjBmfRnUL
zf;vFd5S1R7tZ~OQ?pnpgB*ZissP99IfGSD#a8)Q|A~ji~;Rk}rx?mL^h`5q@GHHX_
z0CfO~fx?WBw@W3mBJ8-i(e^ts;xg$ow`9ffH_nMKQyzYtsK7*z0_D8n#4C(a5zf1i
zc-DKmD7p!*XUT?V`LB(^$@v4*1Wp~NPgM#cK{@-ri?%-M+t%?AE2ssGnw7JPhV8a!
zF`gi5o|aCR#{Mn@Dk%)j5s<S6q7r?2-Yz{f3nio9uuYKzHR~Y6+8fy$ark<_F=5FJ
zP%(26Y4kr5<3YS-Il$EUs;0@%+R4CXoVwp-vLkxT>I`lT$IyE?3UwX(85&#W4X?^&
MlBrGH!jz`{1<Cg0^8f$<

delta 82
zcmaFP(ZXzHvm-^~)cZM8&nn97PguD3t`h?Tg979I<dZ-;kn{E2l|Xt5ms&1}X5hZy
gstKfCXEHD_I#2AJF*%MYeDY_e5cUqBC=(+i0KUK(jsO4v

diff --git a/i18n/adao_en.ts b/i18n/adao_en.ts
index a6443a4..5de60c9 100644
--- 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
GIT binary patch
literal 1185
zcmb7@PiqrF7{=c;Wt&(V+aB6di>@fPg5(p37&ogf+C<z<A%fU(cVZ$*HtbIN=O%dZ
z3sf%_>ZRg0@FJc>6a+6`1d$>hq=#O_gD0OEaAVzURF>Iy=UwJE&pXdMXP$X8Z}uK-
zygfGeV)^m&k57nbs1}?@sHZ-;uMuwyZ?#?$rC({w-!|~~tagX5BmYHvxML!JPuo8H
znJ85p`LW0G|3h|n^C{*#2TrySiALX<r;xvU@WJML<hRF;?t(*Gx$oKISijI98lFfa
zlcxfOcpB8gXc8lV=u?|?@`$UqoVDpIW?@FcHH^uEZCi`hm4aiHOE+z&Qml?3ojK?6
z8tXPiO2TJo3CjWiYZz`19$|9ECDXWUl`bYBX6XX<4WLfGbtsgYB&w$+XEgng>!Qwe
zmxVm8<20GHMjezDpu89eK&}dQs6tkxZOUBh_<@MHy6|<UV#V?Kf5caD)&|+p2Ge~u
zs1^)6zQYuiAihg05Xun$Jb_G!uO`%<r$u-ms1ATMG{j<$<}vFitEKH>A7>`ZR~;C9
zeW1a!R932_#nPRwI>!C(jFvmRt+W4-$5fpzcmbq)pt`@hGCI3M*UVzY7}R_x;7S_=
zPPbKwLVYLo(3s6u2DOm%_^&i54wX;6-W=b@)ma!f_Xr%4SL}Cz^Kc}fTT*gVa@MZ<
ktGWnypAMhHO=Gwm4droCkrPX-+3=W1D)c_?>`*%O6H)H-!2kdN

delta 132
zcmZ3;IfL2CW=D#|srPfHo>i3DpRjQ6T_*+x1_j3Z$tQtyEa&UFD}nR^F11_`&A@%Z
zRTD`4&17I;44>Gk$Cx^ChZ&G~Z^x>~;LDIYxtJ+J5zJyJVaQ;}XGmd4WhiD)U`S*r
W1G18VtRkQ)J!Vt(4xl+q%!~lyw<D4O

diff --git a/i18n/adao_fr.ts b/i18n/adao_fr.ts
index 2728ced..2c7d007 100644
--- 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 9078e95..d995504 100644
--- 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 279f789..e70b5ba 100644
--- 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",
-- 
2.39.2