From scm@users.codelutin.com Fri Nov  6 15:23:19 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] branch feature/7679 created (now 8564b8f)
Date: Fri, 06 Nov 2015 15:23:19 +0100
Message-ID: <20151106142319.18340.77766@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4285239254407014446=="

--===============4285239254407014446==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New change to branch feature/7679 in repository observe.

See http://git.codelutin.com/observe.git

        at  8564b8f   maj fichier de traduction (refs #7679)

This branch includes the following new commits:

       new  028920c   migration de l'=C3=A9cran de calcul des donn=C3=A9es (r=
efs #7679)
       new  8564b8f   maj fichier de traduction (refs #7679)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 8564b8f7a0a5f51661c0419af62e440307bb99b7
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Fri Nov 6 15:22:19 2015 +0100

    maj fichier de traduction (refs #7679)

commit 028920cbed3e19cc92159676616305152aa7fa0f
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Fri Nov 6 14:59:24 2015 +0100

    migration de l'=C3=A9cran de calcul des donn=C3=A9es (refs #7679)

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

--===============4285239254407014446==--


From scm@users.codelutin.com Fri Nov  6 15:23:19 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits]  01/02: migration de =?utf-8?q?l=27=C3=A9cran?= de
 calcul des =?utf-8?q?donn=C3=A9es?= (refs #7679)
Date: Fri, 06 Nov 2015 15:23:20 +0100
Message-ID: <20151106142319.DB04D5C11BC@goh.codelutin.com>
In-Reply-To: <20151106142319.18340.77766@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3309635731233744138=="

--===============3309635731233744138==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/7679 in repository observe.

See http://git.codelutin.com/observe.git

commit 028920cbed3e19cc92159676616305152aa7fa0f
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Fri Nov 6 14:59:24 2015 +0100

    migration de l'=C3=A9cran de calcul des donn=C3=A9es (refs #7679)
---
 .../java/fr/ird/observe/ui/admin/AdminStep.java    |   3 +-
 .../ui/admin/consolidate/ConsolidateModel.java     |  45 ------
 .../ui/admin/consolidate/ConsolidateUIHandler.java | 159 +++++++++----------=
--
 .../observe-application-swing_fr_FR.properties     |   3 +
 .../consolidate/ConsolidateDataService.java        |   2 +
 .../java/fr/ird/observe/services/dto/IdDtos.java   |  20 +++
 .../services/ObserveServiceFactoryRest.java        |   7 +
 .../service/seine/NonTargetCatchServiceTopia.java  |   4 +-
 8 files changed, 103 insertions(+), 140 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/=
AdminStep.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/ad=
min/AdminStep.java
index 4d514ab..6317db5 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminSt=
ep.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminSt=
ep.java
@@ -137,7 +137,8 @@ public enum AdminStep implements WizardExtStep {
             false,
             false,
             DbMode.USE_LOCAL,
-            DbMode.USE_REMOTE
+            DbMode.USE_REMOTE,
+            DbMode.USE_SERVER
     ),
=20
     /** pour lancer la generation des rapports */
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/=
consolidate/ConsolidateModel.java b/observe-application-swing/src/main/java/f=
r/ird/observe/ui/admin/consolidate/ConsolidateModel.java
index d98f842..8629c23 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consoli=
date/ConsolidateModel.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consoli=
date/ConsolidateModel.java
@@ -22,13 +22,8 @@
 package fr.ird.observe.ui.admin.consolidate;
=20
 import fr.ird.observe.db.ObserveSwingDataSource;
-import fr.ird.observe.services.dto.referential.ProgramDto;
-import fr.ird.observe.services.dto.seine.ActivitySeineDto;
-import fr.ird.observe.services.dto.seine.SetSeineDto;
-import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.ui.admin.AdminActionModel;
 import fr.ird.observe.ui.admin.AdminStep;
-import org.nuiton.decorator.Decorator;
=20
 /**
  * Modele pour preparer une validation de donnees d'une base.
@@ -41,14 +36,6 @@ public class ConsolidateModel extends AdminActionModel {
     /** la source de donn=C3=A9es o=C3=B9 effectuer la consolidation des don=
n=C3=A9es */
     private ObserveSwingDataSource source;
=20
-    private Decorator<ProgramDto> programDecorator;
-
-    private Decorator<TripSeineDto> tripDecorator;
-
-    private Decorator<SetSeineDto> setDecorator;
-
-    private Decorator<ActivitySeineDto> activityDecorator;
-
     public ConsolidateModel() {
         super(AdminStep.CONSOLIDATE);
     }
@@ -61,38 +48,6 @@ public class ConsolidateModel extends AdminActionModel {
         this.source =3D source;
     }
=20
-    public Decorator<ProgramDto> getProgramDecorator() {
-        return programDecorator;
-    }
-
-    public void setProgramDecorator(Decorator<ProgramDto> programDecorator) {
-        this.programDecorator =3D programDecorator;
-    }
-
-    public Decorator<TripSeineDto> getTripDecorator() {
-        return tripDecorator;
-    }
-
-    public void setTripDecorator(Decorator<TripSeineDto> tripDecorator) {
-        this.tripDecorator =3D tripDecorator;
-    }
-
-    public Decorator<SetSeineDto> getSetDecorator() {
-        return setDecorator;
-    }
-
-    public void setSetDecorator(Decorator<SetSeineDto> setDecorator) {
-        this.setDecorator =3D setDecorator;
-    }
-
-    public Decorator<ActivitySeineDto> getActivityDecorator() {
-        return activityDecorator;
-    }
-
-    public void setActivityDecorator(Decorator<ActivitySeineDto> activityDec=
orator) {
-        this.activityDecorator =3D activityDecorator;
-    }
-
     @Override
     public void destroy() {
         super.destroy();
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/=
consolidate/ConsolidateUIHandler.java b/observe-application-swing/src/main/ja=
va/fr/ird/observe/ui/admin/consolidate/ConsolidateUIHandler.java
index b523e9b..31e1e31 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consoli=
date/ConsolidateUIHandler.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/consoli=
date/ConsolidateUIHandler.java
@@ -21,28 +21,31 @@
  */
 package fr.ird.observe.ui.admin.consolidate;
=20
-import fr.ird.observe.ui.DecoratorService;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import fr.ird.observe.db.ObserveSwingDataSource;
-import fr.ird.observe.services.dto.referential.ProgramDto;
-import fr.ird.observe.services.dto.seine.ActivitySeineDto;
-import fr.ird.observe.services.dto.seine.SetSeineDto;
-import fr.ird.observe.services.dto.seine.TripSeineDto;
+import fr.ird.observe.services.dto.IdDtos;
+import fr.ird.observe.services.dto.ReferenceDto;
+import fr.ird.observe.services.dto.ReferenceDtos;
+import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivi=
tySeineDataResult;
+import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataSe=
rvice;
+import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSe=
ineDataRequest;
+import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSe=
ineDataResult;
 import fr.ird.observe.ui.admin.AdminStep;
 import fr.ird.observe.ui.admin.AdminTabUI;
 import fr.ird.observe.ui.admin.AdminTabUIHandler;
 import fr.ird.observe.ui.admin.AdminUI;
 import fr.ird.observe.ui.admin.AdminUIModel;
 import fr.ird.observe.ui.admin.config.SelectDataUI;
+import fr.ird.observe.ui.storage.tabs.DataSelectionModel;
 import jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.nuiton.decorator.Decorator;
=20
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
+import java.util.Set;
 import java.util.concurrent.Callable;
=20
 import static org.nuiton.i18n.I18n.t;
@@ -91,11 +94,10 @@ public class ConsolidateUIHandler extends AdminTabUIHandl=
er {
                     // avoid multi-cast
                     return;
                 }
-                //FIXME
-//                DataSelectionModel value =3D (DataSelectionModel) evt.getN=
ewValue();
-//                if (log.isDebugEnabled()) {
-//                    log.debug("selection model changed to " + value);
-//                }
+                DataSelectionModel value =3D (DataSelectionModel) evt.getNew=
Value();
+                if (log.isDebugEnabled()) {
+                    log.debug("selection model changed to " + value);
+                }
                 updateSelectionModel(selectTabUI);
             }
         };
@@ -130,73 +132,58 @@ public class ConsolidateUIHandler extends AdminTabUIHan=
dler {
             // une erreur ou une annulation
             return init;
         }
-        //FIXME
-//        java.util.Set<String> tripIds =3D model.getSelectionDataModel().ge=
tSelectedData();
-//        List<TripSeineDto> toUpdate =3D new ArrayList<TripSeineDto>(tripId=
s.size());
-
-//        ConsolidateDataService service =3D
-//                ObserveServiceHelper.getConsolidateDataService();
-
-        ObserveSwingDataSource source =3D getStepModel().getSource();
-        String txName =3D "consolidateData";
-
-        //FIXME
-//        TopiaContext tx =3D source.beginTransaction(txName);
-//        try {
-//            TopiaDAO<TripSeine> dao =3D source.getDAO(tx, TripSeine.class);
-//            for (String mareeId : tripIds) {
-//
-//                if (Entities.isSeineId(mareeId)) {
-//
-//                    TripSeine trip =3D (TripSeine) tx.findByTopiaId(mareeI=
d);
-//
-//                    boolean needUpdate =3D service.consolidateTrip(this, t=
x, trip);
-//                    if (needUpdate) {
-//
-//                        // on met a jour la maree en base
-//                        dao.update(trip);
-//
-//                        // on conserve une reference sur la maree mise =C3=
=A0 jour
-//                        toUpdate.add(trip);
-//                    }
-//
-//                }
-//
-//            }
-//
-//            // on commite si quelque chose a ete mise a jour
-//            boolean needCommit =3D !toUpdate.isEmpty();
-//
-//            if (needCommit) {
-//
-//                sendMessage(t("observe.message.consolidate.save.changes",
-//                              toUpdate.size()));
-//                source.commitTransaction(tx, txName);
-//            }
-//
-//        } catch (Exception eee) {
-//            try {
-//                source.rollbackTransaction(tx, txName);
-//            } catch (DataSourceException e1) {
-//
-//                // une autre erreur lors du rollback, qui ne doit pas empe=
cher
-//                // de continuer le traitement
-//                if (log.isErrorEnabled()) {
-//                    log.error(e1);
-//                }
-//            }
-//            throw eee;
-//        } finally {
-//
-//            // clean service
-//            service.clear();
-//
-//            // toujours fermer la transaction
-//            source.closeTransaction(tx, txName);
-//        }
-
-        sendMessage(t("observe.message.consolidate.operation.done",
-                      new Date()));
+        Set<ReferenceDto> trips =3D model.getSelectionDataModel().getSelecte=
dData();
+        ImmutableSet<String> tripIds =3D ImmutableSet.copyOf(
+                Iterables.transform(
+                    Iterables.filter(trips, IdDtos.<ReferenceDto>newTripSein=
ePredicate()),
+                    ReferenceDtos.getIdFunction()));
+
+
+        ObserveSwingDataSource dataSource =3D getStepModel().getSource();
+
+        try {
+
+            ConsolidateDataService consolidateDataService =3D dataSource.new=
Service(ConsolidateDataService.class);
+
+            ConsolidateTripSeineDataRequest request =3D new ConsolidateTripS=
eineDataRequest();
+            request.setTripSeineIds(tripIds);
+            request.setFailIfLenghtWeightParameterNotFound(false);
+
+            ImmutableSet<ConsolidateTripSeineDataResult> results =3D consoli=
dateDataService.consolidateTripSeines(request);
+
+            if (results.isEmpty()) {
+
+                sendMessage(t("observe.message.consolidate.noChanges"));
+
+            } else {
+
+                for (ConsolidateTripSeineDataResult tripSeineDataResult : re=
sults) {
+
+                    String tripSeineLabel =3D tripSeineDataResult.getTripSei=
neLabel();
+
+                    sendMessage(t("observe.message.consolidate.trip", tripSe=
ineLabel));
+
+                    for (ConsolidateActivitySeineDataResult activitySeineDat=
aResult : tripSeineDataResult.getConsolidateActivitySeineDataResults()) {
+
+                        sendMessage(t("observe.message.consolidate.activity"=
, activitySeineDataResult.getActivitySeineLabel()));
+
+                    }
+
+                }
+
+                sendMessage(t("observe.message.consolidate.save.changes", re=
sults.size()));
+            }
+
+            sendMessage(t("observe.message.consolidate.operation.done",
+                    new Date()));
+
+        } finally {
+
+            dataSource.close();
+
+        }
+
+
         return WizardState.SUCCESSED;
     }
=20
@@ -209,18 +196,6 @@ public class ConsolidateUIHandler extends AdminTabUIHand=
ler {
=20
         openSource(source);
=20
-        DecoratorService dProvider =3D getDecoratorService();
-        ConsolidateModel stepModel =3D getStepModel();
-
-        Decorator<ProgramDto> p =3D dProvider.getDecoratorByType(ProgramDto.=
class);
-        Decorator<TripSeineDto> m =3D dProvider.getDecoratorByType(TripSeine=
Dto.class);
-        Decorator<ActivitySeineDto> a =3D dProvider.getDecoratorByType(Activ=
itySeineDto.class);
-        Decorator<SetSeineDto> c =3D dProvider.getDecoratorByType(SetSeineDt=
o.class);
-        stepModel.setProgramDecorator(p);
-        stepModel.setTripDecorator(m);
-        stepModel.setActivityDecorator(a);
-        stepModel.setSetDecorator(c);
-
         return null;
     }
=20
diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_fr_FR.properties
index ff24e33..4a76daf 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_fr_FR.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_fr_FR.properties
@@ -1443,8 +1443,11 @@ observe.message.can.not.write.data=3DVous n'=C3=AAtes =
pas autoris=C3=A9 =C3=A0 =C3=A9crire des don
 observe.message.cant.add.echantillonRejetThon=3D<html><body><strong>Impossib=
le d'ajouter des =C3=A9chantillons de rejet thons</strong>(pas de rejet thon =
mont=C3=A9 sur le pont)</body></html>
 observe.message.cant.add.echantillonTargetCatch=3D<html><body><strong>Imposs=
ible d'ajouter des =C3=A9chantillons thons</strong> (pas de capture thon)</bo=
dy></html>
 observe.message.cant.add.nonTargetSample=3D<html><body><strong>Impossible d'=
ajouter des =C3=A9chantillons</strong>(pas de rejet faune)</body></html>
+observe.message.consolidate.activity=3DDonn=C3=A9es calcul=C3=A9es pour l'ac=
tivit=C3=A9 %1$s
+observe.message.consolidate.noChanges=3DAucune donn=C3=A9e nodifi=C3=A9e.
 observe.message.consolidate.operation.done=3DOp=C3=A9ration de calcul des do=
nn=C3=A9es termin=C3=A9e =C3=A0 %1$s.
 observe.message.consolidate.save.changes=3DSauvegarde des modifications sur =
la(es) %1$s mar=C3=A9e(s) modifi=C3=A9e(s).
+observe.message.consolidate.trip=3DDonn=C3=A9es calcul=C3=A9es pour la mar=
=C3=A9e %1$s
 observe.message.creating.referentiel=3DL'objet est en cours de cr=C3=A9ation.
 observe.message.db.closed=3D%1$s a =C3=A9t=C3=A9 ferm=C3=A9
 observe.message.db.loaded=3D%1$s charg=C3=A9
diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/servi=
ce/actions/consolidate/ConsolidateDataService.java b/observe-services-api/src=
/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDat=
aService.java
index bc05d4b..c406a7e 100644
--- a/observe-services-api/src/main/java/fr/ird/observe/services/service/acti=
ons/consolidate/ConsolidateDataService.java
+++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/acti=
ons/consolidate/ConsolidateDataService.java
@@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.services.ObserveService;
 import fr.ird.observe.services.spi.PostRequest;
 import fr.ird.observe.services.spi.ReadDataPermission;
+import fr.ird.observe.services.spi.Write;
 import fr.ird.observe.services.spi.WriteDataPermission;
=20
 /**
@@ -48,6 +49,7 @@ public interface ConsolidateDataService extends ObserveServ=
ice{
     @ReadDataPermission
     @WriteDataPermission
     @PostRequest
+    @Write
     ImmutableSet<ConsolidateTripSeineDataResult> consolidateTripSeines(Conso=
lidateTripSeineDataRequest consolidateTripSeineDataRequest);
=20
 }
diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto=
/IdDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/d=
to/IdDtos.java
index 5a3dc17..625bfeb 100644
--- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos=
.java
+++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDtos=
.java
@@ -33,6 +33,26 @@ public class IdDtos extends AbstractIdDtos {
         return Iterables.find(source, newIdPredicate(id));
     }
=20
+    public static <BeanType extends IdDto> Predicate<BeanType> newTripSeineP=
redicate() {
+        return new Predicate<BeanType>() {
+
+            @Override
+            public boolean apply(BeanType input) {
+                return isTripSeine(input) ;
+            }
+        };
+    }
+
+    public static <BeanType extends IdDto> Predicate<BeanType> newTripLongli=
nePredicate() {
+        return new Predicate<BeanType>() {
+
+            @Override
+            public boolean apply(BeanType input) {
+                return isTripLongline(input) ;
+            }
+        };
+    }
+
     public static boolean isTrip(IdDto dto) {
         return isTripSeine(dto) || isTripLongline(dto);
     }
diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/Obse=
rveServiceFactoryRest.java b/observe-services-rest/src/main/java/fr/ird/obser=
ve/services/ObserveServiceFactoryRest.java
index 918a6c3..b3034ed 100644
--- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServ=
iceFactoryRest.java
+++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServ=
iceFactoryRest.java
@@ -23,9 +23,12 @@ package fr.ird.observe.services;
  */
=20
 import com.google.common.base.Preconditions;
+import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.google.common.reflect.Reflection;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -51,7 +54,11 @@ import org.apache.commons.logging.LogFactory;
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 import java.util.Collection;
+import java.util.List;
=20
 /**
  * Created on 16/08/15.
diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ser=
vice/seine/NonTargetCatchServiceTopia.java b/observe-services-topia/src/main/=
java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java
index fc9a0d1..932f94c 100644
--- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/se=
ine/NonTargetCatchServiceTopia.java
+++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/se=
ine/NonTargetCatchServiceTopia.java
@@ -85,7 +85,7 @@ public class NonTargetCatchServiceTopia extends ObserveServ=
iceTopia implements N
         SetSeineNonTargetCatchDto setSeineNonTargetCatchDto =3D form.getForm=
();
=20
         // on cherche si il y a des =C3=A9chantillons sur les captures
-        if (setSeine.sizeNonTargetCatch() > 0) {
+        if (setSeine.sizeNonTargetSample() > 0) {
             NonTargetSample nonTargetSample =3D Iterables.get(setSeine.getNo=
nTargetSample(), 0);
=20
             if (nonTargetSample !=3D null) {
@@ -129,7 +129,7 @@ public class NonTargetCatchServiceTopia extends ObserveSe=
rviceTopia implements N
=20
=20
         // on supprime les =C3=A9chantillons qui ne correspondent plus a des=
 capture
-        if (setSeine.sizeNonTargetCatch() > 0) {
+        if (setSeine.sizeNonTargetSample() > 0) {
             NonTargetSample nonTargetSample =3D Iterables.get(setSeine.getNo=
nTargetSample(), 0);
=20
             Set<Species> speciesCatchs =3D Sets.newHashSet(Iterables.transfo=
rm(

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

--===============3309635731233744138==--


From scm@users.codelutin.com Fri Nov  6 15:23:20 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: observe-commits@list.forge.codelutin.com
Subject: [Observe-commits] 02/02: maj fichier de traduction (refs #7679)
Date: Fri, 06 Nov 2015 15:23:21 +0100
Message-ID: <20151106142319.E6AD85D2A83@goh.codelutin.com>
In-Reply-To: <20151106142319.18340.77766@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8415449593556563217=="

--===============8415449593556563217==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/7679 in repository observe.

See http://git.codelutin.com/observe.git

commit 8564b8f7a0a5f51661c0419af62e440307bb99b7
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Fri Nov 6 15:22:19 2015 +0100

    maj fichier de traduction (refs #7679)
---
 .../src/main/resources/i18n/observe-application-swing_en_GB.properties | 3 +=
++
 .../src/main/resources/i18n/observe-application-swing_es_ES.properties | 3 +=
++
 2 files changed, 6 insertions(+)

diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_en_GB.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_en_GB.properties
index 7f292b5..9817a9b 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_en_GB.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_en_GB.properties
@@ -1448,8 +1448,11 @@ observe.message.can.not.write.data=3D
 observe.message.cant.add.echantillonRejetThon=3D
 observe.message.cant.add.echantillonTargetCatch=3D
 observe.message.cant.add.nonTargetSample=3D
+observe.message.consolidate.activity=3D
+observe.message.consolidate.noChanges=3D
 observe.message.consolidate.operation.done=3D
 observe.message.consolidate.save.changes=3D
+observe.message.consolidate.trip=3D
 observe.message.creating.referentiel=3D
 observe.message.db.closed=3D%1$s was closed
 observe.message.db.loaded=3D%1$s was loaded
diff --git a/observe-application-swing/src/main/resources/i18n/observe-applic=
ation-swing_es_ES.properties b/observe-application-swing/src/main/resources/i=
18n/observe-application-swing_es_ES.properties
index ec40c79..a66e9dd 100644
--- a/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_es_ES.properties
+++ b/observe-application-swing/src/main/resources/i18n/observe-application-s=
wing_es_ES.properties
@@ -1450,8 +1450,11 @@ observe.message.can.not.write.data=3DNo tiene autoriza=
ci=C3=B3n para escribir los dato
 observe.message.cant.add.echantillonRejetThon=3DImposible a=C3=B1adir los mu=
estreos de descartes de atunes (no hay descartes de atunes izados a bordo).
 observe.message.cant.add.echantillonTargetCatch=3DImposible a=C3=B1adir los =
muestreos de atunes (no hay captura de atunes)
 observe.message.cant.add.nonTargetSample=3DImposible a=C3=B1adir los muestre=
os (no hay descartes de fauna
+observe.message.consolidate.activity=3D
+observe.message.consolidate.noChanges=3D
 observe.message.consolidate.operation.done=3DOperaci=C3=B3n de calculo de da=
tos terminada en %1$s.
 observe.message.consolidate.save.changes=3DGuardar las modificaciones de la(=
s) %1$s marea(s) modificada(s).
+observe.message.consolidate.trip=3D
 observe.message.creating.referentiel=3DObjeto en proceso de creaci=C3=B3n.
 observe.message.db.closed=3D%1$s ha sido cerrado
 observe.message.db.loaded=3D%1$s cargado

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.

--===============8415449593556563217==--


