[Observe-commits] 10/13: Use observe.type i18n instead of observe.tree, clean up a lots of code... + use new decorator api + refactor i18n (-400 trads \o/)

4 Sep 2016

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

New commit to branch develop in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 23449e839f5d7f1238721c6c21325f6cde5cce65
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sun Sep 4 19:10:00 2016 +0200

    Use observe.type i18n instead of observe.tree, clean up a lots of code... + use new decorator api + refactor i18n (-400 trads \o/)
---
 .../application-swing-decoration_fr_FR.properties  |   2 +-
 .../application/swing/ui/ObserveMainUIHandler.java |   3 +-
 .../ird/observe/application/swing/ui/UIHelper.java |  31 +-
 .../shared/MoveActivityLonglinesUIAction.java      |  13 +-
 .../actions/shared/MoveActivitySeinesUIAction.java |  13 +-
 .../ui/actions/shared/MoveRoutesUIAction.java      |  13 +-
 ...soleteReferentialReferenceListCellRenderer.java |   3 +-
 .../referential/legacy/SynchronizeUIHandler.java   |   4 +-
 .../ng/action/RegisterTasksActionSupport.java      |   9 +-
 .../ng/task/ReferentialSynchronizeTaskSupport.java |   4 +-
 .../ReferentialSynchronizeTreeCellRenderer.java    |   6 +-
 .../validate/ValidateEntityListCellRenderer.java   |   3 +-
 .../swing/ui/admin/validate/ValidateUI.jaxx        |   2 +-
 .../swing/ui/admin/validate/ValidateUIHandler.java |  35 +-
 .../swing/ui/content/ContentUIHandler.java         |   9 +-
 .../swing/ui/content/ContentUIInitializer.java     |  13 +-
 .../swing/ui/content/ContentUIManager.java         | 268 +++++------
 .../LonglineDetailCompositionUIHandler.java        |   2 +-
 ...LonglineDetailCompositionValidationContext.java |   3 +-
 .../LonglineGlobalCompositionUIHandler.java        |   2 +-
 .../impl/longline/SetLonglineUIHandler.java        |   2 +-
 .../ActivitySeineObservedSystemUIHandler.java      |  12 +-
 ...ngObjectTransmittingBuoyOperationUIHandler.java |   8 +-
 .../impl/seine/FloatingObjectUIHandler.java        |   6 +-
 .../ui/content/impl/seine/SetSeineUIHandler.java   |   2 +-
 .../ui/content/open/ContentOpenableUIHandler.java  |  42 +-
 .../impl/longline/ActivityLonglineUIHandler.java   |  54 +--
 .../open/impl/longline/TripLonglineUIHandler.java  |   6 +-
 .../open/impl/seine/ActivitySeineUIHandler.java    |  16 +-
 .../ui/content/open/impl/seine/RouteUIHandler.java | 105 ++---
 .../open/impl/seine/TripSeineUIHandler.java        |   8 +-
 .../swing/ui/content/ref/ContentReferenceUI.jaxx   |  27 +-
 .../ui/content/ref/ContentReferenceUIHandler.java  |   9 +-
 .../swing/ui/content/ref/UniqueKeyTableModel.java  |   3 +-
 .../swing/ui/content/ref/impl/CountryUI.jaxx       |  12 +-
 .../swing/ui/content/ref/impl/FpaZoneUI.jaxx       |  12 +-
 .../content/ref/impl/GearCaracteristicTypeUI.jaxx  |  10 +-
 .../ui/content/ref/impl/GearCaracteristicUI.jaxx   |  10 +-
 .../swing/ui/content/ref/impl/GearUI.jaxx          |  10 +-
 .../swing/ui/content/ref/impl/HarbourUI.jaxx       |  12 +-
 .../content/ref/impl/LengthWeightParameterUI.jaxx  |  12 +-
 .../swing/ui/content/ref/impl/OceanUI.jaxx         |  12 +-
 .../swing/ui/content/ref/impl/OrganismUI.jaxx      |  12 +-
 .../swing/ui/content/ref/impl/PersonUI.jaxx        |  12 +-
 .../swing/ui/content/ref/impl/ProgramUI.jaxx       |  12 +-
 .../swing/ui/content/ref/impl/SexUI.jaxx           |  12 +-
 .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx  |  12 +-
 .../swing/ui/content/ref/impl/SpeciesListUI.jaxx   |  12 +-
 .../swing/ui/content/ref/impl/SpeciesUI.jaxx       |  12 +-
 .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx  |  12 +-
 .../swing/ui/content/ref/impl/VesselTypeUI.jaxx    |  12 +-
 .../swing/ui/content/ref/impl/VesselUI.jaxx        |  12 +-
 .../ref/impl/longline/BaitHaulingStatusUI.jaxx     |  12 +-
 .../ref/impl/longline/BaitSettingStatusUI.jaxx     |  12 +-
 .../ui/content/ref/impl/longline/BaitTypeUI.jaxx   |  12 +-
 .../ref/impl/longline/CatchFateLonglineUI.jaxx     |  12 +-
 .../content/ref/impl/longline/EncounterTypeUI.jaxx |  12 +-
 .../ui/content/ref/impl/longline/HealthnessUI.jaxx |  12 +-
 .../content/ref/impl/longline/HookPositionUI.jaxx  |  12 +-
 .../ui/content/ref/impl/longline/HookSizeUI.jaxx   |  12 +-
 .../ui/content/ref/impl/longline/HookTypeUI.jaxx   |  12 +-
 .../impl/longline/ItemHorizontalPositionUI.jaxx    |  12 +-
 .../ref/impl/longline/ItemVerticalPositionUI.jaxx  |  12 +-
 .../ref/impl/longline/LightsticksColorUI.jaxx      |  12 +-
 .../ref/impl/longline/LightsticksTypeUI.jaxx       |  12 +-
 .../ui/content/ref/impl/longline/LineTypeUI.jaxx   |  12 +-
 .../ref/impl/longline/MaturityStatusUI.jaxx        |  12 +-
 .../ref/impl/longline/MitigationTypeUI.jaxx        |  12 +-
 .../content/ref/impl/longline/SensorBrandUI.jaxx   |  12 +-
 .../ref/impl/longline/SensorDataFormatUI.jaxx      |  12 +-
 .../ui/content/ref/impl/longline/SensorTypeUI.jaxx |  12 +-
 .../content/ref/impl/longline/SettingShapeUI.jaxx  |  12 +-
 .../ref/impl/longline/SizeMeasureTypeUI.jaxx       |  12 +-
 .../ref/impl/longline/StomacFullnessUI.jaxx        |  12 +-
 .../ui/content/ref/impl/longline/TripTypeUI.jaxx   |  12 +-
 .../impl/longline/VesselActivityLonglineUI.jaxx    |  12 +-
 .../ref/impl/longline/WeightMeasureTypeUI.jaxx     |  12 +-
 .../ui/content/ref/impl/seine/DetectionModeUI.jaxx |  12 +-
 .../ui/content/ref/impl/seine/ObjectFateUI.jaxx    |  12 +-
 .../content/ref/impl/seine/ObjectOperationUI.jaxx  |  12 +-
 .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx    |  12 +-
 .../content/ref/impl/seine/ObservedSystemUI.jaxx   |  12 +-
 .../content/ref/impl/seine/ReasonForDiscardUI.jaxx |  12 +-
 .../ref/impl/seine/ReasonForNoFishingUI.jaxx       |  12 +-
 .../content/ref/impl/seine/ReasonForNullSetUI.jaxx |  12 +-
 .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx   |  12 +-
 .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx |  12 +-
 .../ref/impl/seine/SurroundingActivityUI.jaxx      |  12 +-
 .../impl/seine/TransmittingBuoyOperationUI.jaxx    |  12 +-
 .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx     |  12 +-
 .../ref/impl/seine/VesselActivitySeineUI.jaxx      |  12 +-
 .../content/ref/impl/seine/WeightCategoryUI.jaxx   |  12 +-
 .../swing/ui/content/ref/impl/seine/WindUI.jaxx    |  12 +-
 .../ui/content/table/ContentTableUIHandler.java    |  14 +-
 .../longline/GearUseFeaturesLonglineUIHandler.java |   6 +-
 .../impl/seine/GearUseFeaturesSeineUIHandler.java  |   6 +-
 .../table/impl/seine/NonTargetSampleUIHandler.java |   2 +-
 .../table/impl/seine/TargetSampleUIHandler.java    |   2 +-
 .../ui/tree/AbstractObserveTreeCellRenderer.java   |  35 +-
 .../swing/ui/tree/ObserveTreeBridge.java           |   2 +-
 .../swing/ui/tree/ObserveTreeHelper.java           | 132 +-----
 .../actions/ChangeActivityRouteActionListener.java |   9 +-
 .../actions/ChangeActivityTripActionListener.java  |   9 +-
 .../actions/ChangeRouteTripActionListener.java     |   9 +-
 .../loadors/AbstractDataReferenceChildLoador.java  |   4 +-
 .../ui/tree/loadors/AbstractNodeChildLoador.java   |  40 ++
 .../loadors/ActivityLonglineNodeChildLoador.java   |  61 +--
 .../loadors/ActivityLonglinesNodeChildLoador.java  |  18 +-
 .../tree/loadors/ActivitySeineNodeChildLoador.java |  48 +-
 .../loadors/ActivitySeinesNodeChildLoador.java     |  14 +-
 .../loadors/FloatingObjectNodeChildLoador.java     |  38 +-
 .../loadors/ProgramLonglineNodeChildLoador.java    |  58 +--
 .../tree/loadors/ProgramSeineNodeChildLoador.java  |  49 +-
 .../loadors/ReferenceCommonNodeChildLoador.java    |  94 ----
 .../loadors/ReferenceLonglineNodeChildLoador.java  | 100 ----
 ...ldLoador.java => ReferenceNodeChildLoador.java} |  69 ++-
 .../swing/ui/tree/loadors/RootNodeChildLoador.java |  66 +--
 .../ui/tree/loadors/RoutesNodeChildLoador.java     |  32 +-
 .../tree/loadors/SetLonglineNodeChildLoador.java   |  45 +-
 .../ui/tree/loadors/SetSeineNodeChildLoador.java   |  62 ++-
 .../swing/ui/usage/UsagesUIHandler.java            |   4 +-
 .../ObserveValidationMessageTableRenderer.java     |  62 +--
 .../util/ObserveValidatorMessageTableRenderer.java |  48 +-
 .../i18n/application-swing_en_GB.properties        | 522 +--------------------
 .../i18n/application-swing_es_ES.properties        | 522 +--------------------
 .../i18n/application-swing_fr_FR.properties        | 522 +--------------------
 126 files changed, 811 insertions(+), 3333 deletions(-)

diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties
index 4d9bc63..f61e24d 100644
--- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties
+++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties
@@ -68,7 +68,7 @@ observe.type.catchFateLongline=Devenir capture
 observe.type.catchFateLonglines=Devenirs capture
 observe.type.catchLongline=Capture
 observe.type.catchLonglines=Captures
-observe.type.countries=Payss
+observe.type.countries=Pays
 observe.type.country=Pays
 observe.type.detectionMode=Mode détection
 observe.type.detectionModes=Modes détection
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java
index 4f67c72..2e7823f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java
@@ -26,6 +26,7 @@ import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig;
 import fr.ird.observe.application.swing.db.DataContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.services.dto.AbstractObserveDto;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
 import fr.ird.observe.application.swing.ui.content.ContentMode;
@@ -125,7 +126,7 @@ public class ObserveMainUIHandler {
             if (node.isStringNode()) {
                 params = t(node.getId());
             } else {
-                params = t(DecoratorService.getEntityLabel(node.getInternalClass()));
+                params = t(ObserveI18nDecoratorHelper.getTypeI18nKey(node.getInternalClass()));
             }
             ui.getStatus().setStatus(t("observe.action.open.screen", params));
         }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java
index ae14cb6..6122be7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java
@@ -24,12 +24,13 @@ package fr.ird.observe.application.swing.ui;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.ObserveSwingTechnicalException;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
+import fr.ird.observe.application.swing.ui.util.table.ObserveBooleanTableCellRenderer;
 import fr.ird.observe.services.dto.DataDto;
 import fr.ird.observe.services.dto.DataFileDto;
 import fr.ird.observe.services.dto.IdDto;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.security.InvalidAuthenticationTokenException;
-import fr.ird.observe.application.swing.ui.util.table.ObserveBooleanTableCellRenderer;
 import jaxx.runtime.FileChooserUtil;
 import jaxx.runtime.JAXXObject;
 import jaxx.runtime.SwingUtil;
@@ -61,7 +62,6 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
@@ -319,7 +319,7 @@ public class UIHelper extends SwingUtil {
         Decorator<E> decorator = decoratorService.getDecoratorByType(beanClass);
         String beanStr;
         String messageDelete;
-        String type = DecoratorService.getEntityLabel(beanClass);
+        String type = ObserveI18nDecoratorHelper.getTypeI18nKey(beanClass);
         type = t(type);
 
         if (bean == null || bean.getId() == null || decorator == null) {
@@ -395,16 +395,16 @@ public class UIHelper extends SwingUtil {
         return new DecoratorTableCellRenderer(renderer, decorator);
     }
 
-    /**
-     * Pour trier les types du référentiel selon leur décoration.
-     *
-     * @param classes les classes à trier
-     * @since 1.5
-     */
-    public static void sortReferentiel(List<Class> classes) {
-
-        Collections.sort(classes, REFERENTIEL_COMPARATOR);
-    }
+//    /**
+//     * Pour trier les types du référentiel selon leur décoration.
+//     *
+//     * @param classes les classes à trier
+//     * @since 1.5
+//     */
+//    public static void sortReferentiel(List<Class> classes) {
+//
+//        Collections.sort(classes, REFERENTIEL_COMPARATOR);
+//    }
 
     /**
      * Copy to clipBoard the content of the given text.
@@ -447,8 +447,9 @@ public class UIHelper extends SwingUtil {
 
         @Override
         public int compare(Class o1, Class o2) {
-            String s1 = t(DecoratorService.getEntityLabel(o1));
-            String s2 = t(DecoratorService.getEntityLabel(o2));
+            //FIXME Costy operation
+            String s1 = t(ObserveI18nDecoratorHelper.getTypeI18nKey(o1));
+            String s2 = t(ObserveI18nDecoratorHelper.getTypeI18nKey(o2));
             return s1.compareTo(s2);
         }
     };
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java
index 847d433..a108d15 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivityLonglinesUIAction.java
@@ -23,12 +23,8 @@ package fr.ird.observe.application.swing.ui.actions.shared;
 
 import fr.ird.observe.application.swing.ObserveOpenDataManager;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator;
-import fr.ird.observe.services.dto.DataReference;
-import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
-import fr.ird.observe.services.dto.longline.TripLonglineDto;
-import fr.ird.observe.services.service.longline.ActivityLonglineService;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.content.ContentUI;
 import fr.ird.observe.application.swing.ui.content.list.impl.longline.ActivityLonglinesUI;
@@ -36,6 +32,10 @@ import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
 import fr.ird.observe.application.swing.ui.tree.TripLonglineNode;
 import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity;
+import fr.ird.observe.services.dto.DataReference;
+import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
+import fr.ird.observe.services.dto.longline.TripLonglineDto;
+import fr.ird.observe.services.service.longline.ActivityLonglineService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -169,8 +169,7 @@ public class MoveActivityLonglinesUIAction extends AbstractUIAction {
         ObserveNode oldTripLonglineNode = oldActivitiesNode.getParent();
         ObserveNode programNode = oldTripLonglineNode.getParent();
         ObserveNode newTripLonglineNode = treeHelper.getChild(programNode, tripLonglineId);
-        String activitiesNodeId = DecoratorService.getPropertyLabel(ObserveTreeHelper.TREE_NODE_PREFIX,
-                                                                    TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE);
+        String activitiesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(ActivityLonglineDto.class);
         ObserveNode newActivitiesNode = treeHelper.getChild(newTripLonglineNode, activitiesNodeId);
 
         // Let's check if we're moving an open activity
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java
index 8f60543..aa29939 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java
@@ -23,12 +23,8 @@ package fr.ird.observe.application.swing.ui.actions.shared;
 
 import fr.ird.observe.application.swing.ObserveOpenDataManager;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator;
-import fr.ird.observe.services.dto.DataReference;
-import fr.ird.observe.services.dto.seine.ActivitySeineDto;
-import fr.ird.observe.services.dto.seine.RouteDto;
-import fr.ird.observe.services.service.seine.ActivitySeineService;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.content.ContentUI;
 import fr.ird.observe.application.swing.ui.content.list.impl.seine.ActivitySeinesUI;
@@ -37,6 +33,10 @@ import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
 import fr.ird.observe.application.swing.ui.tree.RouteSeineNode;
 import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity;
+import fr.ird.observe.services.dto.DataReference;
+import fr.ird.observe.services.dto.seine.ActivitySeineDto;
+import fr.ird.observe.services.dto.seine.RouteDto;
+import fr.ird.observe.services.service.seine.ActivitySeineService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -165,8 +165,7 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction {
         ObserveNode routesNode = oldRouteNode.getParent();
         ObserveNode tripNode = routesNode.getParent();
         ObserveNode newRouteNode = treeHelper.getChild(routesNode, routeId);
-        String activitiesNodeId = DecoratorService.getPropertyLabel(ObserveTreeHelper.TREE_NODE_PREFIX,
-                                                                    RouteDto.PROPERTY_ACTIVITY_SEINE);
+        String activitiesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(ActivitySeineDto.class);
         ObserveNode newActivitiesNode = treeHelper.getChild(newRouteNode, activitiesNodeId);
 
         // Let's check if we're moving an open activity
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java
index adcfd42..e371f39 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveRoutesUIAction.java
@@ -23,12 +23,8 @@ package fr.ird.observe.application.swing.ui.actions.shared;
 
 import fr.ird.observe.application.swing.ObserveOpenDataManager;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator;
-import fr.ird.observe.services.dto.DataReference;
-import fr.ird.observe.services.dto.seine.RouteDto;
-import fr.ird.observe.services.dto.seine.TripSeineDto;
-import fr.ird.observe.services.service.seine.RouteService;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.content.ContentUI;
 import fr.ird.observe.application.swing.ui.content.list.impl.seine.RoutesUI;
@@ -36,6 +32,10 @@ import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
 import fr.ird.observe.application.swing.ui.tree.TripSeineNode;
 import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity;
+import fr.ird.observe.services.dto.DataReference;
+import fr.ird.observe.services.dto.seine.RouteDto;
+import fr.ird.observe.services.dto.seine.TripSeineDto;
+import fr.ird.observe.services.service.seine.RouteService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -162,8 +162,7 @@ public class MoveRoutesUIAction extends AbstractUIAction {
         ObserveNode oldTripSeineNode = oldRoutesNode.getParent();
         ObserveNode programNode = oldTripSeineNode.getParent();
         ObserveNode newTripSeineNode = treeHelper.getChild(programNode, tripSeineId);
-        String routesNodeId = DecoratorService.getPropertyLabel(ObserveTreeHelper.TREE_NODE_PREFIX,
-                                                                TripSeineDto.PROPERTY_ROUTE);
+        String routesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(RouteDto.class);
         ObserveNode newRoutesNode = treeHelper.getChild(newTripSeineNode, routesNodeId);
 
         // Let's check if we're moving an open route
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java
index 1e3efda..95d1967 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java
@@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import org.nuiton.decorator.Decorator;
 
 import javax.swing.DefaultListCellRenderer;
@@ -56,7 +57,7 @@ public class ObsoleteReferentialReferenceListCellRenderer extends DefaultListCel
 
         DecoratorService service = getDecoratorService();
         Class referentialReferenceType = referentialReference.getReferentialReference().getType();
-        String type = t(DecoratorService.getEntityLabel(referentialReferenceType));
+        String type = t(ObserveI18nDecoratorHelper.getTypeI18nKey(referentialReferenceType));
         Decorator<?> decorator = service.getReferentialReferenceDecorator(referentialReferenceType);
 
         String text = type + " : " + decorator.toString(referentialReference.getReferentialReference());
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
index 4c4ca6d..a95ffea 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
@@ -22,7 +22,7 @@
 package fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy;
 
 import com.google.common.collect.ImmutableSet;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
@@ -304,7 +304,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler {
 
             for (Class<? extends ReferentialDto> referentialName : referentialSynchronizeResult.getReferentialNames()) {
 
-                String referentialStr = t(DecoratorService.getEntityLabel(referentialName));
+                String referentialStr = t(ObserveI18nDecoratorHelper.getTypeI18nKey(referentialName));
 
                 Collection<String> referentialAdded = referentialSynchronizeResult.getReferentialAdded(referentialName);
                 if (CollectionUtils.isNotEmpty(referentialAdded)) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java
index 5516f9a..c389c00 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java
@@ -23,10 +23,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act
  */
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
-import fr.ird.observe.services.dto.referential.ReferentialDto;
-import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.actions.AbstractObserveAction;
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialReplaceUI;
@@ -36,7 +34,8 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.Refe
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.ReferentialSynchronizeTaskSupport;
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel;
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
+import fr.ird.observe.services.dto.referential.ReferentialDto;
+import fr.ird.observe.services.dto.referential.ReferentialReference;
 import jaxx.runtime.context.JAXXInitialContext;
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.logging.Log;
@@ -144,7 +143,7 @@ public abstract class RegisterTasksActionSupport extends AbstractObserveAction {
                                                                                        .add(ReferentialReplaceUIHandler.CONTEXT_NAME, decorator)
                                                                                        .add(this));
 
-                typeStr = t(DecoratorService.getEntityLabel(ObserveTreeHelper.TREE_NODE_PREFIX, type));
+                typeStr = t(ObserveI18nDecoratorHelper.getTypeI18nKey(type));
                 referenceStr = ui.getHandler().getDecoratorService().getReferentialReferenceDecorator(type).toString(reference);
                 replaceUI.getMessage().setText(t("observe.actions.synchro.referential.replaceBefore.message", typeStr, referenceStr));
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java
index 5be90e9..e691574 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java
@@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas
  */
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest;
@@ -59,7 +59,7 @@ public abstract class ReferentialSynchronizeTaskSupport<R extends ReferentialDto
         this.i18nKey = resource.getTaskLabel(left);
         this.taskType = resource.getTaskType();
         this.dataStr = ObserveSwingApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(referential.getType()).toString(referential);
-        this.typeStr = t(DecoratorService.getEntityLabel(referential.getType()));
+        this.typeStr = t(ObserveI18nDecoratorHelper.getTypeI18nKey(referential.getType()));
     }
 
     public boolean isLeft() {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java
index 13bce9e..f47bde0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java
@@ -23,11 +23,11 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
-import fr.ird.observe.services.dto.referential.ReferentialReference;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport;
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferentialSynchroNodeSupport;
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
+import fr.ird.observe.services.dto.referential.ReferentialReference;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.decorator.Decorator;
@@ -94,7 +94,7 @@ public class ReferentialSynchronizeTreeCellRenderer extends DefaultTreeCellRende
         if (node instanceof TypeReferentialSynchroNode) {
             TypeReferentialSynchroNode node1 = (TypeReferentialSynchroNode) node;
             icon = node1.getIcon();
-            text = "<html><body>" + t(DecoratorService.getEntityLabel(ObserveTreeHelper.TREE_NODE_PREFIX, node1.getUserObject()));
+            text = "<html><body>" + t(ObserveI18nDecoratorHelper.getTypeI18nKey(node1.getUserObject()));
             int childCount = node1.getChildCount();
             text += " <i>(" + childCount + ")</i>";
         } else if (node instanceof ReferenceReferentialSynchroNodeSupport) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java
index 23480ef..d476cf3 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java
@@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.validate;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.services.dto.AbstractReference;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.services.service.actions.validate.ValidateResultForDto;
@@ -80,7 +81,7 @@ public class ValidateEntityListCellRenderer extends DefaultListCellRenderer impl
             }
 
             for (Class<?> klass : model.getMessageTypes()) {
-                String type = t(DecoratorService.getEntityLabel(klass));
+                String type = t(ObserveI18nDecoratorHelper.getTypeI18nKey(klass));
                 renderCache.put(klass, type);
             }
         }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx
index ac73bc4..782b331 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx
@@ -47,7 +47,7 @@
 
   <ValidateModel id='stepModel' initializer='getModel().getValidateModel()'/>
 
-  <DefaultListModel id='typeModel'/>
+  <DefaultListModel id='typeModel' genericType='Class<?>'/>
 
   <DefaultListModel id='refModel'/>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java
index 756072c..3a17001 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java
@@ -26,8 +26,20 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
+import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
+import fr.ird.observe.application.swing.ui.UIHelper;
+import fr.ird.observe.application.swing.ui.admin.AdminStep;
+import fr.ird.observe.application.swing.ui.admin.AdminTabUI;
+import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
+import fr.ird.observe.application.swing.ui.admin.AdminUI;
+import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
+import fr.ird.observe.application.swing.ui.admin.config.ConfigUI;
+import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI;
+import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
+import fr.ird.observe.application.swing.ui.util.ObserveValidationMessageTableRenderer;
+import fr.ird.observe.application.swing.validation.ValidationModelMode;
 import fr.ird.observe.services.dto.AbstractReference;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.IdDto;
@@ -43,17 +55,6 @@ import fr.ird.observe.services.service.actions.validate.ValidateResultForDtos;
 import fr.ird.observe.services.service.actions.validate.ValidateService;
 import fr.ird.observe.services.service.actions.validate.ValidationMessage;
 import fr.ird.observe.services.service.actions.validate.ValidatorDto;
-import fr.ird.observe.application.swing.ui.UIHelper;
-import fr.ird.observe.application.swing.ui.admin.AdminStep;
-import fr.ird.observe.application.swing.ui.admin.AdminTabUI;
-import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
-import fr.ird.observe.application.swing.ui.admin.AdminUI;
-import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
-import fr.ird.observe.application.swing.ui.admin.config.ConfigUI;
-import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI;
-import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
-import fr.ird.observe.application.swing.ui.util.ObserveValidationMessageTableRenderer;
-import fr.ird.observe.application.swing.validation.ValidationModelMode;
 import jaxx.runtime.SwingUtil;
 import jaxx.runtime.context.JAXXInitialContext;
 import jaxx.runtime.swing.wizard.ext.WizardState;
@@ -232,15 +233,15 @@ public class ValidateUIHandler extends AdminTabUIHandler {
 
         ValidateUI tabUI = (ValidateUI) ui;
 
-        DefaultListModel typeModel = tabUI.typeModel;
+        DefaultListModel<Class<?>> typeModel = tabUI.typeModel;
         tabUI.typeSelectionModel.clearSelection();
         typeModel.clear();
 
-        Set<Class<? extends IdDto>> messageTypes = tabUI.getStepModel().getMessageTypes();
+        Set<Class> messageTypes = (Set) tabUI.getStepModel().getMessageTypes();
 
-        List<Class<? extends IdDto>> classes = getDecoratorService().sortTypes(messageTypes);
+        List<Class> classes = ObserveI18nDecoratorHelper.sortTypes(messageTypes);
 
-        for (Class<? extends IdDto> e : classes) {
+        for (Class<?> e : classes) {
 
             typeModel.addElement(e);
 
@@ -383,7 +384,7 @@ public class ValidateUIHandler extends AdminTabUIHandler {
             // des validateurs ont été trouvés
 
             for (ValidatorDto v : validators) {
-                String label = t(DecoratorService.getEntityLabel(v.getType()));
+                String label = t(ObserveI18nDecoratorHelper.getTypeI18nKey(v.getType()));
                 sendMessage(t("observe.actions.validate.message.detected", label));
             }
         } else {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
index 08c56ea..afc2a71 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
@@ -28,6 +28,7 @@ import fr.ird.observe.application.swing.ObserveOpenDataManager;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.ObserveSwingTechnicalException;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator;
 import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.application.swing.db.DataContext;
@@ -507,7 +508,7 @@ public abstract class ContentUIHandler<E extends IdDto> {
 
     public String updateTitle(String title) {
         if (ContentReferenceUIHandler.class.isAssignableFrom(getClass())) {
-            return DecoratorService.getEntityLabel(getBeanType());
+            return ObserveI18nDecoratorHelper.getTypeI18nKey(getBeanType());
         }
         return title;
     }
@@ -673,13 +674,13 @@ public abstract class ContentUIHandler<E extends IdDto> {
     protected void addInfoMessage(String message) {
         addMessage(ui,
                    NuitonValidatorScope.INFO,
-                   getEntityLabel(getModel().getBeanType()),
+                   getTypeI18nKey(getModel().getBeanType()),
                    t(message)
         );
     }
 
-    protected String getEntityLabel(Class<?> klass) {
-        return DecoratorService.getEntityLabel(klass);
+    protected String getTypeI18nKey(Class<?> klass) {
+        return ObserveI18nDecoratorHelper.getTypeI18nKey(klass);
     }
 
     protected void prepareValidationContext() {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
index 2113a01..37a9e82 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
@@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator;
 import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.application.swing.ui.actions.shared.AbstractUIAction;
@@ -603,7 +604,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E
             log.debug("Will use decorator " + decorator);
         }
 
-        String entityLabel = t(DecoratorService.getEntityLabel(dtoClass));
+        String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass));
         list.getPopupSortLabel().setText(t("observe.content.type.data", entityLabel));
 
         list.putClientProperty("decorator", decorator);
@@ -632,7 +633,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E
             log.debug("Will use decorator " + decorator);
         }
 
-        String entityLabel = t(DecoratorService.getEntityLabel(dtoClass));
+        String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass));
         list.getPopupSortLabel().setText(t("observe.content.type.referential", entityLabel));
 
         list.putClientProperty("decorator", decorator);
@@ -661,7 +662,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E
             log.debug("Will use decorator " + decorator);
         }
 
-        String entityLabel = t(DecoratorService.getEntityLabel(dtoClass));
+        String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass));
         list.setPopupTitleText(t("observe.content.type.data", entityLabel));
 
         list.putClientProperty("decorator", decorator);
@@ -688,7 +689,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E
             log.debug("Will use decorator " + decorator);
         }
 
-        String entityLabel = t(DecoratorService.getEntityLabel(dtoClass));
+        String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass));
         list.setPopupTitleText(t("observe.content.type.referential", entityLabel));
 
         list.putClientProperty("decorator", decorator);
@@ -711,7 +712,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E
 
         DataReferenceDecorator<D> decorator = decoratorService.getDataReferenceDecorator(dtoClass);
 
-        String entityLabel = t(DecoratorService.getEntityLabel(dtoClass));
+        String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass));
         comboBox.setPopupTitleText(t("observe.content.type.data", entityLabel));
 
         comboBox.init(decorator, Collections.emptyList());
@@ -736,7 +737,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E
 
         ReferentialReferenceDecorator<D> decorator = decoratorService.getReferentialReferenceDecorator(dtoClass);
 
-        String entityLabel = t(DecoratorService.getEntityLabel(dtoClass));
+        String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass));
         comboBox.setPopupTitleText(t("observe.content.type.referential", entityLabel));
 
         comboBox.init(decorator, Collections.emptyList());
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
index db108f0..a450bc4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
@@ -21,29 +21,8 @@
  */
 package fr.ird.observe.application.swing.ui.content;
 
+import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import fr.ird.observe.services.dto.constants.GearType;
-import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
-import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto;
-import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto;
-import fr.ird.observe.services.dto.longline.SetLonglineCatchDto;
-import fr.ird.observe.services.dto.longline.SetLonglineDto;
-import fr.ird.observe.services.dto.longline.SetLonglineTdrDto;
-import fr.ird.observe.services.dto.longline.TripLonglineDto;
-import fr.ird.observe.services.dto.referential.ProgramDto;
-import fr.ird.observe.services.dto.referential.ReferentialDto;
-import fr.ird.observe.services.dto.referential.ReferentialDtos;
-import fr.ird.observe.services.dto.seine.ActivitySeineDto;
-import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto;
-import fr.ird.observe.services.dto.seine.FloatingObjectDto;
-import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto;
-import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto;
-import fr.ird.observe.services.dto.seine.RouteDto;
-import fr.ird.observe.services.dto.seine.SetSeineDto;
-import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto;
-import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto;
-import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto;
-import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.content.impl.longline.LonglineDetailCompositionUI;
@@ -81,6 +60,37 @@ import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetDiscar
 import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleCaptureUI;
 import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleRejeteUI;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
+import fr.ird.observe.services.dto.constants.GearType;
+import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
+import fr.ird.observe.services.dto.longline.CatchLonglineDto;
+import fr.ird.observe.services.dto.longline.EncounterDto;
+import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto;
+import fr.ird.observe.services.dto.longline.SensorUsedDto;
+import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto;
+import fr.ird.observe.services.dto.longline.SetLonglineDto;
+import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;
+import fr.ird.observe.services.dto.longline.TdrDto;
+import fr.ird.observe.services.dto.longline.TripLonglineDto;
+import fr.ird.observe.services.dto.referential.ProgramDto;
+import fr.ird.observe.services.dto.referential.ReferentialDto;
+import fr.ird.observe.services.dto.referential.ReferentialDtos;
+import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto;
+import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto;
+import fr.ird.observe.services.dto.seine.ActivitySeineDto;
+import fr.ird.observe.services.dto.seine.DiscardedTargetCatchDto;
+import fr.ird.observe.services.dto.seine.DiscardedTargetSampleDto;
+import fr.ird.observe.services.dto.seine.FloatingObjectDto;
+import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto;
+import fr.ird.observe.services.dto.seine.KeptTargetCatchDto;
+import fr.ird.observe.services.dto.seine.KeptTargetSampleDto;
+import fr.ird.observe.services.dto.seine.NonTargetCatchDto;
+import fr.ird.observe.services.dto.seine.NonTargetSampleDto;
+import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto;
+import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto;
+import fr.ird.observe.services.dto.seine.RouteDto;
+import fr.ird.observe.services.dto.seine.SchoolEstimateDto;
+import fr.ird.observe.services.dto.seine.SetSeineDto;
+import fr.ird.observe.services.dto.seine.TripSeineDto;
 import jaxx.runtime.JAXXContext;
 import jaxx.runtime.context.JAXXInitialContext;
 import jaxx.runtime.swing.CardLayout2;
@@ -105,121 +115,81 @@ import static org.nuiton.i18n.I18n.n;
  */
 public class ContentUIManager {
 
-    public static final String REFERENCE = "reference";
+    private static final String REFERENCE = "reference";
 
     public static final String DATA = "data";
 
     /** Logger */
     static private final Log log = LogFactory.getLog(ContentUIManager.class);
 
-//    /** L'ui qui utilise le manager */
-//    protected final ObserveMainUI ui;
-
-    protected final Map<String, Class<? extends ObserveContentUI<?>>> mapping;
-
-    protected ObserveMainUI getMainUI() {
-        return ObserveSwingApplicationContext.get().getMainUI();
-    }
+    private final Map<String, Class<? extends ObserveContentUI<?>>> mapping;
 
     public ContentUIManager() {
 
-//        this.ui = ui;
         mapping = new TreeMap<>();
 
         // --- Seine data --- //
         addMapping(DATA, ProgramDto.class, GearType.seine.name(), TripSeinesUI.class);
 
-        addMapping(DATA, TripSeineDto.class, TripSeineUI.class);
-        addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeine.unsaved"), TripSeineUI.class);
-        addMapping(DATA, TripSeineDto.class, "gearUseFeaturesSeine", GearUseFeaturesSeineUI.class);
-        addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_ROUTE, RoutesUI.class);
+        addMapping(DATA, TripSeineDto.class, null, TripSeineUI.class);
+        addMapping(DATA, TripSeineDto.class, n("observe.type.tripSeine.unsaved"), TripSeineUI.class);
+        addMapping(DATA, TripSeineDto.class, GearUseFeaturesSeineDto.class, GearUseFeaturesSeineUI.class);
+        addMapping(DATA, TripSeineDto.class, RouteDto.class, RoutesUI.class);
 
-        addMapping(DATA, RouteDto.class, RouteUI.class);
-        addMapping(DATA, RouteDto.class, n("observe.tree.route.unsaved"), RouteUI.class);
-        addMapping(DATA, RouteDto.class, RouteDto.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class);
+        addMapping(DATA, RouteDto.class, null, RouteUI.class);
+        addMapping(DATA, RouteDto.class, n("observe.type.route.unsaved"), RouteUI.class);
+        addMapping(DATA, RouteDto.class, ActivitySeineDto.class, ActivitySeinesUI.class);
 
-        addMapping(DATA, ActivitySeineDto.class, ActivitySeineUI.class);
-        addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeine.unsaved"), ActivitySeineUI.class);
-        addMapping(DATA, ActivitySeineDto.class, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class);
+        addMapping(DATA, ActivitySeineDto.class, null, ActivitySeineUI.class);
+        addMapping(DATA, ActivitySeineDto.class, n("observe.type.activitySeine.unsaved"), ActivitySeineUI.class);
+        addMapping(DATA, ActivitySeineDto.class, ObservedSystemDto.class, ActivitySeineObservedSystemUI.class);
 
-        addMapping(DATA, SetSeineDto.class, SetSeineUI.class);
-        addMapping(DATA, SetSeineDto.class, n("observe.tree.setSeine.unsaved"), SetSeineUI.class);
-        addMapping(DATA, SetSeineDto.class, SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE, SchoolEstimateUI.class);
-        addMapping(DATA, SetSeineDto.class, SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH, TargetCatchUI.class);
-        addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_TARGET_DISCARDED, TargetDiscardCatchUI.class);
-        addMapping(DATA, SetSeineDto.class, SetSeineDto.PROPERTY_TARGET_SAMPLE_CAPTURE, TargetSampleCaptureUI.class);
-        addMapping(DATA, SetSeineDto.class, SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH, NonTargetCatchUI.class);
+        addMapping(DATA, SetSeineDto.class, null, SetSeineUI.class);
+        addMapping(DATA, SetSeineDto.class, n("observe.type.setSeine.unsaved"), SetSeineUI.class);
+        addMapping(DATA, SetSeineDto.class, SchoolEstimateDto.class, SchoolEstimateUI.class);
+        addMapping(DATA, SetSeineDto.class, KeptTargetCatchDto.class, TargetCatchUI.class);
+        addMapping(DATA, SetSeineDto.class, DiscardedTargetCatchDto.class, TargetDiscardCatchUI.class);
+        addMapping(DATA, SetSeineDto.class, NonTargetCatchDto.class, NonTargetCatchUI.class);
 
-        addMapping(DATA, SetSeineDto.class, "targetSample", TargetSampleRejeteUI.class);
-        addMapping(DATA, SetSeineDto.class, "nonTargetSample", NonTargetSampleUI.class);
+        addMapping(DATA, SetSeineDto.class, KeptTargetSampleDto.class, TargetSampleCaptureUI.class);
+        addMapping(DATA, SetSeineDto.class, DiscardedTargetSampleDto.class, TargetSampleRejeteUI.class);
+        addMapping(DATA, SetSeineDto.class, NonTargetSampleDto.class, NonTargetSampleUI.class);
 
-        addMapping(DATA, FloatingObjectDto.class, FloatingObjectUI.class);
-        addMapping(DATA, FloatingObjectDto.class, n("observe.tree.floatingObject.unsaved"), FloatingObjectUI.class);
-        addMapping(DATA, FloatingObjectDto.class, FloatingObjectDto.PROPERTY_OBJECT_OPERATION, FloatingObjectTransmittingBuoyOperationUI.class);
-        addMapping(DATA, FloatingObjectDto.class, FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES, ObjectObservedSpeciesUI.class);
-        addMapping(DATA, FloatingObjectDto.class, FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE, ObjectSchoolEstimateUI.class);
+        addMapping(DATA, FloatingObjectDto.class, null, FloatingObjectUI.class);
+        addMapping(DATA, FloatingObjectDto.class, n("observe.type.floatingObject.unsaved"), FloatingObjectUI.class);
+        addMapping(DATA, FloatingObjectDto.class, ObjectOperationDto.class, FloatingObjectTransmittingBuoyOperationUI.class);
+        addMapping(DATA, FloatingObjectDto.class, ObjectObservedSpeciesDto.class, ObjectObservedSpeciesUI.class);
+        addMapping(DATA, FloatingObjectDto.class, ObjectSchoolEstimateDto.class, ObjectSchoolEstimateUI.class);
 
         // --- Longline data --- //
 
         addMapping(DATA, ProgramDto.class, GearType.longline.name(), TripLonglinesUI.class);
 
-        addMapping(DATA, TripLonglineDto.class, TripLonglineUI.class);
-        addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLongline.unsaved"), TripLonglineUI.class);
-        addMapping(DATA, TripLonglineDto.class, "gearUseFeaturesLongline", GearUseFeaturesLonglineUI.class);
-        addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class);
+        addMapping(DATA, TripLonglineDto.class, null, TripLonglineUI.class);
+        addMapping(DATA, TripLonglineDto.class, n("observe.type.tripLongline.unsaved"), TripLonglineUI.class);
+        addMapping(DATA, TripLonglineDto.class, GearUseFeaturesLonglineDto.class, GearUseFeaturesLonglineUI.class);
+        addMapping(DATA, TripLonglineDto.class, ActivityLonglineDto.class, ActivityLonglinesUI.class);
 
-        addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineUI.class);
-        addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class);
-        addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineEncounterDto.PROPERTY_ENCOUNTER, EncounterUI.class);
-        addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED, SensorUsedUI.class);
+        addMapping(DATA, ActivityLonglineDto.class, null, ActivityLonglineUI.class);
+        addMapping(DATA, ActivityLonglineDto.class, n("observe.type.activityLongline.unsaved"), ActivityLonglineUI.class);
+        addMapping(DATA, ActivityLonglineDto.class, EncounterDto.class, EncounterUI.class);
+        addMapping(DATA, ActivityLonglineDto.class, SensorUsedDto.class, SensorUsedUI.class);
 
-        addMapping(DATA, SetLonglineDto.class, SetLonglineUI.class);
-        addMapping(DATA, SetLonglineDto.class, n("observe.tree.setLongline.unsaved"), SetLonglineUI.class);
-        addMapping(DATA, SetLonglineDto.class, "longlineGlobalComposition", LonglineGlobalCompositionUI.class);
-        addMapping(DATA, SetLonglineDto.class, "longlineDetailComposition", LonglineDetailCompositionUI.class);
+        addMapping(DATA, SetLonglineDto.class, null, SetLonglineUI.class);
+        addMapping(DATA, SetLonglineDto.class, n("observe.type.setLongline.unsaved"), SetLonglineUI.class);
+        addMapping(DATA, SetLonglineDto.class, SetLonglineGlobalCompositionDto.class, LonglineGlobalCompositionUI.class);
+        addMapping(DATA, SetLonglineDto.class, SetLonglineDetailCompositionDto.class, LonglineDetailCompositionUI.class);
 
-        addMapping(DATA, SetLonglineDto.class, SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE, CatchLonglineUI.class);
-        addMapping(DATA, SetLonglineDto.class, SetLonglineTdrDto.PROPERTY_TDR, TdrUI.class);
+        addMapping(DATA, SetLonglineDto.class, CatchLonglineDto.class, CatchLonglineUI.class);
+        addMapping(DATA, SetLonglineDto.class, TdrDto.class, TdrUI.class);
 
         // --- Referential --- //
 
-        for (Class<? extends ReferentialDto> editType : ReferentialDtos.REFERENCE_COMMON_DTOS) {
-            String simpleName = StringUtils.removeEnd(editType.getSimpleName(), "Dto");
-            String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl." + simpleName + "UI";
-            Class<?> result;
-            try {
-                result = Class.forName(fqn);
-                addMapping(REFERENCE, editType, null, result);
-            } catch (ClassNotFoundException e) {
-                throw new IllegalStateException("Could not find " + fqn);
-            }
-        }
+        loadReferentialsMapping(ReferentialDtos.REFERENCE_COMMON_DTOS, "impl");
+        loadReferentialsMapping(ReferentialDtos.REFERENCE_SEINE_DTOS, "impl.seine");
+        loadReferentialsMapping(ReferentialDtos.REFERENCE_LONGLINE_DTOS, "impl.longline");
 
-        for (Class<? extends ReferentialDto> editType : ReferentialDtos.REFERENCE_SEINE_DTOS) {
-            String simpleName = StringUtils.removeEnd(editType.getSimpleName(), "Dto");
-            String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.seine." + simpleName + "UI";
-            Class<?> result;
-            try {
-                result = Class.forName(fqn);
-                addMapping(REFERENCE, editType, null, result);
-            } catch (ClassNotFoundException e) {
-                throw new IllegalStateException("Could not find " + fqn);
-            }
-        }
-
-        for (Class<? extends ReferentialDto> editType : ReferentialDtos.REFERENCE_LONGLINE_DTOS) {
-            String simpleName = StringUtils.removeEnd(editType.getSimpleName(), "Dto");
-            String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.longline." + simpleName + "UI";
-            Class<?> result;
-            try {
-                result = Class.forName(fqn);
-                addMapping(REFERENCE, editType, null, result);
-            } catch (ClassNotFoundException e) {
-                throw new IllegalStateException("Could not find " + fqn);
-            }
-        }
-
-        addMapping(REFERENCE, null, ReferenceHomeUI.class);
+        addMapping(REFERENCE, null, null, ReferenceHomeUI.class);
 
     }
 
@@ -262,7 +232,6 @@ public class ContentUIManager {
         return mapping.get(mappingKey);
     }
 
-    @SuppressWarnings({"unchecked"})
     public <U extends ObserveContentUI<?>> U getContent(Class<U> uiClass) {
 
         CardLayout2 layout = getLayout();
@@ -350,34 +319,11 @@ public class ContentUIManager {
     }
 
     public ContentUI<?> getSelectedContentUI() {
-
-        ObserveMainUI ui = getMainUI();
-        return getSelectedContentUI(ui);
+        return getSelectedContentUI(getMainUI());
     }
 
     public boolean closeSelectedContentUI() {
-        ObserveMainUI ui = getMainUI();
-        return closeSelectedContentUI(ui);
-    }
-
-    public ContentUI<?> getSelectedContentUI(ObserveMainUI ui) {
-
-        ContentUI<?> result = null;
-
-        if (ui == null) {
-            // no ui, so no modification
-            return result;
-        }
-
-        CardLayout2 layout = ui.getContentLayout();
-        JPanel container = ui.getContent();
-        Component currentContent = layout.getVisibleComponent(container);
-        if (currentContent != null &&
-                currentContent instanceof ContentUI<?>) {
-
-            result = (ContentUI<?>) currentContent;
-        }
-        return result;
+        return closeSelectedContentUI(getMainUI());
     }
 
     /**
@@ -403,31 +349,65 @@ public class ContentUIManager {
         return closed;
     }
 
-    protected JPanel getLayoutContent() {
+    @Override
+    protected void finalize() throws Throwable {
+        super.finalize();
+        close();
+    }
+
+    private void loadReferentialsMapping(ImmutableSet<Class<? extends ReferentialDto>> types, String packagePrefix) {
+        for (Class<? extends ReferentialDto> editType : types) {
+            String simpleName = StringUtils.removeEnd(editType.getSimpleName(), "Dto");
+            String fqn = ContentReferenceUI.class.getPackage().getName() + "." + packagePrefix + "." + simpleName + "UI";
+            Class<?> result;
+            try {
+                result = Class.forName(fqn);
+                addMapping(REFERENCE, null, editType, result);
+            } catch (ClassNotFoundException e) {
+                throw new IllegalStateException("Could not find " + fqn);
+            }
+        }
+
+    }
+
+    private JPanel getLayoutContent() {
         return getMainUI().getContent();
     }
 
-    protected CardLayout2 getLayout() {
+    private CardLayout2 getLayout() {
         return getMainUI().getContentLayout();
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        close();
+    private ObserveMainUI getMainUI() {
+        return ObserveSwingApplicationContext.get().getMainUI();
     }
 
-    protected void addMapping(String prefix, Class<?> klass, Class<? extends ObserveContentUI<?>> contentClass) {
-        addMapping(prefix, klass, null, contentClass);
+    private ContentUI<?> getSelectedContentUI(ObserveMainUI ui) {
+
+        if (ui == null) {
+            // no ui, so no modification
+            return null;
+        }
+
+        ContentUI<?> result = null;
+        CardLayout2 layout = ui.getContentLayout();
+        JPanel container = ui.getContent();
+        Component currentContent = layout.getVisibleComponent(container);
+        if (currentContent != null && currentContent instanceof ContentUI<?>) {
+
+            result = (ContentUI<?>) currentContent;
+        }
+        return result;
     }
 
-    @SuppressWarnings({"unchecked"})
-    protected void addMapping(String prefix, Class<?> klass, String context, Class<?> contentClass) {
-        String key = getMappingKey(prefix, klass, context);
+    private void addMapping(String prefix, Class<?> klass, Object context, Class<?> contentClass) {
+
+        String contextValue = context instanceof Class ? ((Class) context).getName() : (context == null ? null : context.toString());
+        String key = getMappingKey(prefix, klass, contextValue);
         mapping.put(key, (Class<? extends ContentUI<?>>) contentClass);
     }
 
-    protected String getMappingKey(String prefix, Class<?> klass, String context) {
+    private String getMappingKey(String prefix, Class<?> klass, String context) {
         String key = prefix + ".";
         if (klass != null) {
             key += klass.getName();
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
index eca9470..fd21e26 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
@@ -259,7 +259,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
             // l'activité n'est pas ouverte, mode lecture
             addMessage(getUi(),
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(ActivityLonglineDto.class),
+                       getTypeI18nKey(ActivityLonglineDto.class),
                        t("observe.storage.activityLongline.message.not.open"));
 
             contentMode = ContentMode.READ;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java
index 8f6d908..bcc3747 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java
@@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.content.impl.longline;
  */
 
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.services.dto.longline.BasketDto;
 import fr.ird.observe.services.dto.longline.BranchlineDto;
 import fr.ird.observe.services.dto.longline.SectionDto;
@@ -123,7 +124,7 @@ public class LonglineDetailCompositionValidationContext implements SimpleBeanVal
 
     public void addMessage(SwingValidator validator, NuitonValidatorScope scope, String field, String messageToAdd) {
 
-        String propertyLabel = DecoratorService.getPropertyLabel(field);
+        String propertyLabel = ObserveI18nDecoratorHelper.getPropertyI18nKey(field);
         SwingValidatorMessage message = new SwingValidatorMessage(
                 validator,
                 contextLabel + " - " + t(propertyLabel),
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java
index a09147d..aa7f385 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java
@@ -87,7 +87,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong
         // l'activité n'est pas ouverte, mode lecture
         addMessage(getUi(),
                    NuitonValidatorScope.INFO,
-                   getEntityLabel(ActivityLonglineDto.class),
+                   getTypeI18nKey(ActivityLonglineDto.class),
                    t("observe.storage.activityLongline.message.not.open"));
         return ContentMode.READ;
     }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java
index 8e2feff..d05a46c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java
@@ -146,7 +146,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> {
         // l'activité n'est pas ouverte, mode lecture
         addMessage(getUi(),
                    NuitonValidatorScope.INFO,
-                   getEntityLabel(ActivityLonglineDto.class),
+                   getTypeI18nKey(ActivityLonglineDto.class),
                    t("observe.storage.activityLongline.message.not.open"));
 
         return ContentMode.READ;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java
index 006cf54..b312bee 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java
@@ -73,9 +73,9 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ
 
         // activity courante non ouverte
         addMessage(getUi(),
-                NuitonValidatorScope.INFO,
-                getEntityLabel(ActivitySeineDto.class),
-                t("observe.storage.activitySeine.message.not.open"));
+                   NuitonValidatorScope.INFO,
+                   getTypeI18nKey(ActivitySeineDto.class),
+                   t("observe.storage.activitySeine.message.not.open"));
 
         return ContentMode.READ;
     }
@@ -110,9 +110,9 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ
     public void startEditUI(String... binding) {
 
         addMessage(getUi(),
-                NuitonValidatorScope.INFO,
-                getEntityLabel(ActivitySeineDto.class),
-                t("observe.storage.activitySeine.message.updating"));
+                   NuitonValidatorScope.INFO,
+                   getTypeI18nKey(ActivitySeineDto.class),
+                   t("observe.storage.activitySeine.message.updating"));
 
         super.startEditUI(binding);
     }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
index 64ae47e..344f6d5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
@@ -95,7 +95,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH
         // activity courante non ouverte
         addMessage(getUi(),
                    NuitonValidatorScope.INFO,
-                   getEntityLabel(ActivitySeineDto.class),
+                   getTypeI18nKey(ActivitySeineDto.class),
                    t("observe.storage.activitySeine.message.not.open"));
 
         return ContentMode.READ;
@@ -175,9 +175,9 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH
         FloatingObjectTransmittingBuoyOperationUI ui = getUi();
 
         addMessage(getUi(),
-                NuitonValidatorScope.INFO,
-                getEntityLabel(FloatingObjectDto.class),
-                t("observe.message.updating.floatingObject"));
+                   NuitonValidatorScope.INFO,
+                   getTypeI18nKey(FloatingObjectDto.class),
+                   t("observe.message.updating.floatingObject"));
 
         Collection<TransmittingBuoyDto> balises = getBean().getTransmittingBuoy();
         if (balises != null && !balises.isEmpty()) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
index 6d322b7..18dc3a4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
@@ -89,7 +89,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto>
         addMessage(
                 getUi(),
                 NuitonValidatorScope.INFO,
-                getEntityLabel(ActivitySeineDto.class),
+                getTypeI18nKey(ActivitySeineDto.class),
                 t("observe.storage.activitySeine.message.not.open"));
 
         return ContentMode.READ;
@@ -145,12 +145,12 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto>
         if (create) {
             addMessage(getUi(),
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(FloatingObjectDto.class),
+                       getTypeI18nKey(FloatingObjectDto.class),
                        t("observe.content.floatingObject.message.creating"));
         } else {
             addMessage(getUi(),
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(FloatingObjectDto.class),
+                       getTypeI18nKey(FloatingObjectDto.class),
                        t("observe.content.floatingObject.message.updating"));
         }
         super.startEditUI(FloatingObjectUI.BINDING_DAYS_AT_SEA_COUNT_MODEL,
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java
index be8d16a..1ca1c8f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java
@@ -126,7 +126,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> {
         // l'activity n'est pas ouverte, mode lecture
         addMessage(getUi(),
                    NuitonValidatorScope.INFO,
-                   getEntityLabel(ActivitySeineDto.class),
+                   getTypeI18nKey(ActivitySeineDto.class),
                    t("observe.storage.activitySeine.message.not.open"));
         return ContentMode.READ;
     }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java
index 4811b7e..a19cb34 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java
@@ -143,7 +143,7 @@ public abstract class ContentOpenableUIHandler<E extends IdDto> extends ContentU
 
         removeAllMessages(ui);
         addMessage(ui, NuitonValidatorScope.INFO,
-                   getEntityLabel(bean.getClass()), t(closeMessage));
+                   getTypeI18nKey(bean.getClass()), t(closeMessage));
 
         ObserveTreeHelper treeHelper = getTreeHelper(ui);
 //        ObserveNode selectedNode = treeHelper.getSelectedNode();
@@ -256,7 +256,7 @@ public abstract class ContentOpenableUIHandler<E extends IdDto> extends ContentU
         treeHelper.addUnsavedNode(parentNode, getBeanType());
     }
 
-    protected final void obtainChildPosition(E bean){
+    protected final void obtainChildPosition(E bean) {
 
         String containerId = getSelectedParentId();
 
@@ -311,4 +311,40 @@ public abstract class ContentOpenableUIHandler<E extends IdDto> extends ContentU
         }
     }
 
-}
+    private static final String UPDATE_TRIP_NODE = "updateTripNode";
+
+    protected void repaintTripNode() {
+
+        Boolean updateTripNode = getUi().getContextValue(Boolean.class, UPDATE_TRIP_NODE);
+
+        getUi().removeContextValue(Boolean.class, UPDATE_TRIP_NODE);
+
+        if (updateTripNode == null || !updateTripNode) {
+            return;
+        }
+
+        ObserveTreeHelper treeHelper = getTreeHelper(getUi());
+        ObserveNode tripNode = treeHelper.getSelectedNode().getParent().getParent();
+        if (log.isInfoEnabled()) {
+            log.info("Refresh trip node : " + tripNode);
+        }
+        treeHelper.reloadNode(tripNode, false);
+
+    }
+
+    protected void setUpdateMareeNodeTag(boolean wasUpdated) {
+
+        if (wasUpdated) {
+
+            // la date de fin a ete modifiee, il faut : redessiner le noeud de la maree le repositionner
+            getUi().setContextValue(Boolean.TRUE, UPDATE_TRIP_NODE);
+
+        } else {
+
+            getUi().removeContextValue(Boolean.class, UPDATE_TRIP_NODE);
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java
index c774dd5..3c153de 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java
@@ -25,17 +25,15 @@ package fr.ird.observe.application.swing.ui.content.open.impl.longline;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.DataContext;
 import fr.ird.observe.application.swing.db.constants.DataContextType;
+import fr.ird.observe.application.swing.ui.content.ContentMode;
+import fr.ird.observe.application.swing.ui.content.ContentUIModel;
+import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler;
 import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
 import fr.ird.observe.services.dto.longline.ActivityLonglineDtos;
 import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.dto.result.TripChildSaveResultDto;
 import fr.ird.observe.services.service.longline.ActivityLonglineService;
-import fr.ird.observe.application.swing.ui.content.ContentMode;
-import fr.ird.observe.application.swing.ui.content.ContentUIModel;
-import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
@@ -49,7 +47,7 @@ import static org.nuiton.i18n.I18n.t;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 3.7
  */
-public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglineDto> {
+class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglineDto> {
 
     /** Logger */
     private static final Log log = LogFactory.getLog(ActivityLonglineUIHandler.class);
@@ -124,7 +122,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity
             // la marée n'est pas ouverte
             addMessage(ui,
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(TripLonglineDto.class),
+                       getTypeI18nKey(TripLonglineDto.class),
                        t("observe.content.tripLongline.message.not.open"));
 
             if (getModel().isHistoricalData()) {
@@ -227,12 +225,12 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity
         if (create) {
             addMessage(ui,
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(ActivityLonglineDto.class),
+                       getTypeI18nKey(ActivityLonglineDto.class),
                        t("observe.storage.activityLongline.message.creating"));
         } else {
             addMessage(ui,
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(ActivityLonglineDto.class),
+                       getTypeI18nKey(ActivityLonglineDto.class),
                        t("observe.storage.activityLongline.message.updating"));
         }
 
@@ -319,43 +317,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity
 
     }
 
-    public static final String UPDATE_TRIP_NODE = "updateTripNode";
-
-    protected void setUpdateMareeNodeTag(boolean wasUpdated) {
-
-        if (wasUpdated) {
-
-            // la date de fin a ete modifiee, il faut : redessiner le noeud de la maree le repositionner
-            getUi().setContextValue(Boolean.TRUE, UPDATE_TRIP_NODE);
-
-        } else {
-
-            getUi().removeContextValue(Boolean.class, UPDATE_TRIP_NODE);
-
-        }
-
-    }
-
-    protected void repaintTripNode() {
-
-        Boolean updateTripNode = getUi().getContextValue(Boolean.class, UPDATE_TRIP_NODE);
-
-        getUi().removeContextValue(Boolean.class, UPDATE_TRIP_NODE);
-
-        if (updateTripNode == null || !updateTripNode) {
-            return;
-        }
-
-        ObserveTreeHelper treeHelper = getTreeHelper(getUi());
-        ObserveNode tripNode = treeHelper.getSelectedNode().getParent().getParent();
-        if (log.isInfoEnabled()) {
-            log.info("Refresh trip node : " + tripNode);
-        }
-        treeHelper.reloadNode(tripNode, false);
-
-    }
-
-    protected ActivityLonglineService getActivityLonglineService() {
+    private ActivityLonglineService getActivityLonglineService() {
         return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newActivityLonglineService();
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java
index 82dc8fc..6e6c1e4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java
@@ -60,12 +60,12 @@ import static org.nuiton.i18n.I18n.t;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 3.7
  */
-public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto> {
+class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto> {
 
     /** Logger */
     static private final Log log = LogFactory.getLog(TripLonglineUIHandler.class);
 
-    protected boolean buildTripMap = true;
+    private boolean buildTripMap = true;
 
     public TripLonglineUIHandler(TripLonglineUI ui) {
         super(ui,
@@ -365,7 +365,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline
         return result;
     }
 
-    protected TripLonglineService getTripLonglineService() {
+    private TripLonglineService getTripLonglineService() {
         return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newTripLonglineService();
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java
index d841c5a..2b7dc6d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java
@@ -53,7 +53,7 @@ import static org.nuiton.i18n.I18n.t;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 1.0
  */
-public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto> {
+class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto> {
 
     /** Logger */
     private static final Log log = LogFactory.getLog(ActivitySeineUIHandler.class);
@@ -68,7 +68,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
 //    private LogPropertyChanges logCoordinatesChanges;
 
 
-    public ActivitySeineUIHandler(ActivitySeineUI ui) {
+    ActivitySeineUIHandler(ActivitySeineUI ui) {
         super(ui,
               DataContextType.Route,
               DataContextType.ActivitySeine,
@@ -131,7 +131,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
             // la route n'est pas ouverte
             addMessage(ui,
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(RouteDto.class),
+                       getTypeI18nKey(RouteDto.class),
                        t("observe.content.route.message.not.open"));
 
         } else if (!getOpenDataManager().isOpenTripSeine(dataContext.getSelectedTripSeineId())) {
@@ -139,7 +139,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
             // la marée n'est past ouverte
             addMessage(ui,
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(TripSeineDto.class),
+                       getTypeI18nKey(TripSeineDto.class),
                        t("observe.content.tripSeine.message.not.open"));
 
             if (getModel().isHistoricalData()) {
@@ -250,12 +250,12 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
         if (create) {
             addMessage(ui,
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(ActivitySeineDto.class),
+                       getTypeI18nKey(ActivitySeineDto.class),
                        t("observe.storage.activitySeine.message.creating"));
         } else {
             addMessage(ui,
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(ActivitySeineDto.class),
+                       getTypeI18nKey(ActivitySeineDto.class),
                        t("observe.storage.activitySeine.message.updating"));
         }
 
@@ -332,7 +332,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
         return !create && getOpenDataManager().canOpenActivitySeine(getSelectedParentId());
     }
 
-    public String getActivity6Label() {
+    String getActivity6Label() {
 
         Set<ReferentialReference<VesselActivitySeineDto>> activities = getDataSource().getReferentialReferences(VesselActivitySeineDto.class);
 
@@ -367,7 +367,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
 
     }
 
-    protected ActivitySeineService getActivitySeineService() {
+    private ActivitySeineService getActivitySeineService() {
         return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newActivitySeineService();
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java
index ae1dc06..9634c18 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java
@@ -24,6 +24,12 @@ package fr.ird.observe.application.swing.ui.content.open.impl.seine;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.DataContext;
 import fr.ird.observe.application.swing.db.constants.DataContextType;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
+import fr.ird.observe.application.swing.ui.UIHelper;
+import fr.ird.observe.application.swing.ui.content.ContentMode;
+import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler;
+import fr.ird.observe.application.swing.ui.tree.ObserveNode;
+import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
 import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto;
@@ -33,11 +39,6 @@ import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.RouteDtos;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.services.service.seine.RouteService;
-import fr.ird.observe.application.swing.ui.UIHelper;
-import fr.ird.observe.application.swing.ui.content.ContentMode;
-import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.DateUtil;
@@ -53,14 +54,14 @@ import static org.nuiton.i18n.I18n.t;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 1.0
  */
-public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
+class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
 
-    public static final String UPDATE_MAREE_NODE = "updateTripNode";
+//    private static final String UPDATE_TRIP_NODE = "updateTripNode";
 
     /** Logger */
     private static final Log log = LogFactory.getLog(RouteUIHandler.class);
 
-    public RouteUIHandler(RouteUI ui) {
+    RouteUIHandler(RouteUI ui) {
         super(ui,
               DataContextType.TripSeine,
               DataContextType.Route,
@@ -96,14 +97,14 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
         if (!dataContext.isSelectedOpen(TripSeineDto.class)) {
 
             addMessage(ui, NuitonValidatorScope.INFO,
-                       getEntityLabel(TripSeineDto.class),
+                       getTypeI18nKey(TripSeineDto.class),
                        t("observe.content.tripSeine.message.not.open"));
 
         } else {
 
             // la maree courante est ouverte
             addMessage(ui, NuitonValidatorScope.INFO,
-                       getEntityLabel(RouteDto.class),
+                       getTypeI18nKey(RouteDto.class),
                        t(closeMessage));
         }
         return ContentMode.READ;
@@ -168,12 +169,12 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
         if (create) {
             addMessage(ui,
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(RouteDto.class),
+                       getTypeI18nKey(RouteDto.class),
                        t("observe.content.route.message.creating"));
         } else {
             addMessage(ui,
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(RouteDto.class),
+                       getTypeI18nKey(RouteDto.class),
                        t("observe.content.route.message.updating"));
 
             if (getModel().isHistoricalData()) {
@@ -252,7 +253,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
         }
 
         String tripId = getSelectedParentId();
-        boolean wasEndDateUpdated = getRouteService ().delete(tripId, bean.getId());
+        boolean wasEndDateUpdated = getRouteService().delete(tripId, bean.getId());
         getOpenDataManager().closeRoute(getSelectedId());
 
         if (log.isInfoEnabled()) {
@@ -366,16 +367,13 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
         return true;
     }
 
-    protected ActivitySeineUI addActivityFinDeVeille(boolean close) {
+    private ActivitySeineUI addActivityFinDeVeille(boolean close) {
 
         ObserveTreeHelper treeHelper = getTreeHelper(getUi());
 
         // on créee l'activity de fin de veille
         ObserveNode parentNode = treeHelper.getSelectedNode();
-        parentNode = treeHelper.findNode(
-                parentNode,
-                n("observe.tree.activitySeine")
-        );
+        parentNode = treeHelper.findNode(parentNode, ObserveI18nDecoratorHelper.getTypeI18nKey(ActivitySeineDto.class));
         if (log.isDebugEnabled()) {
             log.debug("PARENT NODE = " + parentNode);
         }
@@ -390,7 +388,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
         for (ReferentialReference<VesselActivitySeineDto> refVesselActivity : selectedUI.getVesselActivitySeine().getData()) {
 
             if (ActivitySeineDto.ACTIVITY_FIN_DE_VEILLE.equals(refVesselActivity.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE))) {
-                vesselActivitySeine =  refVesselActivity;
+                vesselActivitySeine = refVesselActivity;
                 break;
             }
         }
@@ -424,41 +422,40 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
         return !create && getOpenDataManager().canOpenRoute(getSelectedParentId());
     }
 
-    protected void repaintTripNode() {
-        Boolean updateTripNode = getUi().getContextValue(Boolean.class, UPDATE_MAREE_NODE);
-
-        getUi().removeContextValue(Boolean.class, UPDATE_MAREE_NODE);
-
-        if (updateTripNode == null || !updateTripNode) {
-            return;
-        }
-
-
-        ObserveTreeHelper treeHelper = getTreeHelper(getUi());
-        ObserveNode tripNode = treeHelper.getSelectedNode().getParent().getParent();
-        if (log.isInfoEnabled()) {
-            log.info("Refresh trip node : " + tripNode);
-        }
-        treeHelper.reloadNode(tripNode, false);
-//        treeHelper.refreshNode(tripNode, false);
-    }
-
-    protected void setUpdateMareeNodeTag(boolean wasUpdated) {
-
-        if (wasUpdated) {
-
-            // la date de fin a ete modifiee, il faut : redessiner le noeud de la maree le repositionner
-            getUi().setContextValue(Boolean.TRUE, UPDATE_MAREE_NODE);
-
-        } else {
-
-            getUi().removeContextValue(Boolean.class, UPDATE_MAREE_NODE);
-
-        }
-
-    }
-
-    protected RouteService getRouteService() {
+//    private void repaintTripNode() {
+//        Boolean updateTripNode = getUi().getContextValue(Boolean.class, UPDATE_TRIP_NODE);
+//
+//        getUi().removeContextValue(Boolean.class, UPDATE_TRIP_NODE);
+//
+//        if (updateTripNode == null || !updateTripNode) {
+//            return;
+//        }
+//
+//
+//        ObserveTreeHelper treeHelper = getTreeHelper(getUi());
+//        ObserveNode tripNode = treeHelper.getSelectedNode().getParent().getParent();
+//        if (log.isInfoEnabled()) {
+//            log.info("Refresh trip node : " + tripNode);
+//        }
+//        treeHelper.reloadNode(tripNode, false);
+//    }
+
+//    protected void setUpdateMareeNodeTag(boolean wasUpdated) {
+//
+//        if (wasUpdated) {
+//
+//            // la date de fin a ete modifiee, il faut : redessiner le noeud de la maree le repositionner
+//            getUi().setContextValue(Boolean.TRUE, UPDATE_TRIP_NODE);
+//
+//        } else {
+//
+//            getUi().removeContextValue(Boolean.class, UPDATE_TRIP_NODE);
+//
+//        }
+//
+//    }
+
+    private RouteService getRouteService() {
         return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newRouteService();
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java
index 988678d..14fd661 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java
@@ -57,14 +57,14 @@ import static org.nuiton.i18n.I18n.t;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 1.0
  */
-public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> {
+class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> {
 
     /** Logger */
     static private final Log log = LogFactory.getLog(TripSeineUIHandler.class);
 
-    protected boolean buildTripMap = true;
+    private boolean buildTripMap = true;
 
-    public TripSeineUIHandler(TripSeineUI ui) {
+    TripSeineUIHandler(TripSeineUI ui) {
         super(ui,
               DataContextType.Program,
               DataContextType.TripSeine,
@@ -361,7 +361,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> {
         return result;
     }
 
-    protected TripSeineService getTripSeineService() {
+    private TripSeineService getTripSeineService() {
         return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newTripSeineService();
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx
index cf76963..4f8cf04 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx
@@ -21,13 +21,14 @@
   -->
 
 <fr.ird.observe.application.swing.ui.content.ContentUI abstract='true'
-                                     superGenericType='E'
-                                     genericType='E extends ReferentialDto'>
+                                                       superGenericType='E'
+                                                       contentTitle='{t("observe.type.management", t(ObserveI18nDecoratorHelper.getTypePlurialI18nKey(bean.getClass())))}'
+                                                       genericType='E extends ReferentialDto'>
 
   <import>
     fr.ird.observe.services.dto.referential.ReferentialDto
     fr.ird.observe.services.dto.referential.ReferentialReference
-
+    fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper
     fr.ird.observe.application.swing.ui.UIHelper
     fr.ird.observe.application.swing.ui.actions.shared.DeleteReferenceUIAction
     fr.ird.observe.application.swing.ui.actions.shared.ResetEditUIAction
@@ -41,14 +42,19 @@
     javax.swing.JTable
     javax.swing.UIManager
     javax.swing.table.TableCellRenderer
+
+    static org.nuiton.i18n.I18n.t
   </import>
 
-  <java.lang.String id='listText' javaBean='""'/>
-  <java.lang.String id='createToolTip' javaBean='""'/>
-  <java.lang.String id='detailToolTip' javaBean='""'/>
-  <java.lang.String id='modifyToolTip' javaBean='""'/>
-  <java.lang.String id='deleteToolTip' javaBean='""'/>
-  <java.lang.String id='saveToolTip' javaBean='""'/>
+  <java.lang.String id='pluralTypeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypePlurialI18nKey(bean.getClass()))'/>
+  <java.lang.String id='typeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass()))'/>
+
+  <java.lang.String id='listText' initializer='t("observe.type.list", pluralTypeI18nKey)'/>
+  <java.lang.String id='createToolTip' initializer='t("observe.type.action.create", typeI18nKey)'/>
+  <java.lang.String id='detailToolTip' initializer='t("observe.type.action.view", typeI18nKey)'/>
+  <java.lang.String id='modifyToolTip' initializer='t("observe.type.action.edit", typeI18nKey)'/>
+  <java.lang.String id='deleteToolTip' initializer='t("observe.type.action.delete", typeI18nKey)'/>
+  <java.lang.String id='saveToolTip' initializer='t("observe.type.action.save", typeI18nKey)'/>
 
   <ContentReferenceUIModel id='model' genericType='E'/>
 
@@ -87,7 +93,8 @@ viewLayout.addLayoutComponent(editView, DETAIL_VIEW);
                onValueChanged='if (!event.getValueIsAdjusting()) { getHandler().selectBean((ReferentialReference<E>)getSelectedBean(list)); }'
                onMouseClicked='if (event.getClickCount() == 2) { getHandler().modifyUI(); }'/>
 
-        <BeanListHeader id='referentialListHeader' genericType='ReferentialReference<E>' _entityClass="getModel().getBeanType()"/>
+        <BeanListHeader id='referentialListHeader' genericType='ReferentialReference<E>'
+                        _entityClass="getModel().getBeanType()"/>
       </JScrollPane>
     </JPanel>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java
index 370efe4..632f1fc 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java
@@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.content.ref;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.application.swing.db.DataContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
@@ -141,7 +142,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content
 
         DecoratorService service = ObserveSwingApplicationContext.get().getDecoratorService();
         Decorator<?> decorator = service.getDecoratorByType(entity.getClass());
-        String type = DecoratorService.getEntityLabel(entity.getClass());
+        String type = ObserveI18nDecoratorHelper.getTypeI18nKey(entity.getClass());
         type = t(type);
         String message = t("observe.message.show.usage.for.delete", type, decorator.toString(entity));
         String message2 = t("observe.message.show.usage.for.delete2");
@@ -164,7 +165,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content
 
         DecoratorService service = ObserveSwingApplicationContext.get().getDecoratorService();
         Decorator<?> decorator = service.getDecoratorByType(entity.getClass());
-        String type = DecoratorService.getEntityLabel(entity.getClass());
+        String type = ObserveI18nDecoratorHelper.getTypeI18nKey(entity.getClass());
         type = t(type);
         String message = t("observe.message.show.usage.for.desactivated", type, decorator.toString(entity));
         String message2 = t("observe.message.show.usage.for.desactivated2");
@@ -317,7 +318,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content
                 JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
 
         String title = t("observe.title.unique.key",
-                         t(DecoratorService.getEntityLabel(beanType)));
+                         t(ObserveI18nDecoratorHelper.getTypeI18nKey(beanType)));
 
         pane.setBorder(new TitledBorder(title));
 
@@ -353,7 +354,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content
 
         DecoratorService dService = getDecoratorService();
         Decorator<?> decorator = dService.getDecoratorByType(bean.getClass());
-        String type = DecoratorService.getEntityLabel(bean.getClass());
+        String type = ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass());
         type = t(type);
         String message = t("observe.message.show.usages", type, decorator.toString(bean));
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/UniqueKeyTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/UniqueKeyTableModel.java
index 2428a21..0056ab9 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/UniqueKeyTableModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/UniqueKeyTableModel.java
@@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.content.ref;
 
 import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 
 import javax.swing.table.AbstractTableModel;
 import java.util.List;
@@ -82,6 +83,6 @@ public class UniqueKeyTableModel extends AbstractTableModel {
     @Override
     public String getColumnName(int column) {
         String property = columns[column];
-        return t(DecoratorService.getPropertyLabel(property));
+        return t(ObserveI18nDecoratorHelper.getPropertyI18nKey(property));
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx
index 0bddc75..0ecb5e8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='CountryDto'
-  contentTitle='{n("observe.content.title.country")}'
-  listText='{n("observe.content.list.country")}'
-  createToolTip='{n("observe.content.action.country.create.tip")}'
-  detailToolTip='{n("observe.content.action.country.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.country.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.country.delete.tip")}'
-  saveToolTip='{n("observe.content.action.country.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='CountryDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx
index 6915712..4065b6c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='FpaZoneDto'
-  contentTitle='{n("observe.content.title.fpaZones")}'
-  listText='{n("observe.content.list.fpaZone")}'
-  createToolTip='{n("observe.content.action.fpaZone.create.tip")}'
-  detailToolTip='{n("observe.content.action.fpaZone.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.fpaZone.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.fpaZone.delete.tip")}'
-  saveToolTip='{n("observe.content.action.fpaZone.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='FpaZoneDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx
index 2cc2286..83836e5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx
@@ -20,15 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='GearCaracteristicTypeDto'
-  contentTitle='{n("observe.content.title.gearCaracteristicTypes")}'
-  listText='{n("observe.content.list.gearCaracteristicType")}'
-  createToolTip='{n("observe.content.action.gearCaracteristicType.create.tip")}'
-  detailToolTip='{n("observe.content.action.gearCaracteristicType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.gearCaracteristicType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.gearCaracteristicType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.gearCaracteristicType.save.tip")}'>
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='GearCaracteristicTypeDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx
index c4138d2..5406412 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx
@@ -20,15 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='GearCaracteristicDto'
-  contentTitle='{n("observe.content.title.gearCaracteristics")}'
-  listText='{n("observe.content.list.gearCaracteristic")}'
-  createToolTip='{n("observe.content.action.gearCaracteristic.create.tip")}'
-  detailToolTip='{n("observe.content.action.gearCaracteristic.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.gearCaracteristic.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.gearCaracteristic.delete.tip")}'
-  saveToolTip='{n("observe.content.action.gearCaracteristic.save.tip")}'>
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='GearCaracteristicDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx
index df503be..0f5ac72 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx
@@ -18,15 +18,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='GearDto'
-  contentTitle='{n("observe.content.title.gears")}'
-  listText='{n("observe.content.list.gear")}'
-  createToolTip='{n("observe.content.action.gear.create.tip")}'
-  detailToolTip='{n("observe.content.action.gear.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.gear.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.gear.delete.tip")}'
-  saveToolTip='{n("observe.content.action.gear.save.tip")}'>
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='GearDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx
index e71634c..53ecb6f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='HarbourDto'
-  contentTitle='{n("observe.content.title.harbours")}'
-  listText='{n("observe.content.list.harbour")}'
-  createToolTip='{n("observe.content.action.harbour.create.tip")}'
-  detailToolTip='{n("observe.content.action.harbour.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.harbour.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.harbour.delete.tip")}'
-  saveToolTip='{n("observe.content.action.harbour.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='HarbourDto'>
 
   <style source="ReferenceEntity.jcss"/>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx
index 83c78fc..5ee5130 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='LengthWeightParameterDto'
-  contentTitle='{n("observe.content.title.lengthWeightParameters")}'
-  listText='{n("observe.content.list.lengthWeightParameter")}'
-  createToolTip='{n("observe.content.action.lengthWeightParameter.create.tip")}'
-  detailToolTip='{n("observe.content.action.lengthWeightParameter.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.lengthWeightParameter.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.lengthWeightParameter.delete.tip")}'
-  saveToolTip='{n("observe.content.action.lengthWeightParameter.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='LengthWeightParameterDto'>
 
   <style source="ReferenceEntity.jcss"/>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx
index 6b0bffb..e185bb0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='OceanDto'
-  contentTitle='{n("observe.content.title.oceans")}'
-  listText='{n("observe.content.list.ocean")}'
-  createToolTip='{n("observe.content.action.ocean.create.tip")}'
-  detailToolTip='{n("observe.content.action.ocean.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.ocean.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.ocean.delete.tip")}'
-  saveToolTip='{n("observe.content.action.ocean.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='OceanDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx
index db55dc1..681f79f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='OrganismDto'
-  contentTitle='{n("observe.content.title.organisms")}'
-  listText='{n("observe.content.list.organism")}'
-  createToolTip='{n("observe.content.action.organism.create.tip")}'
-  detailToolTip='{n("observe.content.action.organism.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.organism.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.organism.delete.tip")}'
-  saveToolTip='{n("observe.content.action.organism.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='OrganismDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx
index fe3943d..ca7a601 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='PersonDto'
-  contentTitle='{n("observe.content.title.persons")}'
-  listText='{n("observe.content.list.person")}'
-  createToolTip='{n("observe.content.action.person.create.tip")}'
-  detailToolTip='{n("observe.content.action.person.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.person.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.person.delete.tip")}'
-  saveToolTip='{n("observe.content.action.person.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='PersonDto'>
 
   <style source="ReferenceEntity.jcss"/>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx
index 53368b7..9918879 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ProgramDto'
-  contentTitle='{n("observe.content.title.programs")}'
-  listText='{n("observe.content.list.program")}'
-  createToolTip='{n("observe.content.action.program.create.tip")}'
-  detailToolTip='{n("observe.content.action.program.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.program.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.program.delete.tip")}'
-  saveToolTip='{n("observe.content.action.program.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ProgramDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx
index dc342b7..62b60bc 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SexDto'
-  contentTitle='{n("observe.content.title.sexx")}'
-  listText='{n("observe.content.list.sex")}'
-  createToolTip='{n("observe.content.action.sex.create.tip")}'
-  detailToolTip='{n("observe.content.action.sex.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.sex.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.sex.delete.tip")}'
-  saveToolTip='{n("observe.content.action.sex.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SexDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx
index 8e54b6a..36f9004 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SpeciesGroupDto'
-  contentTitle='{n("observe.content.title.speciesGroupSpeciess")}'
-  listText='{n("observe.content.list.speciesGroupSpecies")}'
-  createToolTip='{n("observe.content.action.speciesGroupSpecies.create.tip")}'
-  detailToolTip='{n("observe.content.action.speciesGroupSpecies.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.speciesGroupSpecies.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.speciesGroupSpecies.delete.tip")}'
-  saveToolTip='{n("observe.content.action.speciesGroupSpecies.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SpeciesGroupDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx
index d67c7d0..76b1fc7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SpeciesListDto'
-  contentTitle='{n("observe.content.title.speciesLists")}'
-  listText='{n("observe.content.list.speciesList")}'
-  createToolTip='{n("observe.content.action.speciesList.create.tip")}'
-  detailToolTip='{n("observe.content.action.speciesList.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.speciesList.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.speciesList.delete.tip")}'
-  saveToolTip='{n("observe.content.action.species.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SpeciesListDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx
index 481057c..08fb3b5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SpeciesDto'
-  contentTitle='{n("observe.content.title.speciess")}'
-  listText='{n("observe.content.list.speciesFaune")}'
-  createToolTip='{n("observe.content.action.species.create.tip")}'
-  detailToolTip='{n("observe.content.action.species.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.species.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.species.delete.tip")}'
-  saveToolTip='{n("observe.content.action.species.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SpeciesDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx
index d22b707..bf3cf60 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='VesselSizeCategoryDto'
-  contentTitle='{n("observe.content.title.vesselSizeCategoryx")}'
-  listText='{n("observe.content.list.vesselSizeCategory")}'
-  createToolTip='{n("observe.content.action.vesselSizeCategory.create.tip")}'
-  detailToolTip='{n("observe.content.action.vesselSizeCategory.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.vesselSizeCategory.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.vesselSizeCategory.delete.tip")}'
-  saveToolTip='{n("observe.content.action.vesselSizeCategory.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='VesselSizeCategoryDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx
index 71f949d..378fd57 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='VesselTypeDto'
-  contentTitle='{n("observe.content.title.vesselTypex")}'
-  listText='{n("observe.content.list.vesselType")}'
-  createToolTip='{n("observe.content.action.vesselType.create.tip")}'
-  detailToolTip='{n("observe.content.action.vesselType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.vesselType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.vesselType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.vesselType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='VesselTypeDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx
index 48df037..f89fa68 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='VesselDto'
-  contentTitle='{n("observe.content.title.vesselx")}'
-  listText='{n("observe.content.list.vessel")}'
-  createToolTip='{n("observe.content.action.vessel.create.tip")}'
-  detailToolTip='{n("observe.content.action.vessel.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.vessel.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.vessel.delete.tip")}'
-  saveToolTip='{n("observe.content.action.vessel.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='VesselDto'>
 
   <style source="ReferenceEntity.jcss"/>
   <style source="I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx
index b8a0565..8c6769f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx
@@ -17,17 +17,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='BaitHaulingStatusDto'
-  contentTitle='{n("observe.content.title.baitHaulingStatuss")}'
-  listText='{n("observe.content.list.baitHaulingStatus")}'
-  createToolTip='{n("observe.content.action.baitHaulingStatus.create.tip")}'
-  detailToolTip='{n("observe.content.action.baitHaulingStatus.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.baitHaulingStatus.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.baitHaulingStatus.delete.tip")}'
-  saveToolTip='{n("observe.content.action.baitHaulingStatus.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='BaitHaulingStatusDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx
index 74627a2..4ef6d43 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='BaitSettingStatusDto'
-  contentTitle='{n("observe.content.title.baitSettingStatuss")}'
-  listText='{n("observe.content.list.baitSettingStatus")}'
-  createToolTip='{n("observe.content.action.baitSettingStatus.create.tip")}'
-  detailToolTip='{n("observe.content.action.baitSettingStatus.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.baitSettingStatus.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.baitSettingStatus.delete.tip")}'
-  saveToolTip='{n("observe.content.action.baitSettingStatus.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='BaitSettingStatusDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx
index f0b5e74..a8bc709 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='BaitTypeDto'
-  contentTitle='{n("observe.content.title.baitTypes")}'
-  listText='{n("observe.content.list.baitType")}'
-  createToolTip='{n("observe.content.action.baitType.create.tip")}'
-  detailToolTip='{n("observe.content.action.baitType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.baitType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.baitType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.baitType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='BaitTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx
index d313a8e..739420b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='CatchFateLonglineDto'
-  contentTitle='{n("observe.content.title.catchFateLonglines")}'
-  listText='{n("observe.content.list.catchFateLongline")}'
-  createToolTip='{n("observe.content.action.catchFateLongline.create.tip")}'
-  detailToolTip='{n("observe.content.action.catchFateLongline.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.catchFateLongline.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.catchFateLongline.delete.tip")}'
-  saveToolTip='{n("observe.content.action.catchFateLongline.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='CatchFateLonglineDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx
index efd01c2..2e04ba8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='EncounterTypeDto'
-  contentTitle='{n("observe.content.title.encounterTypes")}'
-  listText='{n("observe.content.list.encounterType")}'
-  createToolTip='{n("observe.content.action.encounterType.create.tip")}'
-  detailToolTip='{n("observe.content.action.encounterType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.encounterType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.encounterType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.encounterType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='EncounterTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx
index 2096a33..1315d18 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='HealthnessDto'
-  contentTitle='{n("observe.content.title.healthnesss")}'
-  listText='{n("observe.content.list.healthness")}'
-  createToolTip='{n("observe.content.action.healthness.create.tip")}'
-  detailToolTip='{n("observe.content.action.healthness.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.healthness.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.healthness.delete.tip")}'
-  saveToolTip='{n("observe.content.action.healthness.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='HealthnessDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx
index dc8079f..3f197f1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='HookPositionDto'
-  contentTitle='{n("observe.content.title.hookPositions")}'
-  listText='{n("observe.content.list.hookPosition")}'
-  createToolTip='{n("observe.content.action.hookPosition.create.tip")}'
-  detailToolTip='{n("observe.content.action.hookPosition.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.hookPosition.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.hookPosition.delete.tip")}'
-  saveToolTip='{n("observe.content.action.hookPosition.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='HookPositionDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx
index ce44691..003daeb 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='HookSizeDto'
-  contentTitle='{n("observe.content.title.HookSizes")}'
-  listText='{n("observe.content.list.HookSize")}'
-  createToolTip='{n("observe.content.action.hookSize.create.tip")}'
-  detailToolTip='{n("observe.content.action.hookSize.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.hookSize.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.hookSize.delete.tip")}'
-  saveToolTip='{n("observe.content.action.hookSize.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='HookSizeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx
index e68ee31..00f69ec 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='HookTypeDto'
-  contentTitle='{n("observe.content.title.HookTypes")}'
-  listText='{n("observe.content.list.HookType")}'
-  createToolTip='{n("observe.content.action.hookType.create.tip")}'
-  detailToolTip='{n("observe.content.action.hookType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.hookType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.hookType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.hookType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='HookTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx
index 28c4f07..3e6bce6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ItemHorizontalPositionDto'
-  contentTitle='{n("observe.content.title.itemHorizontalPositions")}'
-  listText='{n("observe.content.list.itemHorizontalPosition")}'
-  createToolTip='{n("observe.content.action.itemHorizontalPosition.create.tip")}'
-  detailToolTip='{n("observe.content.action.itemHorizontalPosition.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.itemHorizontalPosition.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.itemHorizontalPosition.delete.tip")}'
-  saveToolTip='{n("observe.content.action.itemHorizontalPosition.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ItemHorizontalPositionDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx
index 72e41bf..b7cd8b9 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ItemVerticalPositionDto'
-  contentTitle='{n("observe.content.title.itemVerticalPositions")}'
-  listText='{n("observe.content.list.itemVerticalPosition")}'
-  createToolTip='{n("observe.content.action.itemVerticalPosition.create.tip")}'
-  detailToolTip='{n("observe.content.action.itemVerticalPosition.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.itemVerticalPosition.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.itemVerticalPosition.delete.tip")}'
-  saveToolTip='{n("observe.content.action.itemVerticalPosition.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ItemVerticalPositionDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx
index 0231262..f4d2c39 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='LightsticksColorDto'
-  contentTitle='{n("observe.content.title.lightsticksColors")}'
-  listText='{n("observe.content.list.lightsticksColor")}'
-  createToolTip='{n("observe.content.action.lightsticksColor.create.tip")}'
-  detailToolTip='{n("observe.content.action.lightsticksColor.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.lightsticksColor.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.lightsticksColor.delete.tip")}'
-  saveToolTip='{n("observe.content.action.lightsticksColor.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='LightsticksColorDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx
index fedfc77..00db2e0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='LightsticksTypeDto'
-  contentTitle='{n("observe.content.title.lightsticksTypes")}'
-  listText='{n("observe.content.list.lightsticksType")}'
-  createToolTip='{n("observe.content.action.lightsticksType.create.tip")}'
-  detailToolTip='{n("observe.content.action.lightsticksType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.lightsticksType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.lightsticksType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.lightsticksType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='LightsticksTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx
index 75db33c..68bdf91 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='LineTypeDto'
-  contentTitle='{n("observe.content.title.lineTypes")}'
-  listText='{n("observe.content.list.lineType")}'
-  createToolTip='{n("observe.content.action.lineType.create.tip")}'
-  detailToolTip='{n("observe.content.action.lineType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.lineType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.lineType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.lineType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='LineTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx
index f6eb831..a0a1ff5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='MaturityStatusDto'
-  contentTitle='{n("observe.content.title.maturityStatuss")}'
-  listText='{n("observe.content.list.maturityStatus")}'
-  createToolTip='{n("observe.content.action.maturityStatus.create.tip")}'
-  detailToolTip='{n("observe.content.action.maturityStatus.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.maturityStatus.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.maturityStatus.delete.tip")}'
-  saveToolTip='{n("observe.content.action.maturityStatus.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='MaturityStatusDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx
index 95d863b..096ab36 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='MitigationTypeDto'
-  contentTitle='{n("observe.content.title.mitigationTypes")}'
-  listText='{n("observe.content.list.mitigationType")}'
-  createToolTip='{n("observe.content.action.mitigationType.create.tip")}'
-  detailToolTip='{n("observe.content.action.mitigationType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.mitigationType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.mitigationType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.mitigationType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='MitigationTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx
index 0dd440e..113d872 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SensorBrandDto'
-  contentTitle='{n("observe.content.title.sensorBrands")}'
-  listText='{n("observe.content.list.sensorBrand")}'
-  createToolTip='{n("observe.content.action.sensorBrand.create.tip")}'
-  detailToolTip='{n("observe.content.action.sensorBrand.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.sensorBrand.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.sensorBrand.delete.tip")}'
-  saveToolTip='{n("observe.content.action.sensorBrand.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SensorBrandDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx
index e093373..d17164c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SensorDataFormatDto'
-  contentTitle='{n("observe.content.title.sensorDataFormats")}'
-  listText='{n("observe.content.list.sensorDataFormat")}'
-  createToolTip='{n("observe.content.action.sensorDataFormat.create.tip")}'
-  detailToolTip='{n("observe.content.action.sensorDataFormat.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.sensorDataFormat.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.sensorDataFormat.delete.tip")}'
-  saveToolTip='{n("observe.content.action.sensorDataFormat.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SensorDataFormatDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx
index 4bec4cb..fd8d6ff 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SensorTypeDto'
-  contentTitle='{n("observe.content.title.sensorTypes")}'
-  listText='{n("observe.content.list.sensorType")}'
-  createToolTip='{n("observe.content.action.sensorType.create.tip")}'
-  detailToolTip='{n("observe.content.action.sensorType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.sensorType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.sensorType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.sensorType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SensorTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx
index 053d208..3e9d446 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SettingShapeDto'
-  contentTitle='{n("observe.content.title.settingShapes")}'
-  listText='{n("observe.content.list.settingShape")}'
-  createToolTip='{n("observe.content.action.settingShape.create.tip")}'
-  detailToolTip='{n("observe.content.action.settingShape.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.settingShape.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.settingShape.delete.tip")}'
-  saveToolTip='{n("observe.content.action.settingShape.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SettingShapeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx
index 9b75965..716227b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SizeMeasureTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SizeMeasureTypeDto'
-  contentTitle='{n("observe.content.title.sizeMeasureTypes")}'
-  listText='{n("observe.content.list.sizeMeasureType")}'
-  createToolTip='{n("observe.content.action.sizeMeasureType.create.tip")}'
-  detailToolTip='{n("observe.content.action.sizeMeasureType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.sizeMeasureType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.sizeMeasureType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.sizeMeasureType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SizeMeasureTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx
index 92568fd..8db915f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='StomacFullnessDto'
-  contentTitle='{n("observe.content.title.stomacFullnesss")}'
-  listText='{n("observe.content.list.stomacFullness")}'
-  createToolTip='{n("observe.content.action.stomacFullness.create.tip")}'
-  detailToolTip='{n("observe.content.action.stomacFullness.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.stomacFullness.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.stomacFullness.delete.tip")}'
-  saveToolTip='{n("observe.content.action.stomacFullness.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='StomacFullnessDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx
index 0583ecd..026f8b8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='TripTypeDto'
-  contentTitle='{n("observe.content.title.tripTypes")}'
-  listText='{n("observe.content.list.tripType")}'
-  createToolTip='{n("observe.content.action.tripType.create.tip")}'
-  detailToolTip='{n("observe.content.action.tripType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.tripType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.tripType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.tripType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='TripTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx
index 977d837..a6257de 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='VesselActivityLonglineDto'
-  contentTitle='{n("observe.content.title.vesselActivityLonglines")}'
-  listText='{n("observe.content.list.vesselActivityLongline")}'
-  createToolTip='{n("observe.content.action.vesselActivityLongline.create.tip")}'
-  detailToolTip='{n("observe.content.action.vesselActivityLongline.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.vesselActivityLongline.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.vesselActivityLongline.delete.tip")}'
-  saveToolTip='{n("observe.content.action.vesselActivityLongline.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='VesselActivityLonglineDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx
index d084b70..7796ec7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/WeightMeasureTypeUI.jaxx
@@ -19,17 +19,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='WeightMeasureTypeDto'
-  contentTitle='{n("observe.content.title.weightMeasureTypes")}'
-  listText='{n("observe.content.list.weightMeasureType")}'
-  createToolTip='{n("observe.content.action.weightMeasureType.create.tip")}'
-  detailToolTip='{n("observe.content.action.weightMeasureType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.weightMeasureType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.weightMeasureType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.weightMeasureType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='WeightMeasureTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx
index ee9c41f..6ed9fe5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='DetectionModeDto'
-  contentTitle='{n("observe.content.title.detectionModes")}'
-  listText='{n("observe.content.list.detectionMode")}'
-  createToolTip='{n("observe.content.action.detectionMode.create.tip")}'
-  detailToolTip='{n("observe.content.action.detectionMode.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.detectionMode.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.detectionMode.delete.tip")}'
-  saveToolTip='{n("observe.content.action.detectionMode.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='DetectionModeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx
index f40b5a3..2f18a08 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ObjectFateDto'
-  contentTitle='{n("observe.content.title.objectFates")}'
-  listText='{n("observe.content.list.objectFate")}'
-  createToolTip='{n("observe.content.action.objectFate.create.tip")}'
-  detailToolTip='{n("observe.content.action.objectFate.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.objectFate.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.objectFate.delete.tip")}'
-  saveToolTip='{n("observe.content.action.objectFate.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ObjectFateDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx
index 0e9888e..6be91e3 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ObjectOperationDto'
-  contentTitle='{n("observe.content.title.objectOperations")}'
-  listText='{n("observe.content.list.objectOperation")}'
-  createToolTip='{n("observe.content.action.objectOperation.create.tip")}'
-  detailToolTip='{n("observe.content.action.objectOperation.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.objectOperation.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.objectOperation.delete.tip")}'
-  saveToolTip='{n("observe.content.action.objectOperation.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ObjectOperationDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx
index cab72b0..c40ed73 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ObjectTypeDto'
-  contentTitle='{n("observe.content.title.objectTypes")}'
-  listText='{n("observe.content.list.objectType")}'
-  createToolTip='{n("observe.content.action.objectType.create.tip")}'
-  detailToolTip='{n("observe.content.action.objectType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.objectType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.objectType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.objectType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ObjectTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx
index e8136c0..7a83c52 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ObservedSystemDto'
-  contentTitle='{n("observe.content.title.observedSystems")}'
-  listText='{n("observe.content.list.observedSystem")}'
-  createToolTip='{n("observe.content.action.observedSystem.create.tip")}'
-  detailToolTip='{n("observe.content.action.observedSystem.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.observedSystem.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.observedSystem.delete.tip")}'
-  saveToolTip='{n("observe.content.action.observedSystem.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ObservedSystemDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx
index 3480557..41b48cd 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ReasonForDiscardDto'
-  contentTitle='{n("observe.content.title.reasonForDiscards")}'
-  listText='{n("observe.content.list.reasonForDiscard")}'
-  createToolTip='{n("observe.content.action.reasonForDiscard.create.tip")}'
-  detailToolTip='{n("observe.content.action.reasonForDiscard.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.reasonForDiscard.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.reasonForDiscard.delete.tip")}'
-  saveToolTip='{n("observe.content.action.reasonForDiscard.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ReasonForDiscardDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx
index 5e86520..344598a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ReasonForNoFishingDto'
-  contentTitle='{n("observe.content.title.reasonForNoFishings")}'
-  listText='{n("observe.content.list.reasonForNoFishing")}'
-  createToolTip='{n("observe.content.action.reasonForNoFishing.create.tip")}'
-  detailToolTip='{n("observe.content.action.reasonForNoFishing.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.reasonForNoFishing.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.reasonForNoFishing.delete.tip")}'
-  saveToolTip='{n("observe.content.action.reasonForNoFishing.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ReasonForNoFishingDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx
index a334845..2063dcf 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='ReasonForNullSetDto'
-  contentTitle='{n("observe.content.title.reasonForNullSets")}'
-  listText='{n("observe.content.list.reasonForNullSet")}'
-  createToolTip='{n("observe.content.action.reasonForNullSet.create.tip")}'
-  detailToolTip='{n("observe.content.action.reasonForNullSet.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.reasonForNullSet.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.reasonForNullSet.delete.tip")}'
-  saveToolTip='{n("observe.content.action.reasonForNullSet.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='ReasonForNullSetDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx
index 48a9f05..e6c79be 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SpeciesFateDto'
-  contentTitle='{n("observe.content.title.speciesFates")}'
-  listText='{n("observe.content.list.speciesFate")}'
-  createToolTip='{n("observe.content.action.speciesFate.create.tip")}'
-  detailToolTip='{n("observe.content.action.speciesFate.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.speciesFate.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.speciesFate.delete.tip")}'
-  saveToolTip='{n("observe.content.action.speciesFate.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SpeciesFateDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx
index b42d933..9912e85 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SpeciesStatusDto'
-  contentTitle='{n("observe.content.title.speciesStatuss")}'
-  listText='{n("observe.content.list.speciesStatus")}'
-  createToolTip='{n("observe.content.action.speciesStatus.create.tip")}'
-  detailToolTip='{n("observe.content.action.speciesStatus.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.speciesStatus.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.speciesStatus.delete.tip")}'
-  saveToolTip='{n("observe.content.action.speciesStatus.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SpeciesStatusDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx
index 1f3ddee..c5b7a1f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='SurroundingActivityDto'
-  contentTitle='{n("observe.content.title.surroundingActivitys")}'
-  listText='{n("observe.content.list.surroundingActivity")}'
-  createToolTip='{n("observe.content.action.surroundingActivity.create.tip")}'
-  detailToolTip='{n("observe.content.action.surroundingActivity.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.surroundingActivity.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.surroundingActivity.delete.tip")}'
-  saveToolTip='{n("observe.content.action.surroundingActivity.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='SurroundingActivityDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx
index da903ad..ef4e531 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='TransmittingBuoyOperationDto'
-  contentTitle='{n("observe.content.title.transmittingBuoyOperations")}'
-  listText='{n("observe.content.list.operation")}'
-  createToolTip='{n("observe.content.action.transmittingBuoyOperation.create.tip")}'
-  detailToolTip='{n("observe.content.action.transmittingBuoyOperation.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.transmittingBuoyOperation.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.transmittingBuoyOperation.delete.tip")}'
-  saveToolTip='{n("observe.content.action.transmittingBuoyOperation.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='TransmittingBuoyOperationDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx
index 9eee1d6..7774918 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='TransmittingBuoyTypeDto'
-  contentTitle='{n("observe.content.title.transmittingBuoyTypes")}'
-  listText='{n("observe.content.list.transmittingBuoyType")}'
-  createToolTip='{n("observe.content.action.transmittingBuoyType.create.tip")}'
-  detailToolTip='{n("observe.content.action.transmittingBuoyType.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.transmittingBuoyType.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.transmittingBuoyType.delete.tip")}'
-  saveToolTip='{n("observe.content.action.transmittingBuoyType.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='TransmittingBuoyTypeDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx
index 5906b91..b37821a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='VesselActivitySeineDto'
-  contentTitle='{n("observe.content.title.vesselActivitySeines")}'
-  listText='{n("observe.content.list.vesselActivitySeine")}'
-  createToolTip='{n("observe.content.action.vesselActivitySeine.create.tip")}'
-  detailToolTip='{n("observe.content.action.vesselActivitySeine.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.vesselActivitySeine.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.vesselActivitySeine.delete.tip")}'
-  saveToolTip='{n("observe.content.action.vesselActivitySeine.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='VesselActivitySeineDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx
index 0761f98..296bedb 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='WeightCategoryDto'
-  contentTitle='{n("observe.content.title.weightCategory")}'
-  listText='{n("observe.content.list.weightCategory")}'
-  createToolTip='{n("observe.content.action.weightCategory.create.tip")}'
-  detailToolTip='{n("observe.content.action.weightCategory.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.weightCategory.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.weightCategory.delete.tip")}'
-  saveToolTip='{n("observe.content.action.weightCategory.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='WeightCategoryDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx
index ff07358..efa2902 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx
@@ -20,17 +20,7 @@
   #L%
   -->
 
-<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI
-  superGenericType='WindDto'
-  contentTitle='{n("observe.content.title.windSpeeds")}'
-  listText='{n("observe.content.list.wind")}'
-  createToolTip='{n("observe.content.action.wind.create.tip")}'
-  detailToolTip='{n("observe.content.action.wind.detail.tip")}'
-  modifyToolTip='{n("observe.content.action.wind.modify.tip")}'
-  deleteToolTip='{n("observe.content.action.wind.delete.tip")}'
-  saveToolTip='{n("observe.content.action.wind.save.tip")}'
-
-  >
+<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='WindDto'>
 
   <style source="../ReferenceEntity.jcss"/>
   <style source="../I18nReferenceEntity.jcss"/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java
index 0156e14..6d8f9eb 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java
@@ -111,16 +111,16 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex
 
             // l'activité n'est pas ouverte, mode lecture
             addMessage(getUi(),
-                    NuitonValidatorScope.INFO,
-                    getEntityLabel(ActivityLonglineDto.class),
-                    t("observe.storage.activityLongline.message.not.open"));
+                       NuitonValidatorScope.INFO,
+                       getTypeI18nKey(ActivityLonglineDto.class),
+                       t("observe.storage.activityLongline.message.not.open"));
 
         } else {
 
             addMessage(getUi(),
-                    NuitonValidatorScope.INFO,
-                    getEntityLabel(ActivitySeineDto.class),
-                    t("observe.storage.activitySeine.message.not.open"));
+                       NuitonValidatorScope.INFO,
+                       getTypeI18nKey(ActivitySeineDto.class),
+                       t("observe.storage.activitySeine.message.not.open"));
 
         }
 
@@ -323,7 +323,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex
         String message = n("observe.entity.message.updating");
         ObserveNode node = getTreeHelper(getUi()).getSelectedNode();
         String entityLabel =
-                getEntityLabel(node.getParent().getInternalClass());
+                getTypeI18nKey(node.getParent().getInternalClass());
         message = t(message, t(entityLabel));
         addMessage(getUi(), NuitonValidatorScope.INFO, entityLabel, message);
     }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
index 1c50440..1d47d88 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
@@ -414,9 +414,9 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip
         // mode lecture : la marée n'est pas ouverte
 
         addMessage(getUi(),
-                NuitonValidatorScope.INFO,
-                getEntityLabel(TripLonglineDto.class),
-                t("observe.content.tripLongline.message.not.open"));
+                   NuitonValidatorScope.INFO,
+                   getTypeI18nKey(TripLonglineDto.class),
+                   t("observe.content.tripLongline.message.not.open"));
 
         return ContentMode.READ;
     }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
index 554f173..64133be 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
@@ -411,9 +411,9 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei
         // mode lecture
 
         addMessage(getUi(),
-                NuitonValidatorScope.INFO,
-                getEntityLabel(TripSeineDto.class),
-                t("observe.content.tripSeine.message.not.open"));
+                   NuitonValidatorScope.INFO,
+                   getTypeI18nKey(TripSeineDto.class),
+                   t("observe.content.tripSeine.message.not.open"));
 
         return ContentMode.READ;
     }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
index 420044d..d951de4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
@@ -218,7 +218,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam
 
             addMessage(getUi(),
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(SetSeineDto.class),
+                       getTypeI18nKey(SetSeineDto.class),
                        t("observe.content.setSeine.message.no.nonTargetDiscarded"));
         }
         return mode;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java
index 334c60d..246369b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java
@@ -232,7 +232,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto
 
             addMessage(getUi(),
                        NuitonValidatorScope.INFO,
-                       getEntityLabel(SetSeineDto.class),
+                       getTypeI18nKey(SetSeineDto.class),
                        discarded ?
                        t("observe.content.setSeine.message.no.targetCatch") :
                        t("observe.content.setSeine.message.no.targetDiscarded")
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java
index d584c99..a3f3c92 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java
@@ -25,6 +25,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.DataContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectUI;
 import fr.ird.observe.application.swing.ui.content.impl.seine.SetSeineUI;
 import fr.ird.observe.application.swing.ui.content.open.impl.longline.ActivityLonglineUI;
@@ -71,7 +72,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
             LogFactory.getLog(AbstractObserveTreeCellRenderer.class);
 
     /** la liste des ui qui peuvent être en mode création */
-    public static final List<Class<?>> CREATION_UI =
+    private static final List<Class<?>> CREATION_UI =
             Collections.unmodifiableList(
                     Arrays.<Class<?>>asList(
                             TripSeineUI.class,
@@ -86,16 +87,16 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
     private static final long serialVersionUID = 1L;
 
     /** la couleur des noeuds fermés */
-    protected Color closeColor;
+    private Color closeColor;
 
     /** la couleur des noeuds de données ouverts */
-    protected Color openColor;
+    private Color openColor;
 
     /** la couleur pour indiquer que la données est non valide ou non sauvée */
-    protected Color redColor;
+    private Color redColor;
 
     /** service de décoration */
-    protected transient DecoratorService decoratorService;
+    private transient DecoratorService decoratorService;
 
     public DecoratorService getDecoratorService() {
         if (decoratorService == null) {
@@ -108,8 +109,9 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
 
     @Override
     public ObserveDataProvider getDataProvider() {
-        ObserveDataProvider provider = (ObserveDataProvider)
-                super.getDataProvider();
+        ObserveDataProvider provider = (ObserveDataProvider) super.getDataProvider();
+//        Objects.requireNonNull(provider);
+//        //FIXME ? why
         if (provider == null) {
             ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource();
             if (source != null) {
@@ -120,7 +122,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
         return provider;
     }
 
-    public AbstractObserveTreeCellRenderer() {
+    AbstractObserveTreeCellRenderer() {
         init();
     }
 
@@ -229,7 +231,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
         return icon;
     }
 
-    public void setDefaultIcons(Icon icon) {
+    private void setDefaultIcons(Icon icon) {
         if (icon == null) {
             // the icon is not customized for this node
             setOpenIcon(getDefaultOpenIcon());
@@ -243,6 +245,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
         }
     }
 
+    @Override
     protected String computeNodeText(ObserveNode node) {
 
         if (node.isStringNode()) {
@@ -253,7 +256,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
 
         if (node.isReferentielNode()) {
 
-            return t(DecoratorService.getEntityLabel(ObserveTreeHelper.TREE_NODE_PREFIX, beanType));
+            return t(ObserveI18nDecoratorHelper.getTypeI18nKey(beanType));
         }
 
         // noeud de donnée
@@ -275,11 +278,13 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
         }
 
         if (node instanceof SetLonglineNode) {
-            return t("observe.tree.setLongline");
+            return t(ObserveI18nDecoratorHelper.getTypeI18nKey(((SetLonglineNode) node).getEntity().getType()));
+//            return t("observe.tree.setLongline");
         }
 
         if (node instanceof SetSeineNode) {
-            return t("observe.tree.setSeine");
+            return t(ObserveI18nDecoratorHelper.getTypeI18nKey(((SetSeineNode) node).getEntity().getType()));
+//            return t("observe.tree.setSeine");
         }
 
         if (node instanceof DataReferenceNodeSupport) {
@@ -366,7 +371,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
         return openColor;
     }
 
-    public boolean isOpenNode(ObserveNode node) {
+    private boolean isOpenNode(ObserveNode node) {
 
         if (node.isRoot() || node.isReferentielNode()) {
             return false;
@@ -394,7 +399,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
      * @return the cast {@link ObserveNode}, or {@code null} if
      * value is null.
      */
-    public static ObserveNode getNode(Object value) {
+    static ObserveNode getNode(Object value) {
         ObserveNode node = null;
         if (value instanceof ObserveNode) {
             node = (ObserveNode) value;
@@ -402,7 +407,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
         return node;
     }
 
-    public ObserveNode getFirstOpenableNode(ObserveNode node) {
+    private ObserveNode getFirstOpenableNode(ObserveNode node) {
 
         if (OpenableDto.class.isAssignableFrom(node.getInternalClass())) {
             return node;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java
index 40f4dfc..33cbc70 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeBridge.java
@@ -83,7 +83,7 @@ public class ObserveTreeBridge extends NavTreeBridge<ObserveNode> {
             String nodeId = node.getId();
 
             ObserveNode containerNode;
-            if (nodeId.startsWith(ObserveTreeHelper.TREE_NODE_PREFIX)) {
+            if (nodeId.startsWith("observe.type.")) {
                 containerNode = node.getParent();
             } else {
                 containerNode = node;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java
index 638a8b5..40a5953 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java
@@ -25,11 +25,9 @@ import com.google.common.collect.Lists;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.DataContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
-import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
-import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador;
 import fr.ird.observe.application.swing.ui.tree.loadors.ActivityLonglineNodeChildLoador;
 import fr.ird.observe.application.swing.ui.tree.loadors.ActivityLonglinesNodeChildLoador;
 import fr.ird.observe.application.swing.ui.tree.loadors.ActivitySeineNodeChildLoador;
@@ -67,8 +65,6 @@ import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -83,44 +79,13 @@ import static org.nuiton.i18n.I18n.n;
  */
 public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
 
-    public static final String TREE_NODE_PREFIX = "observe.tree.";
-
     /** Logger. */
     static private final Log log = LogFactory.getLog(ObserveTreeHelper.class);
 
-    private boolean createUnsaved;
-
-    public static ObserveNode createStringNode(String context) {
-
-        return createStringNode(context, null);
-
-    }
-
-    public static <L extends AbstractNodeChildLoador> ObserveNode createStringNode(String context, Class<L> loadorType) {
-
-        L childLoador = loadorType == null ? null : ObserveTreeHelper.getChildLoador(loadorType);
-
-        String propertyLabel = DecoratorService.getPropertyLabel(TREE_NODE_PREFIX, context);
-        return new ObserveNode(String.class,
-                               propertyLabel,
-                               context,
-                               childLoador,
-                               false);
-
-    }
-
     public static void sortPrograms(List<ReferentialReference<ProgramDto>> data) {
-        Collections.sort(data, new Comparator<ReferentialReference<ProgramDto>>() {
-
-            ReferentialReferenceDecorator<ProgramDto> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(ProgramDto.class);
 
-            @Override
-            public int compare(ReferentialReference<ProgramDto> o1, ReferentialReference<ProgramDto> o2) {
+        ObserveSwingApplicationContext.get().getDecoratorService().sort(ProgramDto.class, data);
 
-
-                return this.decorator.toString(o1).compareTo(this.decorator.toString(o2));
-            }
-        });
     }
 
     public ObserveTreeHelper() {
@@ -191,10 +156,6 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         provider.setSelectionModel(dataModel);
         provider.setCreating(true);
 
-        if (getTreeCellRenderer() != null) {
-            getTreeCellRenderer().setDataProvider(provider);
-        }
-
         try {
 
             RootNodeChildLoador loador = getChildLoador(RootNodeChildLoador.class);
@@ -296,7 +257,6 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
      *
      * <b>Note:</b> cette méthode doit être appelée après un rechargement du
      * modèle de navigation.
-     *
      */
     public void selectInitialNode() {
 
@@ -380,7 +340,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
     public ObserveNode addUnsavedNode(ObserveNode parentNode, Class<?> type) {
 
         // noeud en mode creation
-        String label = DecoratorService.getEntityLabel(TREE_NODE_PREFIX, type) + ".unsaved";
+        String label = ObserveI18nDecoratorHelper.getTypeI18nKey(type) + ".unsaved";
         ObserveNode result = new ObserveNode(type, null, label, null, false);
         insertNode(parentNode, result);
 
@@ -390,14 +350,8 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         // Fix bug (if no child in parent node, it will not expand...)
         getUI().fireTreeExpanded(new TreePath(result.getPath()));
 
-        createUnsaved = true;
-
-        try {
-            // Select new node
-            selectNode(result);
-        } finally {
-            createUnsaved = false;
-        }
+        // Select new node
+        selectNode(result);
 
         return result;
     }
@@ -435,7 +389,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         throw new IllegalStateException("Can not come here!");
     }
 
-    public ObserveNode addTripSeine(ObserveNode parentNode, DataReference<TripSeineDto> bean) {
+    private ObserveNode addTripSeine(ObserveNode parentNode, DataReference<TripSeineDto> bean) {
         ProgramSeineNodeChildLoador loador =
                 getChildLoador(ProgramSeineNodeChildLoador.class);
         ObserveNode result = loador.createNode(bean, dataProvider);
@@ -443,7 +397,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         return result;
     }
 
-    public ObserveNode addTripLongline(ObserveNode parentNode, DataReference<TripLonglineDto> bean) {
+    private ObserveNode addTripLongline(ObserveNode parentNode, DataReference<TripLonglineDto> bean) {
         ProgramLonglineNodeChildLoador loador =
                 getChildLoador(ProgramLonglineNodeChildLoador.class);
         ObserveNode result = loador.createNode(bean, dataProvider);
@@ -451,36 +405,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         return result;
     }
 
-    public ObserveNode addSimpleTrip(ObserveNode parentNode, DataReference<?> bean) {
-        ObserveNode result;
-
-        if (bean.getType().isAssignableFrom(TripSeineDto.class)) {
-
-            ProgramSeineNodeChildLoador loador = getChildLoador(ProgramSeineNodeChildLoador.class);
-            boolean addChilds = loador.isAddChilds();
-            loador.setAddChilds(false);
-            try {
-                result = loador.createNode((DataReference<TripSeineDto>) bean, dataProvider);
-                insertNode(parentNode, result);
-            } finally {
-                loador.setAddChilds(addChilds);
-            }
-        } else {
-
-            ProgramLonglineNodeChildLoador loador = getChildLoador(ProgramLonglineNodeChildLoador.class);
-            boolean addChilds = loador.isAddChilds();
-            loador.setAddChilds(false);
-            try {
-                result = loador.createNode((DataReference<TripLonglineDto>) bean, dataProvider);
-                insertNode(parentNode, result);
-            } finally {
-                loador.setAddChilds(addChilds);
-            }
-        }
-        return result;
-    }
-
-    public ObserveNode addRoute(ObserveNode parentNode, DataReference<RouteDto> bean) {
+    private ObserveNode addRoute(ObserveNode parentNode, DataReference<RouteDto> bean) {
         RoutesNodeChildLoador loador =
                 getChildLoador(RoutesNodeChildLoador.class);
         ObserveNode result = loador.createNode(bean, dataProvider);
@@ -488,7 +413,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         return result;
     }
 
-    public ObserveNode addActivitySeine(ObserveNode parentNode, DataReference<ActivitySeineDto> bean) {
+    private ObserveNode addActivitySeine(ObserveNode parentNode, DataReference<ActivitySeineDto> bean) {
         ActivitySeinesNodeChildLoador loador =
                 getChildLoador(ActivitySeinesNodeChildLoador.class);
         ObserveNode result = loador.createNode(bean, dataProvider);
@@ -496,7 +421,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         return result;
     }
 
-    public ObserveNode addActivityLongline(ObserveNode parentNode, DataReference<ActivityLonglineDto> bean) {
+    private ObserveNode addActivityLongline(ObserveNode parentNode, DataReference<ActivityLonglineDto> bean) {
         ActivityLonglinesNodeChildLoador loador =
                 getChildLoador(ActivityLonglinesNodeChildLoador.class);
         ObserveNode result = loador.createNode(bean, dataProvider);
@@ -535,7 +460,6 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         int newIndex = 0;
         if (CollectionUtils.isNotEmpty(data)) {
             sortPrograms(data);
-//            Programs.sort(data);
             newIndex = data.indexOf(bean);
         }
         RootNodeChildLoador loador = getChildLoador(RootNodeChildLoador.class);
@@ -559,21 +483,6 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         refreshNode(result, false);
     }
 
-    public ObserveNode addProgram(Set<ReferentialReference<ProgramDto>> existingPrograms, ReferentialReference<ProgramDto> bean) {
-
-        List<ReferentialReference<ProgramDto>> data = Lists.newArrayList(existingPrograms);
-        data.add(bean);
-        int newIndex = 0;
-        if (CollectionUtils.isNotEmpty(data)) {
-            sortPrograms(data);
-            newIndex = data.indexOf(bean);
-        }
-        RootNodeChildLoador loador = getChildLoador(RootNodeChildLoador.class);
-        ObserveNode result = loador.createNode(bean, dataProvider);
-        insertNode(getRootNode(), result, newIndex);
-        return result;
-    }
-
     public void removeTrip(ReferentialReference<ProgramDto> program, DataReference trip) {
 
         ObserveNode rootNode = getRootNode();
@@ -603,21 +512,16 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         refreshNode(node, refreshChilds);
     }
 
-    public boolean isCreateUnsaved() {
-        return createUnsaved;
-    }
-
     @Override
     protected ObserveDataProvider getDataProvider() {
-        ObserveDataProvider provider = (ObserveDataProvider) super.getDataProvider();
-        if (provider == null) {
-            ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource();
-            if (source != null) {
-                provider = new ObserveDataProvider(source);
-                setDataProvider(provider);
-            }
-        }
-        return provider;
+        //        if (provider == null) {
+//            ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource();
+//            if (source != null) {
+//                provider = new ObserveDataProvider(source);
+//                setDataProvider(provider);
+//            }
+//        }
+        return (ObserveDataProvider) super.getDataProvider();
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java
index c942df4..2c18fbf 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java
@@ -26,11 +26,11 @@ package fr.ird.observe.application.swing.ui.tree.actions;
 import fr.ird.observe.application.swing.ObserveOpenDataManager;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
-import fr.ird.observe.services.dto.seine.RouteDto;
-import fr.ird.observe.services.service.seine.ActivitySeineService;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
+import fr.ird.observe.services.dto.seine.ActivitySeineDto;
+import fr.ird.observe.services.service.seine.ActivitySeineService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -70,8 +70,7 @@ public class ChangeActivityRouteActionListener extends NodeChangeActionListener
     @Override
     protected ObserveNode getNewParentNode(ObserveNode grandParentNode, String parentNodeId) {
         ObserveNode routeNode = getTreeHelper().getChild(grandParentNode, parentNodeId);
-        String activitiesNodeId = DecoratorService.getPropertyLabel(ObserveTreeHelper.TREE_NODE_PREFIX,
-                                                                    RouteDto.PROPERTY_ACTIVITY_SEINE);
+        String activitiesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(ActivitySeineDto.class);
         return getTreeHelper().getChild(routeNode, activitiesNodeId);
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java
index 4154422..bc18a0d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java
@@ -26,11 +26,11 @@ package fr.ird.observe.application.swing.ui.tree.actions;
 import fr.ird.observe.application.swing.ObserveOpenDataManager;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
-import fr.ird.observe.services.dto.longline.TripLonglineDto;
-import fr.ird.observe.services.service.longline.ActivityLonglineService;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
+import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
+import fr.ird.observe.services.service.longline.ActivityLonglineService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -70,8 +70,7 @@ public class ChangeActivityTripActionListener extends NodeChangeActionListener {
     @Override
     protected ObserveNode getNewParentNode(ObserveNode grandParentNode, String parentNodeId) {
         ObserveNode tripLonglineNode = getTreeHelper().getChild(grandParentNode, parentNodeId);
-        String activitiesNodeId = DecoratorService.getPropertyLabel(ObserveTreeHelper.TREE_NODE_PREFIX,
-                                                                    TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE);
+        String activitiesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(ActivityLonglineDto.class);
         return getTreeHelper().getChild(tripLonglineNode, activitiesNodeId);
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java
index c4dc257..144f417 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java
@@ -26,11 +26,11 @@ package fr.ird.observe.application.swing.ui.tree.actions;
 import fr.ird.observe.application.swing.ObserveOpenDataManager;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
-import fr.ird.observe.services.dto.seine.TripSeineDto;
-import fr.ird.observe.services.service.seine.RouteService;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
+import fr.ird.observe.services.dto.seine.RouteDto;
+import fr.ird.observe.services.service.seine.RouteService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -70,8 +70,7 @@ public class ChangeRouteTripActionListener extends NodeChangeActionListener {
     @Override
     protected ObserveNode getNewParentNode(ObserveNode grandParentNode, String parentNodeId) {
         ObserveNode tripNode = getTreeHelper().getChild(grandParentNode, parentNodeId);
-        String routesNodeId = DecoratorService.getPropertyLabel(ObserveTreeHelper.TREE_NODE_PREFIX,
-                                                                TripSeineDto.PROPERTY_ROUTE);
+        String routesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(RouteDto.class);
         return getTreeHelper().getChild(tripNode, routesNodeId);
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractDataReferenceChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractDataReferenceChildLoador.java
index 831d915..a329693 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractDataReferenceChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractDataReferenceChildLoador.java
@@ -29,11 +29,11 @@ import fr.ird.observe.services.dto.DataReference;
  * @author Kevin Morin (Code Lutin)
  * @since x.x
  */
-public abstract class AbstractDataReferenceChildLoador<O extends DataDto> extends AbstractNodeChildLoador<DataReference<O>, O> {
+abstract class AbstractDataReferenceChildLoador<O extends DataDto> extends AbstractNodeChildLoador<DataReference<O>, O> {
 
     private static final long serialVersionUID = 1L;
 
-    protected AbstractDataReferenceChildLoador(Class<O> beanType) {
+    AbstractDataReferenceChildLoador(Class<O> beanType) {
         super(beanType);
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java
index c38104b..08d3e6a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java
@@ -22,12 +22,17 @@
 package fr.ird.observe.application.swing.ui.tree.loadors;
 
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
 import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
+import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
 import jaxx.runtime.swing.nav.NavDataProvider;
 import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador;
 
+import java.util.Objects;
+import java.util.Set;
+
 /**
  * Un object pour charger les fils d'un noeud.
  *
@@ -52,4 +57,39 @@ public abstract class AbstractNodeChildLoador<T, O> extends NavTreeNodeChildLoad
         return provider.getSelectionModel();
     }
 
+    ObserveNode createNode0(Set<Class> pluralizeProperties, Class data) {
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
+        if (pluralizeProperties.contains(data)) {
+            return createPluralizeStringNode(data, null);
+        } else {
+            return createStringNode(data, null);
+        }
+    }
+
+    <L extends AbstractNodeChildLoador<?, ?>> ObserveNode createStringNode(Class<?> context, Class<L> loadorType) {
+        Objects.requireNonNull(context, "Ne peut pas ajouter un context null");
+        L childLoador = loadorType == null ? null : ObserveTreeHelper.getChildLoador(loadorType);
+
+        String propertyLabel = ObserveI18nDecoratorHelper.getTypeI18nKey(context);
+        return new ObserveNode(String.class,
+                               propertyLabel,
+                               context.getSimpleName(),
+                               childLoador,
+                               false);
+
+    }
+
+    <L extends AbstractNodeChildLoador<?, ?>> ObserveNode createPluralizeStringNode(Class<?> context, Class<L> loadorType) {
+        Objects.requireNonNull(context, "Ne peut pas ajouter un context null");
+        L childLoador = loadorType == null ? null : ObserveTreeHelper.getChildLoador(loadorType);
+
+        String propertyLabel = ObserveI18nDecoratorHelper.getTypePlurialI18nKey(context);
+        return new ObserveNode(String.class,
+                               propertyLabel,
+                               context.getSimpleName(),
+                               childLoador,
+                               false);
+    }
+
+
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java
index 5baf077..0ea250f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java
@@ -22,22 +22,20 @@ package fr.ird.observe.application.swing.ui.tree.loadors;
  * #L%
  */
 
-import fr.ird.observe.services.dto.DataReference;
-import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
-import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto;
-import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto;
-import fr.ird.observe.services.dto.longline.SetLonglineDto;
 import fr.ird.observe.application.swing.ui.tree.ActivityLonglineNode;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
 import fr.ird.observe.application.swing.ui.tree.SetLonglineNode;
+import fr.ird.observe.services.dto.DataReference;
+import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
+import fr.ird.observe.services.dto.longline.EncounterDto;
+import fr.ird.observe.services.dto.longline.SensorUsedDto;
+import fr.ird.observe.services.dto.longline.SetLonglineDto;
 import jaxx.runtime.swing.nav.NavDataProvider;
 import jaxx.runtime.swing.nav.tree.NavTreeBridge;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
+import java.util.Objects;
 
 /**
  * Created on 8/28/14.
@@ -45,16 +43,10 @@ import static org.nuiton.i18n.I18n.n;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 3.7
  */
-public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> {
+public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Class, String> {
 
     private static final long serialVersionUID = 1L;
 
-    static {
-        n("observe.tree.encounter");
-        n("observe.tree.sensorUsed");
-        n("observe.tree.setLongline");
-    }
-
     public ActivityLonglineNodeChildLoador() {
         super(String.class);
     }
@@ -70,18 +62,11 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str
             throw new IllegalStateException("Could not find containerNode of " + parentNode);
         }
 
-        {
+        DataReference<ActivityLonglineDto> activityLonglineRef = ((ActivityLonglineNode) parentNode).getEntity();
 
-            DataReference<ActivityLonglineDto> activityLonglineRef = ((ActivityLonglineNode) parentNode).getEntity();
-
-            DataReference<SetLonglineDto> setLonglineRef = (DataReference<SetLonglineDto>) activityLonglineRef.getPropertyValue(ActivityLonglineDto.PROPERTY_SET_LONGLINE);
-            if (setLonglineRef != null) {
-
-                // si set present, ajout d'un noeud
-                ObserveNode child = createSetNode(setLonglineRef);
-                parentNode.add(child);
-
-            }
+        DataReference<SetLonglineDto> setLonglineRef = (DataReference) activityLonglineRef.getPropertyValue(ActivityLonglineDto.PROPERTY_SET_LONGLINE);
+        if (setLonglineRef != null) {
+            parentNode.add(createSetNode(setLonglineRef));
         }
 
         // ajout des autres fils avant la calée
@@ -90,30 +75,18 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str
     }
 
     @Override
-    public List<String> getData(Class<?> parentClass,
-                                String parentId,
-                                NavDataProvider dataService) {
-
-        List<String> result = new ArrayList<>();
-        result.add(ActivityLonglineEncounterDto.PROPERTY_ENCOUNTER);
-        result.add(ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED);
-        return result;
+    public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) {
+        return Arrays.asList(EncounterDto.class, SensorUsedDto.class);
 
     }
 
     @Override
-    public ObserveNode createNode(String data, NavDataProvider dataProvider) {
-
-        return ObserveTreeHelper.createStringNode(data);
-
+    public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
+        return createPluralizeStringNode(data, null);
     }
 
     public ObserveNode createSetNode(DataReference<SetLonglineDto> data) {
-        if (data == null) {
-            throw new NullPointerException("Ne peut pas ajouter un objet null");
-        }
-
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
         return new SetLonglineNode(data);
-
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java
index 765aa6b..9903ca5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java
@@ -23,16 +23,17 @@ package fr.ird.observe.application.swing.ui.tree.loadors;
  */
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.ui.tree.ActivityLonglineNode;
+import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.DataReferenceSet;
 import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
 import fr.ird.observe.services.service.longline.ActivityLonglineService;
-import fr.ird.observe.application.swing.ui.tree.ActivityLonglineNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import jaxx.runtime.swing.nav.NavDataProvider;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Created on 8/28/14.
@@ -49,24 +50,15 @@ public class ActivityLonglinesNodeChildLoador extends AbstractDataReferenceChild
     }
 
     @Override
-    public List<DataReference<ActivityLonglineDto>> getData(Class<?> parentClass,
-                                                            String parentId,
-                                                            NavDataProvider dataProvider) throws Exception {
-
+    public List<DataReference<ActivityLonglineDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception {
         ActivityLonglineService activityLonglineService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newActivityLonglineService();
         DataReferenceSet<ActivityLonglineDto> activityLonglineByTripLongline = activityLonglineService.getActivityLonglineByTripLongline(parentId);
-
         return new ArrayList<>(activityLonglineByTripLongline.getReferences());
-
     }
 
     @Override
     public ObserveNode createNode(DataReference<ActivityLonglineDto> data, NavDataProvider dataProvider) {
-        if (data == null) {
-            throw new NullPointerException("Ne peut pas ajouter un objet null");
-        }
-
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
         return new ActivityLonglineNode(data);
-
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java
index 096ae68..1da0070 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java
@@ -22,25 +22,23 @@
 package fr.ird.observe.application.swing.ui.tree.loadors;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.ui.tree.ActivitySeineNode;
+import fr.ird.observe.application.swing.ui.tree.FloatingObjectSeineNode;
+import fr.ird.observe.application.swing.ui.tree.ObserveNode;
+import fr.ird.observe.application.swing.ui.tree.SetSeineNode;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.DataReferenceSet;
+import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
-import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto;
 import fr.ird.observe.services.dto.seine.FloatingObjectDto;
 import fr.ird.observe.services.dto.seine.SetSeineDto;
 import fr.ird.observe.services.service.seine.FloatingObjectService;
-import fr.ird.observe.application.swing.ui.tree.ActivitySeineNode;
-import fr.ird.observe.application.swing.ui.tree.FloatingObjectSeineNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
-import fr.ird.observe.application.swing.ui.tree.SetSeineNode;
 import jaxx.runtime.swing.nav.NavDataProvider;
 import jaxx.runtime.swing.nav.tree.NavTreeBridge;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
+import java.util.Objects;
 
 /**
  * Le chargeur des noeuds de marees.
@@ -52,19 +50,12 @@ public class ActivitySeineNodeChildLoador extends AbstractDataReferenceChildLoad
 
     private static final long serialVersionUID = 1L;
 
-    static {
-        n("observe.common.observedSystem");
-        n("observe.tree.setSeine");
-    }
-
     public ActivitySeineNodeChildLoador() {
         super(FloatingObjectDto.class);
     }
 
     @Override
-    public void loadChilds(NavTreeBridge<ObserveNode> model,
-                           ObserveNode parentNode,
-                           NavDataProvider dataProvider) throws Exception {
+    public void loadChilds(NavTreeBridge<ObserveNode> model, ObserveNode parentNode, NavDataProvider dataProvider) throws Exception {
 
         ObserveNode containerNode = parentNode.getContainerNode();
 
@@ -74,17 +65,14 @@ public class ActivitySeineNodeChildLoador extends AbstractDataReferenceChildLoad
         }
 
         // Creation d'un node systeme observe
-        ObserveNode child = ObserveTreeHelper.createStringNode(ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM);
+        ObserveNode child = createPluralizeStringNode(ObservedSystemDto.class, null);
 
         parentNode.add(child);
 
         DataReference<ActivitySeineDto> activitySeineRef = ((ActivitySeineNode) parentNode).getEntity();
-        DataReference<SetSeineDto> setSeineRef = (DataReference<SetSeineDto>) activitySeineRef.getPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE);
+        DataReference<SetSeineDto> setSeineRef = (DataReference) activitySeineRef.getPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE);
         if (setSeineRef != null) {
-
-            // si set present, ajout d'un noeud
-            child = createSetNode(setSeineRef);
-            parentNode.add(child);
+            parentNode.add(createSetNode(setSeineRef));
         }
 
         // ajout des objets flottants
@@ -92,28 +80,20 @@ public class ActivitySeineNodeChildLoador extends AbstractDataReferenceChildLoad
     }
 
     public ObserveNode createSetNode(DataReference<SetSeineDto> data) {
-        if (data == null) {
-            throw new NullPointerException("Ne peut pas ajouter un objet null");
-        }
-
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
         return new SetSeineNode(data);
-
     }
 
     @Override
     public ObserveNode createNode(DataReference<FloatingObjectDto> data, NavDataProvider dataProvider) {
-        if (data == null) {
-            throw new NullPointerException("Ne peut pas ajouter un objet null");
-        }
-
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
         return new FloatingObjectSeineNode(data);
-
     }
 
     @Override
     public List<DataReference<FloatingObjectDto>> getData(Class<?> parentClass,
-                                        String parentId,
-                                        NavDataProvider dataProvider) throws Exception {
+                                                          String parentId,
+                                                          NavDataProvider dataProvider) throws Exception {
 
         FloatingObjectService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newFloatingObjectService();
         DataReferenceSet<FloatingObjectDto> floatingObjectByActivitySeine = service.getFloatingObjectByActivitySeine(parentId);
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java
index d2fa5c0..a0edadd 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java
@@ -22,16 +22,17 @@
 package fr.ird.observe.application.swing.ui.tree.loadors;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.ui.tree.ActivitySeineNode;
+import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.DataReferenceSet;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.service.seine.ActivitySeineService;
-import fr.ird.observe.application.swing.ui.tree.ActivitySeineNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import jaxx.runtime.swing.nav.NavDataProvider;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Le chargeur des noeuds des activités d'une route.
@@ -48,9 +49,7 @@ public class ActivitySeinesNodeChildLoador extends AbstractDataReferenceChildLoa
     }
 
     @Override
-    public List<DataReference<ActivitySeineDto>> getData(Class<?> parentClass,
-                                                         String parentId,
-                                                         NavDataProvider dataProvider) throws Exception {
+    public List<DataReference<ActivitySeineDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception {
 
         ActivitySeineService activitySeineService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newActivitySeineService();
         DataReferenceSet<ActivitySeineDto> activitySeineStubByRoute = activitySeineService.getActivitySeineByRoute(parentId);
@@ -60,10 +59,7 @@ public class ActivitySeinesNodeChildLoador extends AbstractDataReferenceChildLoa
 
     @Override
     public ObserveNode createNode(DataReference<ActivitySeineDto> data, NavDataProvider dataProvider) {
-        if (data == null) {
-            throw new NullPointerException("Ne peut pas ajouter un objet null");
-        }
-
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
         return new ActivitySeineNode(data);
 
     }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java
index 421426e..bca68de 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java
@@ -22,17 +22,15 @@
 package fr.ird.observe.application.swing.ui.tree.loadors;
 
 
-import fr.ird.observe.services.dto.seine.FloatingObjectDto;
-import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto;
-import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
+import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto;
+import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto;
+import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto;
 import jaxx.runtime.swing.nav.NavDataProvider;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
+import java.util.Objects;
 
 /**
  * Le chargeur des noeuds de marees.
@@ -40,7 +38,7 @@ import static org.nuiton.i18n.I18n.n;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 1.4
  */
-public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<String, String> {
+public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<Class, String> {
 
     private static final long serialVersionUID = 1L;
 
@@ -48,29 +46,15 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<Strin
         super(String.class);
     }
 
-    static {
-        n("observe.tree.objectOperation");
-        n("observe.tree.objectSchoolEstimate");
-        n("observe.tree.objectObservedSpecies");
-    }
-
     @Override
-    public List<String> getData(Class<?> parentClass,
-                                String parentId,
-                                NavDataProvider dataService) {
-
-        List<String> result = new ArrayList<>();
-        result.add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION);
-        result.add(FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE);
-        result.add(FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES);
-        return result;
+    public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) {
+        return Arrays.asList(ObjectOperationDto.class, ObjectSchoolEstimateDto.class, ObjectObservedSpeciesDto.class);
     }
 
     @Override
-    public ObserveNode createNode(String data, NavDataProvider dataProvider) {
-
-        return ObserveTreeHelper.createStringNode(data);
-
+    public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
+        return createStringNode(data, null);
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java
index 378f2a8..8854627 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramLonglineNodeChildLoador.java
@@ -22,23 +22,23 @@ package fr.ird.observe.application.swing.ui.tree.loadors;
  * #L%
  */
 
-import com.google.common.collect.Lists;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
+import fr.ird.observe.application.swing.ui.tree.ObserveNode;
+import fr.ird.observe.application.swing.ui.tree.TripLonglineNode;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.DataReferenceSet;
+import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
+import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto;
 import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.service.longline.TripLonglineService;
-import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
-import fr.ird.observe.application.swing.ui.tree.TripLonglineNode;
 import jaxx.runtime.swing.nav.NavDataProvider;
 import jaxx.runtime.swing.nav.tree.NavTreeBridge;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
+import java.util.Objects;
 
 /**
  * Created on 8/28/14.
@@ -50,17 +50,12 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Data
 
     private static final long serialVersionUID = 1L;
 
-    static {
-        n("observe.tree.gearUseFeaturesLongline");
-        n("observe.tree.activityLongline");
-    }
+    private boolean addChilds;
 
     public ProgramLonglineNodeChildLoador() {
         super(TripLonglineDto.class);
     }
 
-    protected boolean addChilds;
-
     @Override
     public void loadChilds(NavTreeBridge<ObserveNode> model,
                            ObserveNode parentNode,
@@ -78,9 +73,7 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Data
     }
 
     @Override
-    public List<DataReference<TripLonglineDto>> getData(Class<?> parentClass,
-                                                        String parentId,
-                                                        NavDataProvider dataProvider) throws Exception {
+    public List<DataReference<TripLonglineDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception {
 
         DataSelectionModel selectionModel = getSelectionModel(dataProvider);
 
@@ -88,14 +81,14 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Data
 
         if (selectionModel != null) {
 
-            result = Lists.newArrayList((Collection) selectionModel.getDatas(parentId));
+            result = new ArrayList<>((Collection) selectionModel.getDatas(parentId));
 
         } else {
 
             TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newTripLonglineService();
             DataReferenceSet<TripLonglineDto> tripLonglineByProgram = tripLonglineService.getTripLonglineByProgram(parentId);
 
-            result = Lists.newArrayList(tripLonglineByProgram.getReferences());
+            result = new ArrayList<>(tripLonglineByProgram.getReferences());
 
         }
 
@@ -106,40 +99,25 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Data
     @Override
     public ObserveNode createNode(DataReference<TripLonglineDto> data, NavDataProvider dataProvider) {
 
-        if (data == null) {
-            throw new NullPointerException("Ne peut pas ajouter un objet null");
-        }
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
 
         ObserveNode result = new TripLonglineNode(data);
 
         if (addChilds) {
-
-            {
-                // Add gears
-                //FIXME
-                ObserveNode child = ObserveTreeHelper.createStringNode("gearUseFeaturesLongline");
-                result.add(child);
-            }
-
-            {
-                // Add activities
-                ObserveNode child = ObserveTreeHelper.createStringNode(TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE,
-                                                                       ActivityLonglinesNodeChildLoador.class);
-                result.add(child);
-            }
-
+            result.add(createPluralizeStringNode(GearUseFeaturesLonglineDto.class, null));
+            result.add(createPluralizeStringNode(ActivityLonglineDto.class, ActivityLonglinesNodeChildLoador.class));
         }
 
         return result;
 
     }
 
-    public void setAddChilds(boolean addChilds) {
-        this.addChilds = addChilds;
-    }
-
     public boolean isAddChilds() {
         return addChilds;
     }
+
+    public void setAddChilds(boolean addChilds) {
+        this.addChilds = addChilds;
+    }
 }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java
index d6cd703..0848478 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ProgramSeineNodeChildLoador.java
@@ -21,24 +21,23 @@
  */
 package fr.ird.observe.application.swing.ui.tree.loadors;
 
-import com.google.common.collect.Lists;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
+import fr.ird.observe.application.swing.ui.tree.ObserveNode;
+import fr.ird.observe.application.swing.ui.tree.TripSeineNode;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.DataReferenceSet;
+import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto;
+import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.services.service.seine.TripSeineService;
-import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
-import fr.ird.observe.application.swing.ui.tree.TripSeineNode;
 import jaxx.runtime.swing.nav.NavDataProvider;
 import jaxx.runtime.swing.nav.tree.NavTreeBridge;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
+import java.util.Objects;
 
 /**
  * Le chargeur des noeuds fils d'un program (les marees du programme).
@@ -50,21 +49,14 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<DataRef
 
     private static final long serialVersionUID = 1L;
 
-    static {
-        n("observe.tree.gearUseFeaturesSeine");
-        n("observe.tree.route");
-    }
+    private boolean addChilds;
 
     public ProgramSeineNodeChildLoador() {
         super(TripSeineDto.class);
     }
 
-    protected boolean addChilds;
-
     @Override
-    public void loadChilds(NavTreeBridge<ObserveNode> model,
-                           ObserveNode parentNode,
-                           NavDataProvider dataProvider) throws Exception {
+    public void loadChilds(NavTreeBridge<ObserveNode> model, ObserveNode parentNode, NavDataProvider dataProvider) throws Exception {
         DataSelectionModel selectionModel = getSelectionModel(dataProvider);
         addChilds = selectionModel == null;
 
@@ -76,9 +68,7 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<DataRef
     }
 
     @Override
-    public List<DataReference<TripSeineDto>> getData(Class<?> parentClass,
-                                                     String parentId,
-                                                     NavDataProvider dataProvider) throws Exception {
+    public List<DataReference<TripSeineDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception {
 
         DataSelectionModel selectionModel = getSelectionModel(dataProvider);
 
@@ -86,7 +76,7 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<DataRef
 
         if (selectionModel != null) {
 
-            result = Lists.newArrayList((Collection) selectionModel.getDatas(parentId));
+            result = new ArrayList<>((Collection) selectionModel.getDatas(parentId));
 
         } else {
 
@@ -103,26 +93,13 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<DataRef
     @Override
     public ObserveNode createNode(DataReference<TripSeineDto> data, NavDataProvider dataProvider) {
 
-        if (data == null) {
-            throw new NullPointerException("Ne peut pas ajouter un objet null");
-        }
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
 
         ObserveNode result = new TripSeineNode(data);
 
         if (addChilds) {
-
-            {
-                // Add gears
-                ObserveNode child = ObserveTreeHelper.createStringNode("gearUseFeaturesSeine");
-                result.add(child);
-            }
-
-            {
-                // Add routes
-                ObserveNode child = ObserveTreeHelper.createStringNode(TripSeineDto.PROPERTY_ROUTE, RoutesNodeChildLoador.class);
-                result.add(child);
-            }
-
+            result.add(createPluralizeStringNode(GearUseFeaturesSeineDto.class, null));
+            result.add(createPluralizeStringNode(RouteDto.class, RoutesNodeChildLoador.class));
         }
 
         return result;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java
deleted file mode 100644
index 76529b4..0000000
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * #%L
- * ObServe :: Application Swing
- * %%
- * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the 
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-package fr.ird.observe.application.swing.ui.tree.loadors;
-
-
-import fr.ird.observe.services.dto.referential.ReferentialDto;
-import fr.ird.observe.services.dto.referential.ReferentialDtos;
-import fr.ird.observe.application.swing.ui.UIHelper;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import jaxx.runtime.swing.nav.NavDataProvider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
-
-/**
- * Le chargeur des noeuds du referentiel.
- *
- * @author Tony Chemit - chemit@codelutin.com
- * @since 1.4
- */
-public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Class, Class> {
-
-    private static final long serialVersionUID = 1L;
-
-    static {
-
-        n("observe.tree.vesselSizeCategory");
-        n("observe.tree.country");
-        n("observe.tree.harbour");
-        n("observe.tree.vesselType");
-        n("observe.tree.vessel");
-        n("observe.tree.speciesGroup");
-        n("observe.tree.species");
-        n("observe.tree.sex");
-        n("observe.tree.fpaZone");
-        n("observe.tree.speciesList");
-        n("observe.tree.person");
-        n("observe.tree.ocean");
-        n("observe.tree.organism");
-        n("observe.tree.lengthWeightParameter");
-        n("observe.tree.program");
-        n("observe.tree.gearCaracteristicType");
-        n("observe.tree.gearCaracteristic");
-        n("observe.tree.gear");
-
-    }
-
-    public ReferenceCommonNodeChildLoador() {
-        super(Class.class);
-    }
-
-    @Override
-    public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) {
-
-        List<Class> result = new ArrayList<>();
-        for (Class<? extends ReferentialDto> referenceCommonDto : ReferentialDtos.REFERENCE_COMMON_DTOS) {
-            result.add(referenceCommonDto);
-        }
-        UIHelper.sortReferentiel(result);
-        return result;
-    }
-
-    @Override
-    public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
-
-        return new ObserveNode(
-                data,
-                data.getSimpleName(),
-                null,
-                true
-        );
-    }
-}
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java
deleted file mode 100644
index 4ba3e24..0000000
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * #%L
- * ObServe :: Application Swing
- * %%
- * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the 
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public 
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-package fr.ird.observe.application.swing.ui.tree.loadors;
-
-
-import fr.ird.observe.services.dto.referential.ReferentialDto;
-import fr.ird.observe.services.dto.referential.ReferentialDtos;
-import fr.ird.observe.application.swing.ui.UIHelper;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import jaxx.runtime.swing.nav.NavDataProvider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
-
-/**
- * Le chargeur des noeuds du referentiel.
- *
- * @author Tony Chemit - chemit@codelutin.com
- * @since 1.4
- */
-public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Class, Class> {
-
-    private static final long serialVersionUID = 1L;
-
-    static {
-        n("observe.tree.baitHaulingStatus");
-        n("observe.tree.baitSettingStatus");
-        n("observe.tree.baitType");
-        n("observe.tree.catchFateLongline");
-        n("observe.tree.encounterType");
-        n("observe.tree.healthness");
-        n("observe.tree.hookPosition");
-        n("observe.tree.hookSize");
-        n("observe.tree.hookType");
-        n("observe.tree.itemVerticalPosition");
-        n("observe.tree.itemHorizontalPosition");
-        n("observe.tree.lightsticksColor");
-        n("observe.tree.lightsticksType");
-        n("observe.tree.lineType");
-        n("observe.tree.maturityStatus");
-        n("observe.tree.mitigationType");
-        n("observe.tree.sensorBrand");
-        n("observe.tree.sensorDataFormat");
-        n("observe.tree.sensorType");
-        n("observe.tree.settingShape");
-        n("observe.tree.sizeMeasureType");
-        n("observe.tree.stomacFullness");
-        n("observe.tree.tripType");
-        n("observe.tree.vesselActivityLongline");
-        n("observe.tree.weightMeasureType");
-
-    }
-
-    public ReferenceLonglineNodeChildLoador() {
-        super(Class.class);
-    }
-
-    @Override
-    public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) {
-
-        List<Class> result = new ArrayList<>();
-        for (Class<? extends ReferentialDto> referenceCommonDto : ReferentialDtos.REFERENCE_LONGLINE_DTOS) {
-            result.add(referenceCommonDto);
-        }
-        UIHelper.sortReferentiel(result);
-        return result;
-    }
-
-    @Override
-    public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
-
-        return new ObserveNode(
-                data,
-                data.getSimpleName(),
-                null,
-                true
-        );
-    }
-}
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java
similarity index 51%
rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java
rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java
index 48392cb..e8d686b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceNodeChildLoador.java
@@ -22,16 +22,14 @@
 package fr.ird.observe.application.swing.ui.tree.loadors;
 
 
-import fr.ird.observe.services.dto.referential.ReferentialDto;
-import fr.ird.observe.services.dto.referential.ReferentialDtos;
-import fr.ird.observe.application.swing.ui.UIHelper;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
+import fr.ird.observe.services.dto.referential.ReferentialDtos;
 import jaxx.runtime.swing.nav.NavDataProvider;
 
-import java.util.ArrayList;
 import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
+import java.util.Objects;
+import java.util.Set;
 
 /**
  * Le chargeur des noeuds du referentiel.
@@ -39,53 +37,44 @@ import static org.nuiton.i18n.I18n.n;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 1.4
  */
-public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class, Class> {
-
-    private static final long serialVersionUID = 1L;
+class ReferenceNodeChildLoador extends AbstractNodeChildLoador<Class, Class> {
 
-    static {
+    public static class CommonReferenceNodeChildLoador extends ReferenceNodeChildLoador {
+        public CommonReferenceNodeChildLoador() {
+            super(ReferentialDtos.REFERENCE_COMMON_DTOS);
+        }
+    }
 
-        n("observe.tree.vesselActivitySeine");
-        n("observe.tree.surroundingActivity");
-        n("observe.tree.reasonForNullSet");
-        n("observe.tree.reasonForNoFishing");
-        n("observe.tree.speciesFate");
-        n("observe.tree.objectFate");
-        n("observe.tree.weightCategory");
-        n("observe.tree.detectionMode");
-        n("observe.tree.transmittingBuoyOperation");
-        n("observe.tree.objectOperation");
-        n("observe.tree.reasonForDiscard");
-        n("observe.tree.speciesStatus");
-        n("observe.tree.observedSystem");
-        n("observe.tree.transmittingBuoyType");
-        n("observe.tree.objectType");
-        n("observe.tree.wind");
+    public static class SeineReferenceNodeChildLoador extends ReferenceNodeChildLoador {
+        public SeineReferenceNodeChildLoador() {
+            super(ReferentialDtos.REFERENCE_SEINE_DTOS);
+        }
+    }
 
+    public static class LonglineReferenceNodeChildLoador extends ReferenceNodeChildLoador {
+        public LonglineReferenceNodeChildLoador() {
+            super(ReferentialDtos.REFERENCE_LONGLINE_DTOS);
+        }
     }
 
-    public ReferenceSeineNodeChildLoador() {
+
+    private static final long serialVersionUID = 1L;
+
+    private final Set<Class> classes;
+
+    private ReferenceNodeChildLoador(Set classes) {
         super(Class.class);
+        this.classes = classes;
     }
 
     @Override
     public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) {
-
-        List<Class> result = new ArrayList<>();
-        for (Class<? extends ReferentialDto> referenceCommonDto : ReferentialDtos.REFERENCE_SEINE_DTOS) {
-            result.add(referenceCommonDto);
-        }
-        UIHelper.sortReferentiel(result);
-        return result;
+        return ObserveI18nDecoratorHelper.sortTypes(classes);
     }
 
     @Override
     public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
-        return new ObserveNode(
-                data,
-                data.getSimpleName(),
-                null,
-                true
-        );
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
+        return new ObserveNode(data, data.getSimpleName(), null, true);
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java
index 857aefd..e366311 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RootNodeChildLoador.java
@@ -21,20 +21,20 @@
  */
 package fr.ird.observe.application.swing.ui.tree.loadors;
 
-import com.google.common.collect.Lists;
-import fr.ird.observe.services.dto.constants.GearType;
-import fr.ird.observe.services.dto.referential.ProgramDto;
-import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
 import fr.ird.observe.application.swing.ui.tree.ProgramLonglineNode;
 import fr.ird.observe.application.swing.ui.tree.ProgramSeineNode;
+import fr.ird.observe.services.dto.constants.GearType;
+import fr.ird.observe.services.dto.referential.ProgramDto;
+import fr.ird.observe.services.dto.referential.ReferentialReference;
 import jaxx.runtime.swing.nav.NavDataProvider;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import static org.nuiton.i18n.I18n.n;
@@ -49,16 +49,12 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<ReferentialRefe
 
     private static final long serialVersionUID = 1L;
 
-    protected boolean addData;
+    private boolean addData;
 
-    protected boolean addReferentiel;
-
-    public RootNodeChildLoador() {
-        super(ProgramDto.class);
-    }
+    private boolean addReferentiel;
 
     public RootNodeChildLoador(boolean addData, boolean addReferentiel) {
-        this();
+        super(ProgramDto.class);
         this.addData = addData;
         this.addReferentiel = addReferentiel;
     }
@@ -81,7 +77,7 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<ReferentialRefe
         if (addData) {
 
             if (selectionModel != null) {
-                data = Lists.newArrayList(selectionModel.getDatas().keySet());
+                data = new ArrayList<>(selectionModel.getDatas().keySet());
             } else {
                 Set<ReferentialReference<ProgramDto>> referentialReferenceSet = getDataSource(dataProvider).getReferentialReferences(ProgramDto.class);
                 data = new ArrayList<>(referentialReferenceSet);
@@ -98,41 +94,29 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<ReferentialRefe
     public void addChildNodes(ObserveNode parentNode, List<ReferentialReference<ProgramDto>> datas, NavDataProvider dataProvider) {
         super.addChildNodes(parentNode, datas, dataProvider);
         if (addReferentiel) {
-
-            { // ajout du referentiel commun
-                ObserveNode child = new ObserveNode(
-                        String.class,
-                        n("observe.tree.reference.common"),
-                        ObserveTreeHelper.getChildLoador(ReferenceCommonNodeChildLoador.class),
-                        true
-                );
-                parentNode.add(child);
-            }
-            { // ajout du referentiel seine
-                ObserveNode child = new ObserveNode(
-                        String.class,
-                        n("observe.tree.reference.seine"),
-                        ObserveTreeHelper.getChildLoador(ReferenceSeineNodeChildLoador.class),
-                        true
-                );
-                parentNode.add(child);
-            }
-            { // ajout du referentiel longline
-                ObserveNode child = new ObserveNode(
-                        String.class,
-                        n("observe.tree.reference.longline"),
-                        ObserveTreeHelper.getChildLoador(ReferenceLonglineNodeChildLoador.class),
-                        true
-                );
-                parentNode.add(child);
-            }
-
+            parentNode.add(new ObserveNode(
+                    String.class,
+                    n("observe.type.reference.common"),
+                    ObserveTreeHelper.getChildLoador(ReferenceNodeChildLoador.CommonReferenceNodeChildLoador.class),
+                    true));
+            parentNode.add(new ObserveNode(
+                    String.class,
+                    n("observe.type.reference.seine"),
+                    ObserveTreeHelper.getChildLoador(ReferenceNodeChildLoador.SeineReferenceNodeChildLoador.class),
+                    true));
+            parentNode.add(new ObserveNode(
+                    String.class,
+                    n("observe.type.reference.longline"),
+                    ObserveTreeHelper.getChildLoador(ReferenceNodeChildLoador.LonglineReferenceNodeChildLoador.class),
+                    true));
         }
     }
 
     @Override
     public ObserveNode createNode(ReferentialReference<ProgramDto> data, NavDataProvider dataProvider) {
 
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
+
         GearType gearType = (GearType) data.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE);
 
         ObserveNode result;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java
index e6f4748..46f6a6b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/RoutesNodeChildLoador.java
@@ -22,19 +22,18 @@
 package fr.ird.observe.application.swing.ui.tree.loadors;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.ui.tree.ObserveNode;
+import fr.ird.observe.application.swing.ui.tree.RouteSeineNode;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.DataReferenceSet;
+import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.service.seine.RouteService;
-import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
-import fr.ird.observe.application.swing.ui.tree.RouteSeineNode;
 import jaxx.runtime.swing.nav.NavDataProvider;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
+import java.util.Objects;
 
 /**
  * Le chargeur des noeuds de routes d'une marée.
@@ -46,41 +45,26 @@ public class RoutesNodeChildLoador extends AbstractDataReferenceChildLoador<Rout
 
     private static final long serialVersionUID = 1L;
 
-    static {
-        n("observe.tree.activitySeine");
-    }
-
     public RoutesNodeChildLoador() {
         super(RouteDto.class);
     }
 
     @Override
-    public List<DataReference<RouteDto>> getData(Class<?> parentClass,
-                                                 String parentId,
-                                                 NavDataProvider dataProvider) throws Exception {
-
+    public List<DataReference<RouteDto>> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception {
         RouteService routeService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newRouteService();
         DataReferenceSet<RouteDto> routeByTripSeine = routeService.getRouteByTripSeine(parentId);
-
         return new ArrayList<>(routeByTripSeine.getReferences());
     }
 
 
-
     @Override
     public ObserveNode createNode(DataReference<RouteDto> data, NavDataProvider dataProvider) {
-
-        if (data == null) {
-            throw new NullPointerException("Ne peut pas ajouter un objet null");
-        }
-
+        Objects.requireNonNull(data, "Ne peut pas ajouter un objet null");
         ObserveNode result = new RouteSeineNode(data);
-
-        // Creation d'un node activites
-        ObserveNode child = ObserveTreeHelper.createStringNode("activitySeine", ActivitySeinesNodeChildLoador.class);
+        ObserveNode child = createPluralizeStringNode(ActivitySeineDto.class, ActivitySeinesNodeChildLoador.class);
         result.add(child);
         return result;
-
     }
 
+
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java
index 8c61679..acc43ed 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java
@@ -23,16 +23,17 @@ package fr.ird.observe.application.swing.ui.tree.loadors;
  */
 
 
-import fr.ird.observe.services.dto.longline.SetLonglineCatchDto;
-import fr.ird.observe.services.dto.longline.SetLonglineTdrDto;
+import com.google.common.collect.Sets;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
+import fr.ird.observe.services.dto.longline.CatchLonglineDto;
+import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto;
+import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;
+import fr.ird.observe.services.dto.longline.TdrDto;
 import jaxx.runtime.swing.nav.NavDataProvider;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
+import java.util.Set;
 
 /**
  * Created on 8/30/14.
@@ -40,39 +41,27 @@ import static org.nuiton.i18n.I18n.n;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 3.7
  */
-public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> {
+public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<Class, String> {
 
     private static final long serialVersionUID = 1L;
 
-    static {
-        n("observe.tree.longlineGlobalComposition");
-        n("observe.tree.longlineDetailComposition");
-        n("observe.tree.catchLongline");
-        n("observe.tree.tdr");
-    }
+    private static final Set<Class> PLURALIZE_PROPERTIES = Sets.newHashSet(CatchLonglineDto.class, TdrDto.class);
 
     public SetLonglineNodeChildLoador() {
         super(String.class);
     }
 
     @Override
-    public List<String> getData(Class<?> parentClass,
-                                String parentId,
-                                NavDataProvider dataProvider) {
-
-        List<String> result = new ArrayList<>();
-        result.add("longlineGlobalComposition");
-        result.add("longlineDetailComposition");
-        result.add(SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE);
-        result.add(SetLonglineTdrDto.PROPERTY_TDR);
-//
-        return result;
+    public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) {
+        return Arrays.asList(SetLonglineGlobalCompositionDto.class,
+                             SetLonglineDetailCompositionDto.class,
+                             CatchLonglineDto.class,
+                             TdrDto.class);
     }
 
     @Override
-    public ObserveNode createNode(String data, NavDataProvider dataProvider) {
-
-        return ObserveTreeHelper.createStringNode(data);
-
+    public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
+        return createNode0(PLURALIZE_PROPERTIES, data);
     }
+
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java
index cd07713..ddeac90 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java
@@ -22,18 +22,22 @@
 package fr.ird.observe.application.swing.ui.tree.loadors;
 
 
-import fr.ird.observe.services.dto.seine.SetSeineDto;
-import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto;
-import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto;
-import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto;
+import com.google.common.collect.Sets;
 import fr.ird.observe.application.swing.ui.tree.ObserveNode;
-import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
+import fr.ird.observe.services.dto.seine.DiscardedTargetCatchDto;
+import fr.ird.observe.services.dto.seine.DiscardedTargetSampleDto;
+import fr.ird.observe.services.dto.seine.KeptTargetCatchDto;
+import fr.ird.observe.services.dto.seine.KeptTargetSampleDto;
+import fr.ird.observe.services.dto.seine.NonTargetCatchDto;
+import fr.ird.observe.services.dto.seine.NonTargetSampleDto;
+import fr.ird.observe.services.dto.seine.SchoolEstimateDto;
+import fr.ird.observe.services.dto.seine.TargetCatchDto;
+import fr.ird.observe.services.dto.seine.TargetSampleDto;
 import jaxx.runtime.swing.nav.NavDataProvider;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-
-import static org.nuiton.i18n.I18n.n;
+import java.util.Set;
 
 /**
  * Le chargeur des noeuds de marees.
@@ -41,44 +45,32 @@ import static org.nuiton.i18n.I18n.n;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 1.4
  */
-public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String, String> {
+public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<Class, String> {
 
     private static final long serialVersionUID = 1L;
 
-    static {
-        n("observe.tree.schoolEstimate");
-        n("observe.tree.targetCatch");
-        n("observe.tree.targetDiscarded");
-        n("observe.tree.targetSample");
-        n("observe.tree.targetSampleCapture");
-        n("observe.tree.nonTargetCatch");
-        n("observe.tree.nonTargetSample");
-    }
+    private static final Set<Class> PLURALIZE_PROPERTIES = Sets.newHashSet(TargetCatchDto.class,
+                                                                           TargetSampleDto.class,
+                                                                           NonTargetSampleDto.class,
+                                                                           NonTargetCatchDto.class);
 
     public SetSeineNodeChildLoador() {
         super(String.class);
     }
 
     @Override
-    public List<String> getData(Class<?> parentClass,
-                                String parentId,
-                                NavDataProvider dataProvider) {
-
-        List<String> result = new ArrayList<>();
-        result.add(SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE);
-        result.add(SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH);
-        result.add(SetSeineDto.PROPERTY_TARGET_DISCARDED);
-        result.add("targetSample");
-        result.add(SetSeineDto.PROPERTY_TARGET_SAMPLE_CAPTURE);
-        result.add(SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH);
-        result.add("nonTargetSample");
-        return result;
-
+    public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) {
+        return Arrays.asList(SchoolEstimateDto.class,
+                             KeptTargetCatchDto.class,
+                             DiscardedTargetCatchDto.class,
+                             DiscardedTargetSampleDto.class,
+                             KeptTargetSampleDto.class,
+                             NonTargetCatchDto.class,
+                             NonTargetSampleDto.class);
     }
 
     @Override
-    public ObserveNode createNode(String data, NavDataProvider dataProvider) {
-
-        return ObserveTreeHelper.createStringNode(data);
+    public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
+        return createNode0(PLURALIZE_PROPERTIES, data);
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUIHandler.java
index 5ae8171..3b8d083 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/usage/UsagesUIHandler.java
@@ -22,6 +22,7 @@
 package fr.ird.observe.application.swing.ui.usage;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.services.dto.AbstractReference;
 import fr.ird.observe.services.dto.DataDto;
 import fr.ird.observe.services.dto.DataReference;
@@ -29,7 +30,6 @@ import fr.ird.observe.services.dto.IdDto;
 import fr.ird.observe.services.dto.ReferenceMap;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.decorator.Decorator;
@@ -90,7 +90,7 @@ public class UsagesUIHandler {
             for (Map.Entry<Class<? extends IdDto>, Set<? extends AbstractReference>> entry : usages.entrySet()) {
                 Class dtoType = entry.getKey();
                 Set references = entry.getValue();
-                String typeTitle = t(DecoratorService.getEntityLabel(dtoType));
+                String typeTitle = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType));
                 if (DataDto.class.isAssignableFrom(dtoType)) {
                     addDataReferenceUsages(ui, dtoType, references, typeTitle);
                 } else {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java
index b73c4c6..15bccac 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java
@@ -22,10 +22,9 @@ package fr.ird.observe.application.swing.ui.util;
  * #L%
  */
 
-import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import fr.ird.observe.services.service.actions.validate.ValidationMessage;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.admin.validate.ValidationMessageTableModel;
+import fr.ird.observe.services.service.actions.validate.ValidationMessage;
 import jaxx.runtime.validator.swing.SwingValidatorUtil;
 import org.nuiton.validator.NuitonValidatorScope;
 
@@ -39,34 +38,15 @@ import java.awt.Component;
 import static org.nuiton.i18n.I18n.t;
 
 /**
-* Created on 12/13/14.
-*
-* @author Tony Chemit - chemit@codelutin.com
-* @since XXX
-*/
+ * Created on 12/13/14.
+ *
+ * @author Tony Chemit - chemit@codelutin.com
+ * @since XXX
+ */
 public class ObserveValidationMessageTableRenderer extends DefaultTableCellRenderer {
 
     private static final long serialVersionUID = 1L;
 
-    protected transient DecoratorService decoratorService;
-
-    public DecoratorService getDecoratorService() {
-        if (decoratorService == null) {
-            decoratorService = ObserveSwingApplicationContext.get().getDecoratorService();
-        }
-        return decoratorService;
-    }
-
-    public String getFieldName(JTable table, String value, int row) {
-
-        String fieldName = value;
-        DecoratorService dService = getDecoratorService();
-        if (!dService.getPropertyMatch(fieldName).matches()) {
-            fieldName = DecoratorService.getPropertyLabel(fieldName);
-        }
-        return t(fieldName);
-    }
-
     @Override
     public Component getTableCellRendererComponent(JTable table,
                                                    Object value,
@@ -74,15 +54,7 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende
                                                    boolean hasFocus,
                                                    int row,
                                                    int column) {
-        JLabel rendererComponent = (JLabel)
-                super.getTableCellRendererComponent(
-                        table,
-                        value,
-                        isSelected,
-                        hasFocus,
-                        row,
-                        column
-                );
+        JLabel rendererComponent = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
 
         ImageIcon icon = null;
         String text = null;
@@ -93,6 +65,8 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende
             row = table.getRowSorter().convertRowIndexToModel(row);
         }
 
+        ValidationMessageTableModel model = (ValidationMessageTableModel) table.getModel();
+
         switch (column) {
             case 0:
                 // scope
@@ -104,13 +78,13 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende
 
             case 1:
                 // field name
-                text = getFieldName(table, (String) value, row);
+                text = getFieldName((String) value);
                 toolTipText = t("observe.validator.field.tip", text);
                 break;
 
             case 2:
                 // message
-                text = getMessage(table, (String) value, row);
+                text = getMessage(model, row);
                 toolTipText = t("observe.validator.message.tip", text);
                 break;
         }
@@ -119,10 +93,8 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende
         rendererComponent.setToolTipText(toolTipText);
         rendererComponent.setIcon(icon);
 
-        ValidationMessageTableModel model = (ValidationMessageTableModel) table.getModel();
 
-        NuitonValidatorScope scope = (NuitonValidatorScope) (
-                column == 0 ? value : model.getValueAt(row, 0));
+        NuitonValidatorScope scope = (NuitonValidatorScope) (column == 0 ? value : model.getValueAt(row, 0));
 
         Color textColor = scope == NuitonValidatorScope.WARNING ? Color.RED : Color.BLACK;
         rendererComponent.setForeground(textColor);
@@ -134,12 +106,14 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende
         return SwingValidatorUtil.getIcon(scope);
     }
 
-    public String getMessage(JTable table, String value, int row) {
-        ValidationMessageTableModel tableModel =
-                (ValidationMessageTableModel) table.getModel();
+    private String getMessage(ValidationMessageTableModel tableModel, int row) {
         ValidationMessage validationMessage = tableModel.getRow(row);
         return validationMessage.getMessage();
+    }
 
+    private String getFieldName(String value) {
+        String fieldName = value.startsWith("observe.") ? value : ObserveI18nDecoratorHelper.getPropertyI18nKey(value);
+        return t(fieldName);
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java
index aa54d37..0556c39 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java
@@ -22,12 +22,13 @@ package fr.ird.observe.application.swing.ui.util;
  * #L%
  */
 
-import fr.ird.observe.application.swing.decoration.DecoratorService;
-import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
+import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import jaxx.runtime.validator.swing.SwingValidatorMessage;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
 import jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.JComponent;
@@ -38,52 +39,40 @@ import java.awt.Component;
 import static org.nuiton.i18n.I18n.t;
 
 /**
-* Created on 12/13/14.
-*
-* @author Tony Chemit - chemit@codelutin.com
-* @since XXX
-*/
+ * Created on 12/13/14.
+ *
+ * @author Tony Chemit - chemit@codelutin.com
+ * @since XXX
+ */
 public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageTableRenderer {
 
     private static final long serialVersionUID = 1L;
 
-    protected transient DecoratorService decoratorService;
-
-    public DecoratorService getDecoratorService() {
-        if (decoratorService == null) {
-            decoratorService = ObserveSwingApplicationContext.get().getDecoratorService();
-        }
-        return decoratorService;
-    }
+    /** Logger. */
+    private static final Log log = LogFactory.getLog(ObserveValidatorMessageTableRenderer.class);
 
     @Override
     public String getFieldName(JTable table, String value, int row) {
         SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel();
         SwingValidatorMessage model = tableModel.getRow(row);
         JComponent editor = model.getEditor();
-        String fieldName = null;
         if (editor != null) {
             String validatorLabel = (String) editor.getClientProperty("validatorLabel");
-
             if (validatorLabel != null) {
-                fieldName = validatorLabel;
+                if (log.isWarnEnabled()) {
+                    log.warn("Using deprecated validatorLabel : " + validatorLabel);
+                }
+                return validatorLabel;
             }
 
             Boolean doNotTranslateFieldName = (Boolean) editor.getClientProperty("doNotTranslateFieldName");
             if (BooleanUtils.isTrue(doNotTranslateFieldName)) {
-                fieldName = value;
+                return value;
             }
         }
 
-        if (fieldName == null) {
-            fieldName = value;
-
-            DecoratorService dService = getDecoratorService();
-            if (!dService.getPropertyMatch(fieldName).matches()) {
-                fieldName = DecoratorService.getPropertyLabel(fieldName);
-            }
-            fieldName = t(fieldName);
-        }
+        String fieldName = value.startsWith("observe.") ? value : ObserveI18nDecoratorHelper.getPropertyI18nKey(value);
+        fieldName = t(fieldName);
 
         return fieldName;
     }
@@ -94,8 +83,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT
 
         SwingValidatorMessageTableModel model = (SwingValidatorMessageTableModel) table.getModel();
 
-        NuitonValidatorScope scope = (NuitonValidatorScope) (
-                column == 0 ? value : model.getValueAt(row, 0));
+        NuitonValidatorScope scope = (NuitonValidatorScope) (column == 0 ? value : model.getValueAt(row, 0));
 
         Color textColor = scope == NuitonValidatorScope.WARNING ? Color.RED : Color.BLACK;
         result.setForeground(textColor);
diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties
index 9cfc458..2ac96cb 100644
--- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties
+++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties
@@ -541,26 +541,6 @@ observe.config.category.synchro=Admin Tasks
 observe.config.category.synchro.description=Administrations tasks to perform on data sources
 observe.content.action.activity=Create a new activity
 observe.content.action.activity.tip=Create a new activity
-observe.content.action.baitHaulingStatus.create.tip=Create a new statut de bait hauling status
-observe.content.action.baitHaulingStatus.delete.tip=Delete selected statut de bait hauling status
-observe.content.action.baitHaulingStatus.detail.tip=View details of selected statut de bait hauling status
-observe.content.action.baitHaulingStatus.modify.tip=Modify selected statut de bait hauling status
-observe.content.action.baitHaulingStatus.save.tip=Save modification of statuts de bait hauling status
-observe.content.action.baitSettingStatus.create.tip=Create a new statut de bait setting status
-observe.content.action.baitSettingStatus.delete.tip=Delete selected statut de bait setting status
-observe.content.action.baitSettingStatus.detail.tip=View details of selected statut de bait setting status
-observe.content.action.baitSettingStatus.modify.tip=Modify selected statut de bait setting status
-observe.content.action.baitSettingStatus.save.tip=Save modification of statut de bait setting status
-observe.content.action.baitType.create.tip=Create a new bait type
-observe.content.action.baitType.delete.tip=Delete selected bait type
-observe.content.action.baitType.detail.tip=View details of selected bait type
-observe.content.action.baitType.modify.tip=Modify selected bait type
-observe.content.action.baitType.save.tip=Save modification of bait type
-observe.content.action.catchFateLongline.create.tip=Create a new catch fate
-observe.content.action.catchFateLongline.delete.tip=Delete selected catch fate
-observe.content.action.catchFateLongline.detail.tip=View details of selected catch fate
-observe.content.action.catchFateLongline.modify.tip=Modify selected catch fate
-observe.content.action.catchFateLongline.save.tip=Save modification of catch fate
 observe.content.action.closeAndCreate=Close and create
 observe.content.action.closeAndCreate.activity=Next activity
 observe.content.action.closeAndCreate.activity.tip=close current activity and create a new one
@@ -569,11 +549,6 @@ observe.content.action.closeAndCreate.maree.tip=close current trip and create a
 observe.content.action.closeAndCreate.route=Next route
 observe.content.action.closeAndCreate.route.tip=Close current route and create a new one
 observe.content.action.closeAndCreate.tip=Close current element and create a new one
-observe.content.action.country.create.tip=Create a new country
-observe.content.action.country.delete.tip=Delete selected country
-observe.content.action.country.detail.tip=View details of selected country
-observe.content.action.country.modify.tip=Modify selected country
-observe.content.action.country.save.tip=Save modification of country
 observe.content.action.create.entry.tip=Create a new entry
 observe.content.action.create.gearUseFeaturesSeine=Create a new gear use feature
 observe.content.action.create.gearUseFeaturesSeine.tip=Create a new gear use feature
@@ -595,36 +570,6 @@ observe.content.action.create.targetSample=Insert this sample
 observe.content.action.create.targetSample.tip=Insert this target sample
 observe.content.action.create.targetSampleCapture=Insert this sample
 observe.content.action.create.targetSampleCapture.tip=Insert this target sample
-observe.content.action.detectionMode.create.tip=Create a new mode détection
-observe.content.action.detectionMode.delete.tip=Delete selected detection mode
-observe.content.action.detectionMode.detail.tip=View details of selected mode détection
-observe.content.action.detectionMode.modify.tip=Modify selected detection mode
-observe.content.action.detectionMode.save.tip=Save modification of detection mode
-observe.content.action.encounterType.create.tip=Create a new encounter type
-observe.content.action.encounterType.delete.tip=Delete selected encounter type
-observe.content.action.encounterType.detail.tip=View details of selected encounter type
-observe.content.action.encounterType.modify.tip=Modify selected encounter type
-observe.content.action.encounterType.save.tip=Save modification of encounter type
-observe.content.action.fpaZone.create.tip=Create a new Fpa zone
-observe.content.action.fpaZone.delete.tip=Delete Fpa zone
-observe.content.action.fpaZone.detail.tip=View details of selected Fpa zone
-observe.content.action.fpaZone.modify.tip=Modify selected Fpa zone
-observe.content.action.fpaZone.save.tip=Save modification of Fpa zone
-observe.content.action.gear.create.tip=Create a new gear
-observe.content.action.gear.delete.tip=Delete selected gear
-observe.content.action.gear.detail.tip=View details of selected gear
-observe.content.action.gear.modify.tip=Modify selected gear
-observe.content.action.gear.save.tip=Save modification of gear
-observe.content.action.gearCaracteristic.create.tip=Create a new gear caracteristic
-observe.content.action.gearCaracteristic.delete.tip=Delete gear caracteristic
-observe.content.action.gearCaracteristic.detail.tip=View details of selected gear caracteristic
-observe.content.action.gearCaracteristic.modify.tip=Modify selected gear caracteristic
-observe.content.action.gearCaracteristic.save.tip=Save modification of gear caracteristic
-observe.content.action.gearCaracteristicType.create.tip=Create a new gear caracteristic type
-observe.content.action.gearCaracteristicType.delete.tip=Delete selected gear caracteristic type
-observe.content.action.gearCaracteristicType.detail.tip=View details of selected gear caracteristic type
-observe.content.action.gearCaracteristicType.modify.tip=Modify selected gear caracteristic type
-observe.content.action.gearCaracteristicType.save.tip=Save modification of gear caracteristic type
 observe.content.action.gearUseFeaturesLongline=Create a new gear use feature
 observe.content.action.gearUseFeaturesLongline.tip=Create a new gear use feature
 observe.content.action.goto.open.activity=Go to opened activity
@@ -654,71 +599,6 @@ observe.content.action.goto.selected.maree=Go to selected trip
 observe.content.action.goto.selected.maree.tip=Go to selected trip
 observe.content.action.goto.selected.route=Go to selected route
 observe.content.action.goto.selected.route.tip=Go to selected route
-observe.content.action.harbour.create.tip=Create a new port
-observe.content.action.harbour.delete.tip=Delete selected port
-observe.content.action.harbour.detail.tip=View details of selected port
-observe.content.action.harbour.modify.tip=Modify selected port
-observe.content.action.harbour.save.tip=Save modification of port
-observe.content.action.healthness.create.tip=Create a new healthness
-observe.content.action.healthness.delete.tip=Delete selected healthness
-observe.content.action.healthness.detail.tip=View details of selected healthness
-observe.content.action.healthness.modify.tip=Modify selected healthness
-observe.content.action.healthness.save.tip=Save modification of healthness
-observe.content.action.hookPosition.create.tip=Create a new hook position
-observe.content.action.hookPosition.delete.tip=Delete hook position
-observe.content.action.hookPosition.detail.tip=View details of selected hook position
-observe.content.action.hookPosition.modify.tip=Modify selected hook position
-observe.content.action.hookPosition.save.tip=Save modification of hook position
-observe.content.action.hookSize.create.tip=Create a new hook size
-observe.content.action.hookSize.delete.tip=Delete hook size
-observe.content.action.hookSize.detail.tip=View details of selected hook size
-observe.content.action.hookSize.modify.tip=Modify selected hook size
-observe.content.action.hookSize.save.tip=Save modification of type de hameçon
-observe.content.action.hookType.create.tip=Create a new hook type
-observe.content.action.hookType.delete.tip=Delete selected hook type
-observe.content.action.hookType.detail.tip=View details of selected hook type
-observe.content.action.hookType.modify.tip=Modify selected hook type
-observe.content.action.hookType.save.tip=Save modification of hook type
-observe.content.action.itemHorizontalPosition.create.tip=Create a new item horizontal position
-observe.content.action.itemHorizontalPosition.delete.tip=Delete item horizontal position
-observe.content.action.itemHorizontalPosition.detail.tip=View details of selected item horizontal position
-observe.content.action.itemHorizontalPosition.modify.tip=Modify selected item horizontal position
-observe.content.action.itemHorizontalPosition.save.tip=Save modification of item horizontal position
-observe.content.action.itemVerticalPosition.create.tip=Create a new item vertical position
-observe.content.action.itemVerticalPosition.delete.tip=Delete item vertical position
-observe.content.action.itemVerticalPosition.detail.tip=View details of selected item vertical position
-observe.content.action.itemVerticalPosition.modify.tip=Modify selected item vertical position
-observe.content.action.itemVerticalPosition.save.tip=Save modification of item vertical position
-observe.content.action.lengthWeightParameter.create.tip=Create a new length weight parameter
-observe.content.action.lengthWeightParameter.delete.tip=Delete selected length weight parameter
-observe.content.action.lengthWeightParameter.detail.tip=View details of selected length weight parameter
-observe.content.action.lengthWeightParameter.modify.tip=Modify selected length weight parameter
-observe.content.action.lengthWeightParameter.save.tip=Save modification of length weight parameter
-observe.content.action.lightsticksColor.create.tip=Create a new lightsticks color
-observe.content.action.lightsticksColor.delete.tip=Delete lightsticks colore
-observe.content.action.lightsticksColor.detail.tip=View details of selected lightsticks color
-observe.content.action.lightsticksColor.modify.tip=Modify selected lightsticks colore
-observe.content.action.lightsticksColor.save.tip=Save modification of lightsticks color
-observe.content.action.lightsticksType.create.tip=Create a new lightsticks type
-observe.content.action.lightsticksType.delete.tip=Delete selected lightsticks type
-observe.content.action.lightsticksType.detail.tip=View details of selected lightsticks type
-observe.content.action.lightsticksType.modify.tip=Modify selected lightsticks type
-observe.content.action.lightsticksType.save.tip=Save modification of lightsticks type
-observe.content.action.lineType.create.tip=Create a new line type
-observe.content.action.lineType.delete.tip=Delete selected line type
-observe.content.action.lineType.detail.tip=View details of selected line type
-observe.content.action.lineType.modify.tip=Modify selected line type
-observe.content.action.lineType.save.tip=Save modification of line type
-observe.content.action.maturityStatus.create.tip=Create a new maturity status
-observe.content.action.maturityStatus.delete.tip=Delete selected maturity status
-observe.content.action.maturityStatus.detail.tip=View details of selected la maturity status
-observe.content.action.maturityStatus.modify.tip=Modify selected maturity status
-observe.content.action.maturityStatus.save.tip=Save modification of la maturity status
-observe.content.action.mitigationType.create.tip=Create a new mitigation type
-observe.content.action.mitigationType.delete.tip=Delete selected mitigation type
-observe.content.action.mitigationType.detail.tip=View details of selected mitigation type
-observe.content.action.mitigationType.modify.tip=Modify selected mitigation type
-observe.content.action.mitigationType.save.tip=Save modification of mitigation type
 observe.content.action.move.activities.longline=Change trip
 observe.content.action.move.activities.longline.tip=Change trip of activities
 observe.content.action.move.activities.seine=Change route
@@ -727,63 +607,8 @@ observe.content.action.move.routes=Change trip
 observe.content.action.move.routes.tip=Change trip of routes
 observe.content.action.move.trips=Change program
 observe.content.action.move.trips.tip=Change program of trips
-observe.content.action.objectFate.create.tip=Create a new object fate
-observe.content.action.objectFate.delete.tip=Delete selected object fate
-observe.content.action.objectFate.detail.tip=View details of selected object fate
-observe.content.action.objectFate.modify.tip=Modify selected object fate
-observe.content.action.objectFate.save.tip=Save modification of object fate
-observe.content.action.objectOperation.create.tip=Create a new object operation
-observe.content.action.objectOperation.delete.tip=Delete selected object operation
-observe.content.action.objectOperation.detail.tip=View details of selected object operation
-observe.content.action.objectOperation.modify.tip=Modify selected object operatione
-observe.content.action.objectOperation.save.tip=Save modification of object operation
-observe.content.action.objectType.create.tip=Create a new object type
-observe.content.action.objectType.delete.tip=Delete selected object type
-observe.content.action.objectType.detail.tip=View details of selected object type
-observe.content.action.objectType.modify.tip=Modify selected object type
-observe.content.action.objectType.save.tip=Save modification of object type
-observe.content.action.observedSystem.create.tip=Create a new observed system
-observe.content.action.observedSystem.delete.tip=Delete selected observed system
-observe.content.action.observedSystem.detail.tip=View details of selected observed system
-observe.content.action.observedSystem.modify.tip=Modify selected observed system
-observe.content.action.observedSystem.save.tip=Save modification of observed system
-observe.content.action.ocean.create.tip=Create a new ocean
-observe.content.action.ocean.delete.tip=Delete selected ocean
-observe.content.action.ocean.detail.tip=View details of selected ocean
-observe.content.action.ocean.modify.tip=Modify selected ocean
-observe.content.action.ocean.save.tip=Sauver les modifications sur l'ocean
 observe.content.action.openLink.formsUrl.tip=View forms in a web browser
 observe.content.action.openLink.reportsUrl.tip=View repports in a web browser
-observe.content.action.organism.create.tip=Create a new organism
-observe.content.action.organism.delete.tip=Delete selected organism
-observe.content.action.organism.detail.tip=View details of selected organism
-observe.content.action.organism.modify.tip=Modify selected organism
-observe.content.action.organism.save.tip=Save modification of organism
-observe.content.action.person.create.tip=Create a new nouvelle person
-observe.content.action.person.delete.tip=Delete person
-observe.content.action.person.detail.tip=View details of selected la person
-observe.content.action.person.modify.tip=Modify selected person
-observe.content.action.person.save.tip=Sauver les modifications sur la person
-observe.content.action.program.create.tip=Create a new program
-observe.content.action.program.delete.tip=Delete selected program
-observe.content.action.program.detail.tip=View details of selected program
-observe.content.action.program.modify.tip=Modify selected program
-observe.content.action.program.save.tip=Save modification of program
-observe.content.action.reasonForDiscard.create.tip=Create a new reason for discard
-observe.content.action.reasonForDiscard.delete.tip=Delete reason for discard
-observe.content.action.reasonForDiscard.detail.tip=voir les détail de reason for discard
-observe.content.action.reasonForDiscard.modify.tip=Modify selected reason for discard
-observe.content.action.reasonForDiscard.save.tip=Save modification of reason for discard
-observe.content.action.reasonForNoFishing.create.tip=Create a new reason for no fishing
-observe.content.action.reasonForNoFishing.delete.tip=Delete reason for no fishing
-observe.content.action.reasonForNoFishing.detail.tip=View details of selected reason for no fishing
-observe.content.action.reasonForNoFishing.modify.tip=Modify selected reason for no fishinge
-observe.content.action.reasonForNoFishing.save.tip=Save modification of reason for no fishing
-observe.content.action.reasonForNullSet.create.tip=Create a new reason for null set
-observe.content.action.reasonForNullSet.delete.tip=Delete reason for null set
-observe.content.action.reasonForNullSet.detail.tip=View details of selected la reason for null set
-observe.content.action.reasonForNullSet.modify.tip=Modify selected reason for null set
-observe.content.action.reasonForNullSet.save.tip=Save modification of reason for null set
 observe.content.action.reopen=Re-open
 observe.content.action.reopen.activity.tip=Reopen activity
 observe.content.action.reopen.maree.tip=Reopen trip
@@ -806,127 +631,8 @@ observe.content.action.reset.reportsUrl.tip=Reset reports url
 observe.content.action.reset.supportVesselName.tip=Reset
 observe.content.action.reset.tip=Cancel modifications
 observe.content.action.reset.well.tip=Reset
-observe.content.action.sensorBrand.create.tip=Create a new sensor brand
-observe.content.action.sensorBrand.delete.tip=Delete sensor brand
-observe.content.action.sensorBrand.detail.tip=View details of selected sensor brand
-observe.content.action.sensorBrand.modify.tip=Modify selected sensor brand
-observe.content.action.sensorBrand.save.tip=Save modification of sensor brand
-observe.content.action.sensorDataFormat.create.tip=Create a new sensor data format
-observe.content.action.sensorDataFormat.delete.tip=Delete selected sensor data format
-observe.content.action.sensorDataFormat.detail.tip=View details of selected sensor data format
-observe.content.action.sensorDataFormat.modify.tip=Modify selected sensor data format
-observe.content.action.sensorDataFormat.save.tip=Save modification of sensor data format
-observe.content.action.sensorType.create.tip=Create a new sensor type
-observe.content.action.sensorType.delete.tip=Delete selected sensor type
-observe.content.action.sensorType.detail.tip=View details of selected sensor type
-observe.content.action.sensorType.modify.tip=Modify selected sensor type
-observe.content.action.sensorType.save.tip=Save modification of sensor type
-observe.content.action.settingShape.create.tip=Create a new setting shape
-observe.content.action.settingShape.delete.tip=Delete setting shapee
-observe.content.action.settingShape.detail.tip=View details of selected setting shape
-observe.content.action.settingShape.modify.tip=Modify selected setting shapee
-observe.content.action.settingShape.save.tip=Save modification of setting shape
-observe.content.action.sex.create.tip=Create a new sex
-observe.content.action.sex.delete.tip=Delete selected sex
-observe.content.action.sex.detail.tip=View details of selected sex
-observe.content.action.sex.modify.tip=Modify selected sex
-observe.content.action.sex.save.tip=Save modification of sex
-observe.content.action.sizeMeasureType.create.tip=Create a new size measure type
-observe.content.action.sizeMeasureType.delete.tip=Delete selected size measure type
-observe.content.action.sizeMeasureType.detail.tip=View details of selected size measure type
-observe.content.action.sizeMeasureType.modify.tip=Modify selected size measure type
-observe.content.action.sizeMeasureType.save.tip=Save modification of size measure type
-observe.content.action.species.create.tip=Create a new species
-observe.content.action.species.delete.tip=Delete species
-observe.content.action.species.detail.tip=View details of selected species
-observe.content.action.species.modify.tip=Modify selected species
-observe.content.action.species.save.tip=Save modification of species
-observe.content.action.speciesFate.create.tip=Create a new species fate
-observe.content.action.speciesFate.delete.tip=Delete selected species fate
-observe.content.action.speciesFate.detail.tip=View details of selected species fate
-observe.content.action.speciesFate.modify.tip=Modify selected species fate
-observe.content.action.speciesFate.save.tip=Save modification of species fate
-observe.content.action.speciesGroupSpecies.create.tip=Create a new species group
-observe.content.action.speciesGroupSpecies.delete.tip=Delete selected species group
-observe.content.action.speciesGroupSpecies.detail.tip=View details of selected species group
-observe.content.action.speciesGroupSpecies.modify.tip=Modify selected species group
-observe.content.action.speciesGroupSpecies.save.tip=Save modification of species group
-observe.content.action.speciesList.create.tip=Create a new species list
-observe.content.action.speciesList.delete.tip=Delete species list
-observe.content.action.speciesList.detail.tip=View details of selected la species list
-observe.content.action.speciesList.modify.tip=Modify selected species list
-observe.content.action.speciesStatus.create.tip=Create a new species status
-observe.content.action.speciesStatus.delete.tip=Delete selected species status
-observe.content.action.speciesStatus.detail.tip=View details of selected species status
-observe.content.action.speciesStatus.modify.tip=Modify selected species status
-observe.content.action.speciesStatus.save.tip=Save modification of species status
-observe.content.action.stomacFullness.create.tip=Create a new stomac fullness
-observe.content.action.stomacFullness.delete.tip=Delete selected stomac fullness
-observe.content.action.stomacFullness.detail.tip=View details of selected stomac fullness
-observe.content.action.stomacFullness.modify.tip=Modify selected stomac fullness
-observe.content.action.stomacFullness.save.tip=Save modification of stomac fullness
-observe.content.action.surroundingActivity.create.tip=Create a new surrounding activity
-observe.content.action.surroundingActivity.delete.tip=Delete surrounding activity
-observe.content.action.surroundingActivity.detail.tip=View details of selected surrounding activity
-observe.content.action.surroundingActivity.modify.tip=Modify selected surrounding activity
-observe.content.action.surroundingActivity.save.tip=Save modification of l'activité environnante
-observe.content.action.transmittingBuoyOperation.create.tip=Create a new transmitting buoy
-observe.content.action.transmittingBuoyOperation.delete.tip=Delete transmitting buoy
-observe.content.action.transmittingBuoyOperation.detail.tip=View details of selected transmitting buoy
-observe.content.action.transmittingBuoyOperation.modify.tip=Modifier transmitting buoy
-observe.content.action.transmittingBuoyOperation.save.tip=Save modification of transmitting buoy
-observe.content.action.transmittingBuoyType.create.tip=Create a new transmitting buoy type
-observe.content.action.transmittingBuoyType.delete.tip=Delete selected transmitting buoy type
-observe.content.action.transmittingBuoyType.detail.tip=View details of selected transmitting buoy type
-observe.content.action.transmittingBuoyType.modify.tip=Modify selected transmitting buoy type
-observe.content.action.transmittingBuoyType.save.tip=Save modification of transmitting buoy type
 observe.content.action.trip=Create a new trip
 observe.content.action.trip.tip=Create a new trip
-observe.content.action.tripType.create.tip=Create a new trip type
-observe.content.action.tripType.delete.tip=Delete selected trip type
-observe.content.action.tripType.detail.tip=View details of selected trip type
-observe.content.action.tripType.modify.tip=Modify selected trip type
-observe.content.action.tripType.save.tip=Save modification of trip type
-observe.content.action.vessel.create.tip=Create a new vessel
-observe.content.action.vessel.delete.tip=Delete selected vessel
-observe.content.action.vessel.detail.tip=View details of selected vessel
-observe.content.action.vessel.modify.tip=Modify selected vessel
-observe.content.action.vessel.save.tip=Save modification of vessel
-observe.content.action.vesselActivityLongline.create.tip=Create a new vessel activity
-observe.content.action.vesselActivityLongline.delete.tip=Delete selected vessel activity
-observe.content.action.vesselActivityLongline.detail.tip=View details of selected vessel activity
-observe.content.action.vesselActivityLongline.modify.tip=Modify selected vessel activity
-observe.content.action.vesselActivityLongline.save.tip=Save modification of vessel activity
-observe.content.action.vesselActivitySeine.create.tip=Create a new vessel activity
-observe.content.action.vesselActivitySeine.delete.tip=Delete selected vessel activity
-observe.content.action.vesselActivitySeine.detail.tip=View details of selected vessel activity
-observe.content.action.vesselActivitySeine.modify.tip=Modifier vessel activity
-observe.content.action.vesselActivitySeine.save.tip=Save modification of vessel activity
-observe.content.action.vesselSizeCategory.create.tip=Create a new vessel size category
-observe.content.action.vesselSizeCategory.delete.tip=Delete selected vessel size category
-observe.content.action.vesselSizeCategory.detail.tip=View details of selected vessel size category
-observe.content.action.vesselSizeCategory.modify.tip=Modify selected vessel size category
-observe.content.action.vesselSizeCategory.save.tip=Save modification of vessel size category
-observe.content.action.vesselType.create.tip=Create a new vessel type
-observe.content.action.vesselType.delete.tip=Delete selected vessel type
-observe.content.action.vesselType.detail.tip=View details of selected vessel type
-observe.content.action.vesselType.modify.tip=Modify selected vessel type
-observe.content.action.vesselType.save.tip=Save modification of vessel type
-observe.content.action.weightCategory.create.tip=Create a new weight category
-observe.content.action.weightCategory.delete.tip=Delete selected weight category
-observe.content.action.weightCategory.detail.tip=View details of selected weight category
-observe.content.action.weightCategory.modify.tip=Modifier weight category
-observe.content.action.weightCategory.save.tip=Save modification of weight category
-observe.content.action.weightMeasureType.create.tip=Create a new weight measure type
-observe.content.action.weightMeasureType.delete.tip=Delete selected weight measure type
-observe.content.action.weightMeasureType.detail.tip=View details of selected weight measure type
-observe.content.action.weightMeasureType.modify.tip=Modify selected weight measure type
-observe.content.action.weightMeasureType.save.tip=Save modification of weight measure type
-observe.content.action.wind.create.tip=Create a new wind
-observe.content.action.wind.delete.tip=Delete selected wind
-observe.content.action.wind.detail.tip=View details of selected wind
-observe.content.action.wind.modify.tip=Modify selected wind
-observe.content.action.wind.save.tip=Save modification of wind
 observe.content.baitsComposition.action.create=Insert this bait
 observe.content.baitsComposition.action.create.tip=Insert this bait
 observe.content.baitsComposition.baitSettingStatus=Bait setting status
@@ -1185,65 +891,6 @@ observe.content.label.usage.referentiel.title=Referentiel '%1$s' (%2$d occurrenc
 observe.content.label.weightLengthFormula.info=Weight length formula permits to compute length from the weight, must contains variable P
 observe.content.lengthWeightParameter.tab.general=General caracteristics
 observe.content.lengthWeightParameter.tab.other=Other caracteristics
-observe.content.list.HookSize=List of known hook sizes
-observe.content.list.HookType=List of known hook types
-observe.content.list.baitHaulingStatus=List of known bait hauling status
-observe.content.list.baitSettingStatus=List of known bait setting status
-observe.content.list.baitType=List of known bait type
-observe.content.list.catchFateLongline=List of known catch fates
-observe.content.list.country=List of known countries
-observe.content.list.detectionMode=List of known detection modes
-observe.content.list.encounterType=List of known encounter types
-observe.content.list.fpaZone=List of known fpa zones
-observe.content.list.gear=List of known gears
-observe.content.list.gearCaracteristic=List of known gear caracteristics
-observe.content.list.gearCaracteristicType=List of known gear caracteristic types
-observe.content.list.harbour=List of known harbours
-observe.content.list.healthness=List of known healthness
-observe.content.list.hookPosition=List of known hook positions
-observe.content.list.itemHorizontalPosition=List of known item horizontal positions
-observe.content.list.itemVerticalPosition=List of known item vertical positions
-observe.content.list.lengthWeightParameter=List of known length weight parameters
-observe.content.list.lightsticksColor=List of known lightsticks colors
-observe.content.list.lightsticksType=List of known lightsticks types
-observe.content.list.lineType=List of known lineTypes
-observe.content.list.maturityStatus=List of known maturity status
-observe.content.list.mitigationType=Listes des types mitigation types
-observe.content.list.objectFate=List of known object fates
-observe.content.list.objectOperation=List of known object operations
-observe.content.list.objectType=List of known object types
-observe.content.list.observedSystem=List of known observed systems
-observe.content.list.ocean=List of known oceans
-observe.content.list.operation=List of known operations
-observe.content.list.organism=List of known organisms
-observe.content.list.person=List of known persons
-observe.content.list.program=List of known programs
-observe.content.list.reasonForDiscard=List of known reasons for discard
-observe.content.list.reasonForNoFishing=List of known reasons for no fishing
-observe.content.list.reasonForNullSet=List of known reason for null set
-observe.content.list.sensorBrand=List of known sensor brands
-observe.content.list.sensorDataFormat=List of known sensor data formats
-observe.content.list.sensorType=List of known sensor types
-observe.content.list.settingShape=List of known setting shapes
-observe.content.list.sex=List of known sex
-observe.content.list.sizeMeasureType=List of known size measure types
-observe.content.list.speciesFate=List of known species fates
-observe.content.list.speciesFaune=List of known non target species
-observe.content.list.speciesGroupSpecies=List of known species group species
-observe.content.list.speciesList=List of known species lists
-observe.content.list.speciesStatus=List of known species status
-observe.content.list.stomacFullness=List of known stomac fullness
-observe.content.list.surroundingActivity=List of known surrounding activities
-observe.content.list.transmittingBuoyType=List of known transmitting buoy types
-observe.content.list.tripType=List of known tripTypes
-observe.content.list.vessel=List of known vessels
-observe.content.list.vesselActivityLongline=List of known longline vessel activities
-observe.content.list.vesselActivitySeine=List of known seine vessel activities
-observe.content.list.vesselSizeCategory=List of known vessel size categories
-observe.content.list.vesselType=List of known vessel types
-observe.content.list.weightCategory=List of known weight categories
-observe.content.list.weightMeasureType=List of known weight measure types
-observe.content.list.wind=List of known winds
 observe.content.longlineDetailComposition.action.deleteAllSections=Remove all
 observe.content.longlineDetailComposition.action.deleteAllSections.tip=Remove all sections - baskets - branchlines
 observe.content.longlineDetailComposition.action.deleteSelectedBasket=Delete basket
@@ -1595,65 +1242,6 @@ observe.content.tdr.table.sensorBrand.tip=Brand
 observe.content.tdr.table.serialNo=Serial no
 observe.content.tdr.table.serialNo.tip=Serial no
 observe.content.tdr.title=Depth recorders
-observe.content.title.HookSizes=Management of Hook size
-observe.content.title.HookTypes=Management of Hook type
-observe.content.title.baitHaulingStatuss=Management of bait hauling status
-observe.content.title.baitSettingStatuss=Management of bait setting status
-observe.content.title.baitTypes=Management of bait type
-observe.content.title.catchFateLonglines=Management of longline catch fate
-observe.content.title.country=Management of country
-observe.content.title.detectionModes=Management of detection mode
-observe.content.title.encounterTypes=Management of encounter type
-observe.content.title.fpaZones=Management of Fpa zone
-observe.content.title.gearCaracteristicTypes=Management of gear caracteristic type
-observe.content.title.gearCaracteristics=Management of gear caracteristic
-observe.content.title.gears=Management of gear
-observe.content.title.harbours=Management of harbour
-observe.content.title.healthnesss=Management of healthness
-observe.content.title.hookPositions=Management of hook position
-observe.content.title.itemHorizontalPositions=Management of item horizontal position
-observe.content.title.itemVerticalPositions=Management of item vertical position
-observe.content.title.lengthWeightParameters=Management of length weight parameter
-observe.content.title.lightsticksColors=Management of lightsticks color
-observe.content.title.lightsticksTypes=Management of lightsticks type
-observe.content.title.lineTypes=Management of line type
-observe.content.title.maturityStatuss=Management of maturity status
-observe.content.title.mitigationTypes=Management of mitigation type
-observe.content.title.objectFates=Management of object fate
-observe.content.title.objectOperations=Management of object operation
-observe.content.title.objectTypes=Management of object type
-observe.content.title.observedSystems=Management of observed system
-observe.content.title.oceans=Management of ocean
-observe.content.title.organisms=Management of organism
-observe.content.title.persons=Management of person
-observe.content.title.programs=Management of program
-observe.content.title.reasonForDiscards=Management of reason for discard
-observe.content.title.reasonForNoFishings=Management of reason for no fishing
-observe.content.title.reasonForNullSets=Management of reason for null set
-observe.content.title.sensorBrands=Management of sensor brand
-observe.content.title.sensorDataFormats=Management of sensor data format
-observe.content.title.sensorTypes=Management of sensor type
-observe.content.title.settingShapes=Management of setting shape
-observe.content.title.sexx=Management of sex
-observe.content.title.sizeMeasureTypes=Management of size measure type
-observe.content.title.speciesFates=Management of species fate
-observe.content.title.speciesGroupSpeciess=Management of species group species
-observe.content.title.speciesLists=Management of species list
-observe.content.title.speciesStatuss=Management of species status
-observe.content.title.speciess=Management of species
-observe.content.title.stomacFullnesss=Management of stomac fullness
-observe.content.title.surroundingActivitys=Management of surrounding activity
-observe.content.title.transmittingBuoyOperations=Management of transmitting buoy operation
-observe.content.title.transmittingBuoyTypes=Management of transmitting buoy type
-observe.content.title.tripTypes=Management of trip type
-observe.content.title.vesselActivityLonglines=Management of longline vessel activity
-observe.content.title.vesselActivitySeines=Management of seine vessel activity
-observe.content.title.vesselSizeCategoryx=Management of vessel size category
-observe.content.title.vesselTypex=Management of vessel type
-observe.content.title.vesselx=Management of vessel
-observe.content.title.weightCategory=Management of weight category
-observe.content.title.weightMeasureTypes=Management of weight measure type
-observe.content.title.windSpeeds=Management of wind speed
 observe.content.tripLongline.captain=Capitain
 observe.content.tripLongline.dataEntryOperator=Data entry operator
 observe.content.tripLongline.endDate=End date
@@ -2086,98 +1674,24 @@ observe.tree.action.collapseAll.tip=Collapse all
 observe.tree.action.expandAll.tip=Expand all
 observe.tree.action.selectAll.tip=Select All
 observe.tree.action.unselectAll.tip=Unselect All
-observe.tree.activityLongline=Activity
-observe.tree.activityLongline.unsaved=New activity
-observe.tree.activitySeine=Activity
-observe.tree.activitySeine.unsaved=New activity
-observe.tree.baitHaulingStatus=Bait hauling status
-observe.tree.baitSettingStatus=Bait setting status
-observe.tree.baitType=Bait type
-observe.tree.catchFateLongline=Catch fate
-observe.tree.catchLongline=Catches
-observe.tree.country=Country
-observe.tree.detectionMode=Detection mode
-observe.tree.encounter=Encounter
-observe.tree.encounterType=Encounter type
-observe.tree.floatingObject.unsaved=New DCP
-observe.tree.fpaZone=Fpa zone
-observe.tree.gear=Gear
-observe.tree.gearCaracteristic=Gear caracteristic
-observe.tree.gearCaracteristicType=Gear caracteristic type
-observe.tree.gearUseFeaturesLongline=Gear use features
-observe.tree.gearUseFeaturesSeine=Gear use features
-observe.tree.harbour=Harbour
-observe.tree.healthness=Healthness
-observe.tree.hookPosition=Hook position
-observe.tree.hookSize=Hook size
-observe.tree.hookType=Hook type
-observe.tree.itemHorizontalPosition=Item horizontal position
-observe.tree.itemVerticalPosition=Item vertical position
-observe.tree.lengthWeightParameter=Length-weight relationship
-observe.tree.lightsticksColor=Lightsticks color
-observe.tree.lightsticksType=Lightsticks type
-observe.tree.lineType=Line type
-observe.tree.longlineDetailComposition=Detailed composition
-observe.tree.longlineGlobalComposition=Global composition
-observe.tree.maturityStatus=Maturity status
-observe.tree.mitigationType=Mitigation type
-observe.tree.nonTargetCatch=Non target catch
-observe.tree.nonTargetSample=Non target sample
-observe.tree.objectFate=ObjectFate
-observe.tree.objectObservedSpecies=Object observed species
-observe.tree.objectOperation=Object operation
-observe.tree.objectSchoolEstimate=Object school estimate
-observe.tree.objectType=Object type
-observe.tree.observedSystem=Observed system
-observe.tree.ocean=Ocean
-observe.tree.organism=Organisme
-observe.tree.person=Person
-observe.tree.program=Program
-observe.tree.reasonForDiscard=Reason for discard
-observe.tree.reasonForNoFishing=Reason for no fishing
-observe.tree.reasonForNullSet=Reason for null set
-observe.tree.reference.common=Common Referential
-observe.tree.reference.longline=Longline Referential
-observe.tree.reference.seine=Seine Referential
-observe.tree.route=Road
-observe.tree.route.unsaved=New route
-observe.tree.schoolEstimate=School estimate
-observe.tree.sensorBrand=Sensor brand
-observe.tree.sensorDataFormat=Sensor data format
-observe.tree.sensorType=Sensor type
-observe.tree.sensorUsed=Sensor used
-observe.tree.setLongline=Set
-observe.tree.setLongline.unsaved=New fishing operation
-observe.tree.setSeine=Fishing operation
-observe.tree.setSeine.unsaved=New set
-observe.tree.settingShape=Setting shape
-observe.tree.sex=Sex
-observe.tree.sizeMeasureType=Size measure type
-observe.tree.species=Species
-observe.tree.speciesFate=Species fate
-observe.tree.speciesGroup=Species group
-observe.tree.speciesList=Species list
-observe.tree.speciesStatus=Species status
-observe.tree.stomacFullness=Stomac fullness
-observe.tree.surroundingActivity=Surrounding activity
-observe.tree.targetCatch=Target catch
-observe.tree.targetDiscarded=Target discarded
-observe.tree.targetSample=Target sample
-observe.tree.targetSampleCapture=Target sample capture
-observe.tree.tdr=TDR
-observe.tree.transmittingBuoyOperation=Transmitting buoy operation
-observe.tree.transmittingBuoyType=Transmitting buoy type
-observe.tree.tripLongline.unsaved=New trip
-observe.tree.tripSeine.unsaved=New trip
-observe.tree.tripType=Trip type
-observe.tree.vessel=Boat
-observe.tree.vesselActivityLongline=Boat activity
-observe.tree.vesselActivitySeine=Boat Activity
-observe.tree.vesselSizeCategory=Boat size category
-observe.tree.vesselType=Boat type
-observe.tree.weightCategory=Weight category
-observe.tree.weightMeasureType=Weight measure type
-observe.tree.wind=Wind
+observe.type.action.create=Create a new %s
+observe.type.action.delete=Delete selected %s
+observe.type.action.edit=Edit selected %s
+observe.type.action.save=Save %s
+observe.type.action.view=View selected %s
+observe.type.activityLongline.unsaved=New activity
+observe.type.activitySeine.unsaved=New activity
+observe.type.floatingObject.unsaved=New DCP
+observe.type.list=List of %s
+observe.type.management=Management of %s
+observe.type.reference.common=Common Referential
+observe.type.reference.longline=Longline Referential
+observe.type.reference.seine=Seine Referential
+observe.type.route.unsaved=New route
+observe.type.setLongline.unsaved=New fishing operation
+observe.type.setSeine.unsaved=New set
+observe.type.tripLongline.unsaved=New trip
+observe.type.tripSeine.unsaved=New trip
 observe.validator.field.tip=Property '%1$s'
 observe.validator.message.tip=Message\: %1$s
 observe.validator.scope.tip=Message type\: '%1$s'
diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties
index 4d56c98..f848029 100644
--- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties
+++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties
@@ -541,26 +541,6 @@ observe.config.category.synchro=Acciones sobre la base
 observe.config.category.synchro.description=Configuración de acciones sobre la base
 observe.content.action.activity=Crear una nueva actividad
 observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual
-observe.content.action.baitHaulingStatus.create.tip=Crear un nuevo estatuto del cebo en el arrastre
-observe.content.action.baitHaulingStatus.delete.tip=Eleminar el estatuto del cebo en el arrastre seleccionado
-observe.content.action.baitHaulingStatus.detail.tip=Ver los detalles del estatuto del cebo en el arrastre seleccionado
-observe.content.action.baitHaulingStatus.modify.tip=Modificar el estatuto del cebo en el arrastre seleccionado
-observe.content.action.baitHaulingStatus.save.tip=Guardar las modificaciones del estatuto del cebo en el arrastre
-observe.content.action.baitSettingStatus.create.tip=Crear un nuevo estatuto del cebo en la calada
-observe.content.action.baitSettingStatus.delete.tip=Eliminar el estatuto del cebo en la calada seleccionada
-observe.content.action.baitSettingStatus.detail.tip=Ver los detalles del estatuto en la calada seleccionada
-observe.content.action.baitSettingStatus.modify.tip=Modifica el estatuto en la calada seleccionada
-observe.content.action.baitSettingStatus.save.tip=Guardar las modificaciones del estatuto en la calada seleccionada
-observe.content.action.baitType.create.tip=Crear un nuevo tipo de cebo
-observe.content.action.baitType.delete.tip=Eliminar el tipo de cebo seleccionado
-observe.content.action.baitType.detail.tip=Ver los detalles del tipo de cebo seleccionado
-observe.content.action.baitType.modify.tip=Modificar el tipo de cebo seleccionado
-observe.content.action.baitType.save.tip=Guardar las modificaciones sober el tipo de cebo
-observe.content.action.catchFateLongline.create.tip=Crear un nuevo devenir de captura
-observe.content.action.catchFateLongline.delete.tip=Eliminar el devenir de captura seleccionado
-observe.content.action.catchFateLongline.detail.tip=Ver los detalles del devenir de captura seleccionado
-observe.content.action.catchFateLongline.modify.tip=Modificar el devenir de captura seleccionado
-observe.content.action.catchFateLongline.save.tip=Guardar los modificationes del devenir de captura
 observe.content.action.closeAndCreate=Cerrar y crear
 observe.content.action.closeAndCreate.activity=Actividad siguiente
 observe.content.action.closeAndCreate.activity.tip=Cierre de la actividad actual y creación de una nueva
@@ -569,11 +549,6 @@ observe.content.action.closeAndCreate.maree.tip=Cierre de la marea actual y crea
 observe.content.action.closeAndCreate.route=Ruta siguiente
 observe.content.action.closeAndCreate.route.tip=Cierre de la ruta actual y creación de una nueva
 observe.content.action.closeAndCreate.tip=Cierre el elemento activo y crear un nuevo
-observe.content.action.country.create.tip=Crear un nuevo país
-observe.content.action.country.delete.tip=Eliminar el país seleccionado
-observe.content.action.country.detail.tip=Ver los detailles del país seleccionado
-observe.content.action.country.modify.tip=Modificar el país seleccionado
-observe.content.action.country.save.tip=Guardar las modificaiones sobre el país
 observe.content.action.create.entry.tip=Crear una nueva entrada
 observe.content.action.create.gearUseFeaturesSeine=Crear un equipo
 observe.content.action.create.gearUseFeaturesSeine.tip=Crear un nuevo equipo
@@ -595,36 +570,6 @@ observe.content.action.create.targetSample=Insertar muestreo
 observe.content.action.create.targetSample.tip=Insertar muestreo de atún descartado
 observe.content.action.create.targetSampleCapture=Insertar muestreo
 observe.content.action.create.targetSampleCapture.tip=Insertar muestreo de atún capturado
-observe.content.action.detectionMode.create.tip=Crear un nuevo modo de detección
-observe.content.action.detectionMode.delete.tip=Eliminar el modo de detección seleccionado
-observe.content.action.detectionMode.detail.tip=Ver los detalles del modo de detección seleccionado
-observe.content.action.detectionMode.modify.tip=Modificar el modo de detección seleccionado
-observe.content.action.detectionMode.save.tip=Guardar las modificaciones del modo de detección
-observe.content.action.encounterType.create.tip=Crear un nuevo tipo de encuentro
-observe.content.action.encounterType.delete.tip=Eliminar el tipo de encuentro seleccionado
-observe.content.action.encounterType.detail.tip=Ver los detalles del tipo de encuentro seleccionado
-observe.content.action.encounterType.modify.tip=Modificar el tipo de encuentro seleccionado
-observe.content.action.encounterType.save.tip=Guardar las modificaciones del tipo de encuentro
-observe.content.action.fpaZone.create.tip=Crear una nueva zona FPA
-observe.content.action.fpaZone.delete.tip=Eliminar la zona FPA seleccionada
-observe.content.action.fpaZone.detail.tip=Ver los detalles de la zona FPA seleccionada
-observe.content.action.fpaZone.modify.tip=Modificar la zona FPA seleccionada
-observe.content.action.fpaZone.save.tip=Guardar las modificaciones de la zona FPA
-observe.content.action.gear.create.tip=Crear un nuevo equipo
-observe.content.action.gear.delete.tip=Eliminar el equipo seleccionado
-observe.content.action.gear.detail.tip=Ver los detalles del equipo seleccionado
-observe.content.action.gear.modify.tip=Modificar el equipo seleccionado
-observe.content.action.gear.save.tip=Guardar las modificaciones del equipo
-observe.content.action.gearCaracteristic.create.tip=Crear une nueva característica
-observe.content.action.gearCaracteristic.delete.tip=Eliminar la característica seleccionada
-observe.content.action.gearCaracteristic.detail.tip=Ver los detalles de la característica seleccionada
-observe.content.action.gearCaracteristic.modify.tip=Modificar la característica seleccionada
-observe.content.action.gearCaracteristic.save.tip=Guardar las modificaciones de la característica
-observe.content.action.gearCaracteristicType.create.tip=Crear un nuevo tipo de característica
-observe.content.action.gearCaracteristicType.delete.tip=Eliminar el tipo de característica seleccionado
-observe.content.action.gearCaracteristicType.detail.tip=Ver los detalles del tipo de característica seleccionado
-observe.content.action.gearCaracteristicType.modify.tip=Modificar el tipo de característica seleccionado
-observe.content.action.gearCaracteristicType.save.tip=Guardar las modificaciones del tipo de característica
 observe.content.action.gearUseFeaturesLongline=Crear un équipement
 observe.content.action.gearUseFeaturesLongline.tip=Crear un nouvel équipement
 observe.content.action.goto.open.activity=Acceder a la actividad abierta
@@ -654,71 +599,6 @@ observe.content.action.goto.selected.maree=Acceder a la marea
 observe.content.action.goto.selected.maree.tip=Acceder a la marea seleccionada
 observe.content.action.goto.selected.route=Acceder a la ruta
 observe.content.action.goto.selected.route.tip=Acceder a la ruta seleccionada
-observe.content.action.harbour.create.tip=Crear un nuevo puerto
-observe.content.action.harbour.delete.tip=Eliminar el puerto seleccionado
-observe.content.action.harbour.detail.tip=Ver los detalles del puerto seleccionado
-observe.content.action.harbour.modify.tip=Modificar el puerto seleccionado
-observe.content.action.harbour.save.tip=Guardar las modificaciones del puerto
-observe.content.action.healthness.create.tip=Crear un nuevo estatuto de salud
-observe.content.action.healthness.delete.tip=Eliminar el estatuto de salud seleccionado
-observe.content.action.healthness.detail.tip=Ver los detalles del estatuto de salud seleccionado
-observe.content.action.healthness.modify.tip=Modificar el estatuto de salud seleccionado
-observe.content.action.healthness.save.tip=Guardar las modificaciones del estatuto de salud
-observe.content.action.hookPosition.create.tip=Crear una nueva posición de anzuelo
-observe.content.action.hookPosition.delete.tip=Eliminar la posición de anzuelo seleccionada
-observe.content.action.hookPosition.detail.tip=Ver los detalles de la posición de anzuelo seleccionada
-observe.content.action.hookPosition.modify.tip=Modificar la posición de anzuelo seleccionada
-observe.content.action.hookPosition.save.tip=Guardar las modificaciones de la posición de anzuelo
-observe.content.action.hookSize.create.tip=Crear un nuevo tamaño de anzuelo
-observe.content.action.hookSize.delete.tip=Eliminar el tamaño de anzuelo seleccionado
-observe.content.action.hookSize.detail.tip=Ver los detalles del tamaño de anzuelo seleccionado
-observe.content.action.hookSize.modify.tip=Modificar el tamaño de anzuelo seleccionado
-observe.content.action.hookSize.save.tip=Guardar las modificaciones del tamaño de anzuelo
-observe.content.action.hookType.create.tip=Crear un nuevo tipo de anzuelo
-observe.content.action.hookType.delete.tip=Eliminar el tipo de anzuelo seleccionado
-observe.content.action.hookType.detail.tip=Ver los detalles del tipo de anzuelo seleccionado
-observe.content.action.hookType.modify.tip=Modificar el tipo de anzuelo seleccionado
-observe.content.action.hookType.save.tip=Guardar las modificaciones del tipo de anzuelo
-observe.content.action.itemHorizontalPosition.create.tip=Crear una nueva localización del elemento sobre la línea principal
-observe.content.action.itemHorizontalPosition.delete.tip=Eliminar la localización del elemento sobre la línea principal seleccionada
-observe.content.action.itemHorizontalPosition.detail.tip=Ver los detalles de la localización del elemento sobre la línea principal seleccionada
-observe.content.action.itemHorizontalPosition.modify.tip=Modificar la localización del elemento sobre la línea principal seleccionada
-observe.content.action.itemHorizontalPosition.save.tip=Guardar las modificaciones de la localización del elemento sobre la línea principal
-observe.content.action.itemVerticalPosition.create.tip=Crear una nueva localización del elemento sobre el arponcillo
-observe.content.action.itemVerticalPosition.delete.tip=Eliminar la localización del elemento sobre el arponcillo seleccionada
-observe.content.action.itemVerticalPosition.detail.tip=Ver los detalles de la localización del elemento sobre el arponcillo seleccionada
-observe.content.action.itemVerticalPosition.modify.tip=Modificar la localización del elemento sobre el arponcillo seleccionada
-observe.content.action.itemVerticalPosition.save.tip=Guardar las modificaciones de la localización del elemento sobre el arponcillo
-observe.content.action.lengthWeightParameter.create.tip=Crear un nuevo parámetro talla-peso
-observe.content.action.lengthWeightParameter.delete.tip=Eliminar el parámetro talla-peso seleccionado
-observe.content.action.lengthWeightParameter.detail.tip=Ver los detalles del parámetro talla-peso seleccionado
-observe.content.action.lengthWeightParameter.modify.tip=Modificar el parámetro talla-peso seleccionado
-observe.content.action.lengthWeightParameter.save.tip=Guardar las modificaciones del parámetro talla-peso
-observe.content.action.lightsticksColor.create.tip=Crear un nuevo color de barrita de luz
-observe.content.action.lightsticksColor.delete.tip=Eliminar el color de barrita de luz seleccionado
-observe.content.action.lightsticksColor.detail.tip=Ver los detalles del color de barrita de luz seleccionado
-observe.content.action.lightsticksColor.modify.tip=Modificar el color de barrita de luz seleccionado
-observe.content.action.lightsticksColor.save.tip=Guardar las modificaciones del color de barrita de luz
-observe.content.action.lightsticksType.create.tip=Crear un nuevo tipo de barrita de luz
-observe.content.action.lightsticksType.delete.tip=Eliminar el tipo de barrita de luz seleccionado
-observe.content.action.lightsticksType.detail.tip=Ver los detalles del tipo de barrita de luz seleccionado
-observe.content.action.lightsticksType.modify.tip=Modificar el tipo de barrita de luz seleccionado
-observe.content.action.lightsticksType.save.tip=Guardar las modificaciones del tipo de barrita de luz
-observe.content.action.lineType.create.tip=Crear un nuevo tipo de línea
-observe.content.action.lineType.delete.tip=Eliminar el tipo de línea seleccionado
-observe.content.action.lineType.detail.tip=Ver los detalles del tipo de línea seleccionado
-observe.content.action.lineType.modify.tip=Modificar el tipo de línea seleccionado
-observe.content.action.lineType.save.tip=Guardar las modificaciones del tipo de línea
-observe.content.action.maturityStatus.create.tip=Crear una nueva maturidad
-observe.content.action.maturityStatus.delete.tip=Eliminar la maturidad seleccionada
-observe.content.action.maturityStatus.detail.tip=Ver los detalles de la maturidad seleccionada
-observe.content.action.maturityStatus.modify.tip=Modificar la maturidad seleccionada
-observe.content.action.maturityStatus.save.tip=Guardar las modificaciones de la maturidad
-observe.content.action.mitigationType.create.tip=Crear un nuevo tipo de medida de atenuación
-observe.content.action.mitigationType.delete.tip=Eliminar el tipo de medida de atenuación seleccionado
-observe.content.action.mitigationType.detail.tip=Ver los detalles del tipo de medida de atenuación seleccionado
-observe.content.action.mitigationType.modify.tip=Modificar el tipo de medida de atenuación seleccionado
-observe.content.action.mitigationType.save.tip=Guardar las modificaciones del tipo de medida de atenuación seleccionado
 observe.content.action.move.activities.longline=Cambiar de marea
 observe.content.action.move.activities.longline.tip=Cambiar la marea de las actividades seleccionas
 observe.content.action.move.activities.seine=Cambiar de ruta
@@ -727,63 +607,8 @@ observe.content.action.move.routes=Cambiar de marea
 observe.content.action.move.routes.tip=Cambiar la marea de las rutas seleccionadas
 observe.content.action.move.trips=Cambiar de programa
 observe.content.action.move.trips.tip=Cambiar el programme de mareas seleccionadas
-observe.content.action.objectFate.create.tip=Crear un nuevo devenir objeto
-observe.content.action.objectFate.delete.tip=Eliminar el devenir objeto seleccionado
-observe.content.action.objectFate.detail.tip=Ver los detalles del devenir objeto seleccionado
-observe.content.action.objectFate.modify.tip=Modificar el devenir objeto seleccionado
-observe.content.action.objectFate.save.tip=Guardar las modificaciones del devenir objeto
-observe.content.action.objectOperation.create.tip=Crear una nueva operación objeto
-observe.content.action.objectOperation.delete.tip=Eliminar la operación objeto seleccionada
-observe.content.action.objectOperation.detail.tip=Ver los detalles de la operación objeto seleccionada
-observe.content.action.objectOperation.modify.tip=Modificar la operación objeto seleccionada
-observe.content.action.objectOperation.save.tip=Guardar las modificaciones de la operación objeto
-observe.content.action.objectType.create.tip=Crear un nuevo tipo de objeto
-observe.content.action.objectType.delete.tip=Eliminar el tipo de objeto seleccionado
-observe.content.action.objectType.detail.tip=Ver los detalles del tipo de objeto seleccionado
-observe.content.action.objectType.modify.tip=Modificar el tipo de objeto seleccionado
-observe.content.action.objectType.save.tip=Guardar las modificaciones del tipo de objeto seleccionado
-observe.content.action.observedSystem.create.tip=Crear un nuevo sistema observado
-observe.content.action.observedSystem.delete.tip=Eliminar el sistema observado seleccionado
-observe.content.action.observedSystem.detail.tip=Ver los detalles del sistema observado seleccionado
-observe.content.action.observedSystem.modify.tip=Modificar el sistema observado seleccionado
-observe.content.action.observedSystem.save.tip=Guardar las modificaciones del sistema observado
-observe.content.action.ocean.create.tip=Crear un nuevo oceano
-observe.content.action.ocean.delete.tip=Eliminar el oceano seleccionado
-observe.content.action.ocean.detail.tip=Ver los detalles sobre el oceano seleccionado
-observe.content.action.ocean.modify.tip=Modificar el oceano seleccionado
-observe.content.action.ocean.save.tip=Guardar las modificaciones sobre el oceano
 observe.content.action.openLink.formsUrl.tip=Acceder a los formularios en un navegador web
 observe.content.action.openLink.reportsUrl.tip=Accéder aux rapports dans un navigateur web
-observe.content.action.organism.create.tip=Crear un nuevo organismo
-observe.content.action.organism.delete.tip=Eliminar el organismo seleccionado
-observe.content.action.organism.detail.tip=Ver los detalles del organismo seleccionado
-observe.content.action.organism.modify.tip=Modificar el organismo seleccionado
-observe.content.action.organism.save.tip=Guardar las modificaciones del organismo seleccionado
-observe.content.action.person.create.tip=Crear una nueva persona
-observe.content.action.person.delete.tip=Eliminar la persona seleccionada
-observe.content.action.person.detail.tip=Ver los detalles de la persona seleccionada
-observe.content.action.person.modify.tip=Modificar la persona seleccionada
-observe.content.action.person.save.tip=Guardar las modificaciones sobre la persona
-observe.content.action.program.create.tip=Crear un nuevo programa
-observe.content.action.program.delete.tip=Eliminar el programa seleccionado
-observe.content.action.program.detail.tip=Ver los detalles del programa seleccionado
-observe.content.action.program.modify.tip=Modificar el programa seleccionado
-observe.content.action.program.save.tip=Guardar las modificaciones sobre el programa
-observe.content.action.reasonForDiscard.create.tip=Crear una nueva razón de rechazo
-observe.content.action.reasonForDiscard.delete.tip=Eliminar la razón de rechazo seleccionada
-observe.content.action.reasonForDiscard.detail.tip=Ver los detalles de la razón de rechazo seleccionada
-observe.content.action.reasonForDiscard.modify.tip=Modificar la razón de rechazo seleccionada
-observe.content.action.reasonForDiscard.save.tip=Guardar las modificaciones de la razón de rechazo
-observe.content.action.reasonForNoFishing.create.tip=Crear una nueva razón por no pescar en pesca al cerco
-observe.content.action.reasonForNoFishing.delete.tip=Eliminar la razón por no pescar en pesca al cerco seleccionada
-observe.content.action.reasonForNoFishing.detail.tip=Ver los detalles de la razón por no pescar en pesca al cerco seleccionada
-observe.content.action.reasonForNoFishing.modify.tip=Modificar la razón por no pescar en pesca al cerco seleccionada
-observe.content.action.reasonForNoFishing.save.tip=Guardar las modificaciones de la razón por no pescar en pesca al cerco
-observe.content.action.reasonForNullSet.create.tip=Crear una nueva razón de lance nulo
-observe.content.action.reasonForNullSet.delete.tip=Eliminar la razón de lance nulo seleccionada
-observe.content.action.reasonForNullSet.detail.tip=Ver los detalles de la razón de lance nulo seleccionada
-observe.content.action.reasonForNullSet.modify.tip=Modificar la razón de lance nulo seleccionada
-observe.content.action.reasonForNullSet.save.tip=Guardar las modificaciones de la razón de lance nulo
 observe.content.action.reopen=Reabrir
 observe.content.action.reopen.activity.tip=Reabrir la actividad
 observe.content.action.reopen.maree.tip=Reabrir la marea
@@ -806,127 +631,8 @@ observe.content.action.reset.reportsUrl.tip=Reiniciar la URL de los informes
 observe.content.action.reset.supportVesselName.tip=Reiniciar
 observe.content.action.reset.tip=Cancelar las modificaciones
 observe.content.action.reset.well.tip=Reiniciar
-observe.content.action.sensorBrand.create.tip=Crear una nueva marca de sensores
-observe.content.action.sensorBrand.delete.tip=Eliminar la marca de sensores seleccionada
-observe.content.action.sensorBrand.detail.tip=Ver los detalles de la marca de sensores seleccionada
-observe.content.action.sensorBrand.modify.tip=Modificar la marca de sensores seleccionada
-observe.content.action.sensorBrand.save.tip=Guardar las modificaciones de la marca de sensores
-observe.content.action.sensorDataFormat.create.tip=Crear un nuevo formato de datos de sensor
-observe.content.action.sensorDataFormat.delete.tip=Eliminar el formato de datos de sensor seleccionado
-observe.content.action.sensorDataFormat.detail.tip=Ver los detalles del formato de datos de sensor seleccionado
-observe.content.action.sensorDataFormat.modify.tip=Modificar el formato de datos de sensor seleccionado
-observe.content.action.sensorDataFormat.save.tip=Guardar las modificaciones del formato de datos de sensor
-observe.content.action.sensorType.create.tip=Crear un nuevo tipo de sensor
-observe.content.action.sensorType.delete.tip=Eliminar el tipo de sensor seleccionado
-observe.content.action.sensorType.detail.tip=Ver los detalles del tipo de sensor seleccionado
-observe.content.action.sensorType.modify.tip=Modificar el tipo de sensor seleccionado
-observe.content.action.sensorType.save.tip=Guardar las modificaciones del tipo de sensor
-observe.content.action.settingShape.create.tip=Crear una nueva forma al arrastre
-observe.content.action.settingShape.delete.tip=Eliminar la forma al arrastre seleccionada
-observe.content.action.settingShape.detail.tip=Ver los detalles de la forma al arrastre seleccionada
-observe.content.action.settingShape.modify.tip=Modificar la forma al arrastre seleccionada
-observe.content.action.settingShape.save.tip=Guardar las modificaciones de la forma al arrastre
-observe.content.action.sex.create.tip=Crear un nuevo sexo
-observe.content.action.sex.delete.tip=Eliminar el sexo seleccionado
-observe.content.action.sex.detail.tip=Ver los detalles del sexo seleccionado
-observe.content.action.sex.modify.tip=Modificar el sexo seleccionado
-observe.content.action.sex.save.tip=Guardar las modificaciones del sexo
-observe.content.action.sizeMeasureType.create.tip=Crear un nuevo tipo de medida del tamaño
-observe.content.action.sizeMeasureType.delete.tip=Eliminar el tipo de medida del tamaño seleccionado
-observe.content.action.sizeMeasureType.detail.tip=Ver los detalles del tipo de medida del tamaño seleccionado
-observe.content.action.sizeMeasureType.modify.tip=Modificar el tipo de medida del tamaño seleccionado
-observe.content.action.sizeMeasureType.save.tip=Guardar las modificaciones del tipo de medida del tamaño
-observe.content.action.species.create.tip=Crear una nueva especie
-observe.content.action.species.delete.tip=Eliminar la especie seleccionada
-observe.content.action.species.detail.tip=Ver los detalles de la especie seleccionada
-observe.content.action.species.modify.tip=Modificar lla especie seleccionada
-observe.content.action.species.save.tip=Guardar las modificaciones de la especie
-observe.content.action.speciesFate.create.tip=Crear un nuevo devenir
-observe.content.action.speciesFate.delete.tip=Eliminar el devenir seleccionado
-observe.content.action.speciesFate.detail.tip=Ver los detalles del devenir seleccionado
-observe.content.action.speciesFate.modify.tip=Modificar el devenir seleccionado
-observe.content.action.speciesFate.save.tip=Guardar las modificaciones del devenir
-observe.content.action.speciesGroupSpecies.create.tip=Crear un nuevo groupo de especies
-observe.content.action.speciesGroupSpecies.delete.tip=Eliminar el groupo de especies seleccionado
-observe.content.action.speciesGroupSpecies.detail.tip=Ver los detalles del groupo de especies seleccionado
-observe.content.action.speciesGroupSpecies.modify.tip=Modificar el groupo de especies seleccionado
-observe.content.action.speciesGroupSpecies.save.tip=Guardar las modificaciones del groupo de especies
-observe.content.action.speciesList.create.tip=Crear una nueva lista de especies
-observe.content.action.speciesList.delete.tip=Eliminar la lista de especies seleccionada
-observe.content.action.speciesList.detail.tip=Ver los detalles de la lista de especies seleccionada
-observe.content.action.speciesList.modify.tip=Modificar la lista de especies seleccionada
-observe.content.action.speciesStatus.create.tip=Crear un nuevo estatuto de especie
-observe.content.action.speciesStatus.delete.tip=Eliminar el estatuto de especie seleccionado
-observe.content.action.speciesStatus.detail.tip=Ver los detalles del estatuto de especie seleccionado
-observe.content.action.speciesStatus.modify.tip=Modificar el estatuto de especie seleccionado
-observe.content.action.speciesStatus.save.tip=Guardar las modificaciones del estatuto de especie seleccionado
-observe.content.action.stomacFullness.create.tip=Crear un nuevo nivel de llenada del estómago
-observe.content.action.stomacFullness.delete.tip=Eliminar el nivel de llenada del estómago seleccionado
-observe.content.action.stomacFullness.detail.tip=Ver los detalles del nivel de llenada del estómago seleccionado
-observe.content.action.stomacFullness.modify.tip=Modificar el nivel de llenada del estómago seleccionado
-observe.content.action.stomacFullness.save.tip=Guardar las modificaciones del nivel de llenada del estómago
-observe.content.action.surroundingActivity.create.tip=Crear una nueva actividad circundante
-observe.content.action.surroundingActivity.delete.tip=Eliminar la actividad circundante seleccionada
-observe.content.action.surroundingActivity.detail.tip=Ver los detalles de la actividad circundante seleccionada
-observe.content.action.surroundingActivity.modify.tip=Modificar la actividad circundante seleccionada
-observe.content.action.surroundingActivity.save.tip=Guardar las modificaciones de la actividad circundante
-observe.content.action.transmittingBuoyOperation.create.tip=Crear una nueva operación de baliza
-observe.content.action.transmittingBuoyOperation.delete.tip=Eliminar la operación de baliza seleccionada
-observe.content.action.transmittingBuoyOperation.detail.tip=Ver los detalles de la operación de baliza seleccionada
-observe.content.action.transmittingBuoyOperation.modify.tip=Modificar la operación de baliza seleccionada
-observe.content.action.transmittingBuoyOperation.save.tip=Guardar las modificaciones de operación de baliza
-observe.content.action.transmittingBuoyType.create.tip=Crear un nuevo tipo de baliza
-observe.content.action.transmittingBuoyType.delete.tip=Eliminar el tipo de baliza seleccionado
-observe.content.action.transmittingBuoyType.detail.tip=Ver los detalles del tipo de baliza seleccionado
-observe.content.action.transmittingBuoyType.modify.tip=Modificar el tipo de baliza seleccionado
-observe.content.action.transmittingBuoyType.save.tip=Guardar las modificaciones del tipo de baliza
 observe.content.action.trip=Crear una nueva marea
 observe.content.action.trip.tip=Crear una nueva marea para el programa actual
-observe.content.action.tripType.create.tip=Crear un nuevo tipo de marea
-observe.content.action.tripType.delete.tip=Eliminar el tipo de marea seleccionado
-observe.content.action.tripType.detail.tip=Ver los detalles del tipo de marea seleccionado
-observe.content.action.tripType.modify.tip=Modificar el tipo de marea seleccionado
-observe.content.action.tripType.save.tip=Guardar los modificiones del tipo de marea
-observe.content.action.vessel.create.tip=Crear un nuevo buquel
-observe.content.action.vessel.delete.tip=Eliminar el buquel seleccionado
-observe.content.action.vessel.detail.tip=Ver los detalles del buquel seleccionado
-observe.content.action.vessel.modify.tip=Modificar el buquel seleccionado
-observe.content.action.vessel.save.tip=Guardar los modificiones sobre el buquel
-observe.content.action.vesselActivityLongline.create.tip=Crear un nuevo tipo de actividad
-observe.content.action.vesselActivityLongline.delete.tip=Eliminar el tipo de actividad seleccionado
-observe.content.action.vesselActivityLongline.detail.tip=Ver los detalles del tipo de actividad seleccionado
-observe.content.action.vesselActivityLongline.modify.tip=Modificar el tipo de actividad seleccionado
-observe.content.action.vesselActivityLongline.save.tip=Guardar los modificiones del tipo de actividad
-observe.content.action.vesselActivitySeine.create.tip=Crear una nueva actividad de barco
-observe.content.action.vesselActivitySeine.delete.tip=Eliminar la actividad de buquel seleccionada
-observe.content.action.vesselActivitySeine.detail.tip=Ver los detalles de la actividad de buquel seleccionada
-observe.content.action.vesselActivitySeine.modify.tip=Modificar la actividad de buquel seleccionada
-observe.content.action.vesselActivitySeine.save.tip=Guardar los modificiones de la actividad de buquel
-observe.content.action.vesselSizeCategory.create.tip=Crear una nueva categoría de buquel
-observe.content.action.vesselSizeCategory.delete.tip=Eliminar la categoría de buquel seleccionada
-observe.content.action.vesselSizeCategory.detail.tip=Ver los detalles de la categoría de buquel seleccionada
-observe.content.action.vesselSizeCategory.modify.tip=Modificar la categoría de buquel seleccionada
-observe.content.action.vesselSizeCategory.save.tip=Guardar los modificiones de la categoría de buquel
-observe.content.action.vesselType.create.tip=Crear un nuevo tipo de buquel
-observe.content.action.vesselType.delete.tip=Eliminar el tipo de buquel seleccionado
-observe.content.action.vesselType.detail.tip=Ver los detalles del tipo de buquel seleccionado
-observe.content.action.vesselType.modify.tip=Modificar el tipo de buquel seleccionado
-observe.content.action.vesselType.save.tip=Guardar los modificiones del tipo de buquel
-observe.content.action.weightCategory.create.tip=Crear una nueva categoria de peso
-observe.content.action.weightCategory.delete.tip=Eliminar la categoria de peso seleccionada
-observe.content.action.weightCategory.detail.tip=Ver los detalles de la categoria de peso seleccionada
-observe.content.action.weightCategory.modify.tip=Modificar la categoria de peso seleccionada
-observe.content.action.weightCategory.save.tip=Guardar los modificiones de la categoria de peso
-observe.content.action.weightMeasureType.create.tip=Crear un nuevo tipo de medida de peso
-observe.content.action.weightMeasureType.delete.tip=Eliminar el tipo de medida de peso seleccionado
-observe.content.action.weightMeasureType.detail.tip=Ver los detalles del tipo de medida de peso seleccionado
-observe.content.action.weightMeasureType.modify.tip=Modificar el tipo de medida de peso seleccionado
-observe.content.action.weightMeasureType.save.tip=Guardar los modificiones del tipo de medida de peso
-observe.content.action.wind.create.tip=Crear una nueva velocidad de viento
-observe.content.action.wind.delete.tip=Eliminar la velocidad de viento seleccionada
-observe.content.action.wind.detail.tip=Ver los detalles de velocidad de viento seleccionados
-observe.content.action.wind.modify.tip=Modificar la velocidad de viento seleccionada
-observe.content.action.wind.save.tip=Guardar las modificaciones de velocidad de viento
 observe.content.baitsComposition.action.create=Insertar este cebo
 observe.content.baitsComposition.action.create.tip=Insertar este cebo
 observe.content.baitsComposition.baitSettingStatus=Estado en la calada
@@ -1185,65 +891,6 @@ observe.content.label.usage.referentiel.title=Referencial '%1$s' (%2$d ocurrenci
 observe.content.label.weightLengthFormula.info=la relación talla-peso permite calcular la talla a partir del peso, debe contener la varible P
 observe.content.lengthWeightParameter.tab.general=Características generales
 observe.content.lengthWeightParameter.tab.other=Otras características
-observe.content.list.HookSize=Lista de los tamaños de anzuelo registrados
-observe.content.list.HookType=Lista de los tipos de anzuelo registrados
-observe.content.list.baitHaulingStatus=Lista de los estatutos de cebo registrados
-observe.content.list.baitSettingStatus=Lista de los estatutos de cebo registrados en la calada
-observe.content.list.baitType=Lista de tipos de cebo registrados
-observe.content.list.catchFateLongline=Lista de los destinos de captura registrada
-observe.content.list.country=Países registrados
-observe.content.list.detectionMode=Modos de detección registradas
-observe.content.list.encounterType=Lista de tipos del encuentro registrados
-observe.content.list.fpaZone=Lista de las zonas FPA registradas
-observe.content.list.gear=Lista de los equipos registrados
-observe.content.list.gearCaracteristic=Lista de las características de equipo registradas
-observe.content.list.gearCaracteristicType=Lista de los tipos de característica registrados
-observe.content.list.harbour=Lista de los puertos regitrados
-observe.content.list.healthness=Liste de los estatuos de salud registrados
-observe.content.list.hookPosition=Lista de posiciones de anzuelo registradas
-observe.content.list.itemHorizontalPosition=Lista de las localizaciónes del elemento sobre la línea principal registradas
-observe.content.list.itemVerticalPosition=Lista de las localizaciones del elemento sobre el arponcillo registradas
-observe.content.list.lengthWeightParameter=Parámetros talla-peso de Fauna
-observe.content.list.lightsticksColor=Lista de colores de cyalumes registrados
-observe.content.list.lightsticksType=Lista de los tipos de cyalumes registrados
-observe.content.list.lineType=Lista de tipos de línea registrados
-observe.content.list.maturityStatus=Lista de maturidad registrada
-observe.content.list.mitigationType=Lista de tipos de medida de atenuación registrados
-observe.content.list.objectFate=Devenir de objetos registrados
-observe.content.list.objectOperation=Operaciones con objeto registradas
-observe.content.list.objectType=Tipos de objeto registrado
-observe.content.list.observedSystem=Sistemas observados registrados
-observe.content.list.ocean=Océanos registrados
-observe.content.list.operation=Operaciones de baliza registradas
-observe.content.list.organism=Organismos registrados
-observe.content.list.person=Observadores registrados
-observe.content.list.program=Programas registrados
-observe.content.list.reasonForDiscard=Razones de descarte registradas
-observe.content.list.reasonForNoFishing=Causas de no pesca registradas
-observe.content.list.reasonForNullSet=Causas de lance nulo registradas
-observe.content.list.sensorBrand=Lista de marcas de sensores registradas
-observe.content.list.sensorDataFormat=Lista de formatos de datos de sensor registrados
-observe.content.list.sensorType=Lista de tipos de sensores registrados
-observe.content.list.settingShape=Lista de los formas en la calada registradas
-observe.content.list.sex=Sexo registradas
-observe.content.list.sizeMeasureType=Lista de tipos de medida registrados
-observe.content.list.speciesFate=Devenir de fauna registrados
-observe.content.list.speciesFaune=Especies de fauna registradas
-observe.content.list.speciesGroupSpecies=Grupos de especies de fauna registradas
-observe.content.list.speciesList=Lista de los favoritos de especies registrados
-observe.content.list.speciesStatus=Estado de especies registradas
-observe.content.list.stomacFullness=Lista de los niveles de llenado del estomago registrados
-observe.content.list.surroundingActivity=Lista de actividades circundantes
-observe.content.list.transmittingBuoyType=Liste de los tipos de balisa registrados
-observe.content.list.tripType=Liste de los tipos de mareas registrados
-observe.content.list.vessel=Lista de barcos registrados
-observe.content.list.vesselActivityLongline=Lista de actividades de buque registradas
-observe.content.list.vesselActivitySeine=Lista de actividades de buque registradas
-observe.content.list.vesselSizeCategory=Lista de categorías de barcos registrados
-observe.content.list.vesselType=Tipos de barco registrados
-observe.content.list.weightCategory=Categorías de peso registradas
-observe.content.list.weightMeasureType=Lista de tipos de medida de peso registrados
-observe.content.list.wind=Fuerzas de viento registradas
 observe.content.longlineDetailComposition.action.deleteAllSections=Eliminar todo
 observe.content.longlineDetailComposition.action.deleteAllSections.tip=Eliminar todas las secciónes - cestas y arponcillos
 observe.content.longlineDetailComposition.action.deleteSelectedBasket=Eliminar
@@ -1595,65 +1242,6 @@ observe.content.tdr.table.sensorBrand.tip=Marca del sensor
 observe.content.tdr.table.serialNo=N°
 observe.content.tdr.table.serialNo.tip=Número de serie
 observe.content.tdr.title=Registrador de profundidad
-observe.content.title.HookSizes=Gestión de los tamaños del anzuelo
-observe.content.title.HookTypes=Gestión de los tipos de anzuelo
-observe.content.title.baitHaulingStatuss=Gestión de los estatutos del cebo en el arrastre
-observe.content.title.baitSettingStatuss=Gestión de los estatutos del cebo en la calada
-observe.content.title.baitTypes=Gestión de los tipos del cebo
-observe.content.title.catchFateLonglines=Gestión de los futuros de captura
-observe.content.title.country=Gestión de los países
-observe.content.title.detectionModes=Gestión de los modos de detección
-observe.content.title.encounterTypes=Gestión de los tipos de encuentro
-observe.content.title.fpaZones=Gestión de las zonas FPA
-observe.content.title.gearCaracteristicTypes=Gestión de los tipos de características
-observe.content.title.gearCaracteristics=Gestión de las características de equipamiento
-observe.content.title.gears=Gestión de los equipamientos
-observe.content.title.harbours=Gestión de los puertos
-observe.content.title.healthnesss=Gestión de los estatutos de salud
-observe.content.title.hookPositions=Gestión de las posiciones de anzuelo
-observe.content.title.itemHorizontalPositions=Gestión de las localizaciones del elemento sobre la línea principal
-observe.content.title.itemVerticalPositions=Gestión de las localizaciones del elemento sobre eL arponcillo
-observe.content.title.lengthWeightParameters=Gestión de los parametros tamaño-peso
-observe.content.title.lightsticksColors=Gestión de los colores de barrita de luz
-observe.content.title.lightsticksTypes=Gestión de los tipos de barrita de luz
-observe.content.title.lineTypes=Gestión de los tipos de línea
-observe.content.title.maturityStatuss=Gestión de las maturidades
-observe.content.title.mitigationTypes=Gestión de los tipos de medida de atenuación
-observe.content.title.objectFates=Gestión de los futuros de los objetos
-observe.content.title.objectOperations=Gestión de las operaciones de los objetos
-observe.content.title.objectTypes=Gestión de los tipos de objeto
-observe.content.title.observedSystems=Gestión de los sistemas observados
-observe.content.title.oceans=Gestión de los oceanos
-observe.content.title.organisms=Gestión de los organismos
-observe.content.title.persons=Gestión de los observadores
-observe.content.title.programs=Gestión de los programas
-observe.content.title.reasonForDiscards=Gestión de las razones de descarte
-observe.content.title.reasonForNoFishings=Gestión de las razones por no pescar senne
-observe.content.title.reasonForNullSets=Gestión de las causas de lance nulo
-observe.content.title.sensorBrands=Gestión de las marcas de sensor
-observe.content.title.sensorDataFormats=Gestión de los formatos de datos de sensor
-observe.content.title.sensorTypes=Gestión de los tipos de sensor
-observe.content.title.settingShapes=Gestión de las formas en la calada
-observe.content.title.sexx=Gestión de los sexos
-observe.content.title.sizeMeasureTypes=Gestión de los tipos de medida de tamaño
-observe.content.title.speciesFates=Gestión de los futuros de las especies
-observe.content.title.speciesGroupSpeciess=Gestión de los grupos de especies
-observe.content.title.speciesLists=Gestión de las listas de especies
-observe.content.title.speciesStatuss=Gestión de los estatutos de especies
-observe.content.title.speciess=Gestión de las especies
-observe.content.title.stomacFullnesss=Gestión de los niveles de llenado del estomago
-observe.content.title.surroundingActivitys=Gestión de las actividades circundantes
-observe.content.title.transmittingBuoyOperations=Gestión de las operaciones sobre baliza
-observe.content.title.transmittingBuoyTypes=Gestión de los tipos de baliza
-observe.content.title.tripTypes=Gestión de los tipos de marea
-observe.content.title.vesselActivityLonglines=Gestión de los tipos de actividades
-observe.content.title.vesselActivitySeines=Gestión de los tipos de actividades
-observe.content.title.vesselSizeCategoryx=Gestión de las categorías de buques
-observe.content.title.vesselTypex=Gestión de los tipos de buques
-observe.content.title.vesselx=Gestión de los barcos
-observe.content.title.weightCategory=Gestión de las categorías de peso
-observe.content.title.weightMeasureTypes=Gestión de los tipos de medidas de peso
-observe.content.title.windSpeeds=Gestión de los vientos Beaufort
 observe.content.tripLongline.captain=Capitán
 observe.content.tripLongline.dataEntryOperator=Operador de captación de datos
 observe.content.tripLongline.endDate=Fecha de fin
@@ -2086,98 +1674,24 @@ observe.tree.action.collapseAll.tip=Cerrar los nudos
 observe.tree.action.expandAll.tip=Abrir los nudos
 observe.tree.action.selectAll.tip=Seleccionar todo
 observe.tree.action.unselectAll.tip=Deseleccionar todo
-observe.tree.activityLongline=Actividad
-observe.tree.activityLongline.unsaved=Nueva actividad
-observe.tree.activitySeine=Actividad
-observe.tree.activitySeine.unsaved=Nueva actividad
-observe.tree.baitHaulingStatus=Estatuto del cebo en el arrastre
-observe.tree.baitSettingStatus=Estatuto del cebo en la calada
-observe.tree.baitType=Tipo de cebo
-observe.tree.catchFateLongline=Futuro de la captura
-observe.tree.catchLongline=Capturas
-observe.tree.country=País
-observe.tree.detectionMode=Modo de detección
-observe.tree.encounter=Encuentros
-observe.tree.encounterType=Tipo de encuentro
-observe.tree.floatingObject.unsaved=Nuevo DCP
-observe.tree.fpaZone=Zone FPA
-observe.tree.gear=Equipamiento
-observe.tree.gearCaracteristic=Característica de un equipamiento
-observe.tree.gearCaracteristicType=Tipo de característica de los equipamientos
-observe.tree.gearUseFeaturesLongline=Equipamientos
-observe.tree.gearUseFeaturesSeine=Equipamientos
-observe.tree.harbour=Puerto
-observe.tree.healthness=Estatutos de la captura
-observe.tree.hookPosition=Posición del anzuelo
-observe.tree.hookSize=Tamaño del anzuelo
-observe.tree.hookType=Tipo del anzuelo
-observe.tree.itemHorizontalPosition=Localización del elemento sobre la línea principal
-observe.tree.itemVerticalPosition=Localización del elemento sobre el arponcillo
-observe.tree.lengthWeightParameter=Relación Tamaño-Peso
-observe.tree.lightsticksColor=Color de barrita de luz
-observe.tree.lightsticksType=Tipo de barrita de luz
-observe.tree.lineType=Tipo de línea
-observe.tree.longlineDetailComposition=Esquema de palangre
-observe.tree.longlineGlobalComposition=Composición
-observe.tree.maturityStatus=Maturidad
-observe.tree.mitigationType=Tipo de medida de atenuación
-observe.tree.nonTargetCatch=Fauna asociada conservada o descartada
-observe.tree.nonTargetSample=Muestreo fauna asociada
-observe.tree.objectFate=Futuro del objeto
-observe.tree.objectObservedSpecies=Fauna observada
-observe.tree.objectOperation=Operación sobre la baliza
-observe.tree.objectSchoolEstimate=Estimación banco de objetos
-observe.tree.objectType=Tipo de objeto
-observe.tree.observedSystem=Sistema observado
-observe.tree.ocean=Oceano
-observe.tree.organism=Organismo
-observe.tree.person=Observador
-observe.tree.program=Programa
-observe.tree.reasonForDiscard=Razon de descarte
-observe.tree.reasonForNoFishing=Razón de no lance Senne
-observe.tree.reasonForNullSet=Causa de lance nulo
-observe.tree.reference.common=Referencial commun
-observe.tree.reference.longline=Referencial Palangre
-observe.tree.reference.seine=Referencial Senne
-observe.tree.route=Ruta
-observe.tree.route.unsaved=Nueva ruta
-observe.tree.schoolEstimate=Estimación del banco
-observe.tree.sensorBrand=Marca de sensor
-observe.tree.sensorDataFormat=Formato de datos de sensor
-observe.tree.sensorType=Tipo de sensor
-observe.tree.sensorUsed=Sensores utilizados
-observe.tree.setLongline=Detalles de a operación
-observe.tree.setLongline.unsaved=Nuevo lance
-observe.tree.setSeine=Lance
-observe.tree.setSeine.unsaved=Nuevo lance
-observe.tree.settingShape=Forma en la calada
-observe.tree.sex=Sexo
-observe.tree.sizeMeasureType=Tipo de medición del tamaño
-observe.tree.species=Especie
-observe.tree.speciesFate=Futuro de la fauna
-observe.tree.speciesGroup=Grupo de especie de fauna
-observe.tree.speciesList=Lista de especies
-observe.tree.speciesStatus=Estado de especie
-observe.tree.stomacFullness=Nivel de llenado del estomago
-observe.tree.surroundingActivity=Actividad circundante
-observe.tree.targetCatch=Captura de atún
-observe.tree.targetDiscarded=Descarte de atún
-observe.tree.targetSample=Muestreo de atún descartado
-observe.tree.targetSampleCapture=Muestreo de atún capturado
-observe.tree.tdr=Registradores de profundidad
-observe.tree.transmittingBuoyOperation=Operación sobre baliza
-observe.tree.transmittingBuoyType=Tipo de baliza
-observe.tree.tripLongline.unsaved=Nueva marea
-observe.tree.tripSeine.unsaved=Nueva marea
-observe.tree.tripType=Tipo de marea
-observe.tree.vessel=Barco
-observe.tree.vesselActivityLongline=Actividad del barco
-observe.tree.vesselActivitySeine=Actividad del barco
-observe.tree.vesselSizeCategory=Capacidad
-observe.tree.vesselType=Pesquería
-observe.tree.weightCategory=Categoría de peso
-observe.tree.weightMeasureType=Tipo de medida del peso
-observe.tree.wind=Fuerza del viento
+observe.type.action.create=TODO
+observe.type.action.delete=TODO
+observe.type.action.edit=TODO
+observe.type.action.save=TODO
+observe.type.action.view=TODO
+observe.type.activityLongline.unsaved=Nueva actividad
+observe.type.activitySeine.unsaved=Nueva actividad
+observe.type.floatingObject.unsaved=Nuevo DCP
+observe.type.list=Lista de %s
+observe.type.management=Lista de %s TODO
+observe.type.reference.common=Referencial commun
+observe.type.reference.longline=Referencial Palangre
+observe.type.reference.seine=Referencial Senne
+observe.type.route.unsaved=Nueva ruta
+observe.type.setLongline.unsaved=Nuevo lance
+observe.type.setSeine.unsaved=Nuevo lance
+observe.type.tripLongline.unsaved=Nueva marea
+observe.type.tripSeine.unsaved=Nueva marea
 observe.validator.field.tip=Propriedad '%1$s'
 observe.validator.message.tip=Mensaje \: %1$s
 observe.validator.scope.tip=Tipo de mensaje \: '%1$s'
diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties
index 3d8d4f3..d5e0dce 100644
--- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties
+++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties
@@ -541,26 +541,6 @@ observe.config.category.synchro=Actions sur base
 observe.config.category.synchro.description=Configuration actions sur base
 observe.content.action.activity=Créer une nouvelle activité
 observe.content.action.activity.tip=Créer une nouvelle activité pour la route courante
-observe.content.action.baitHaulingStatus.create.tip=Créer un nouveau statut de l'appât au virage
-observe.content.action.baitHaulingStatus.delete.tip=Supprimer le statut de l'appât au virage sélectionné
-observe.content.action.baitHaulingStatus.detail.tip=Voir les détails du statut de l'appât au virage sélectionné
-observe.content.action.baitHaulingStatus.modify.tip=Modifier le statut de l'appât au virage sélectionné
-observe.content.action.baitHaulingStatus.save.tip=Sauver les modifications du statuts de l'appât au virage
-observe.content.action.baitSettingStatus.create.tip=Créer un nouveau statut de l'appât au filage
-observe.content.action.baitSettingStatus.delete.tip=Supprimer le statut de l'appât au filage sélectionné
-observe.content.action.baitSettingStatus.detail.tip=Voir les détails du statut de l'appât au filage sélectionné
-observe.content.action.baitSettingStatus.modify.tip=Modifier le statut de l'appât au filage sélectionné
-observe.content.action.baitSettingStatus.save.tip=Sauver les modifications du statut de l'appât au filage
-observe.content.action.baitType.create.tip=Créer un nouveau type d'appât
-observe.content.action.baitType.delete.tip=Supprimer le type d'appât sélectionné
-observe.content.action.baitType.detail.tip=Voir les détails du type d'appât sélectionné
-observe.content.action.baitType.modify.tip=Modifier le type d'appât sélectionné
-observe.content.action.baitType.save.tip=Sauver les modifications du type d'appât
-observe.content.action.catchFateLongline.create.tip=Créer un nouveau devenir capture
-observe.content.action.catchFateLongline.delete.tip=Supprimer le devenir capture sélectionné
-observe.content.action.catchFateLongline.detail.tip=Voir les détails du devenir capture sélectionné
-observe.content.action.catchFateLongline.modify.tip=Modifier le devenir capture sélectionné
-observe.content.action.catchFateLongline.save.tip=Sauver les modifications du devenir capture
 observe.content.action.closeAndCreate=Clôturer et créer
 observe.content.action.closeAndCreate.activity=Activité suivante
 observe.content.action.closeAndCreate.activity.tip=Clôturer l'activite courante et en créer une nouvelle
@@ -569,11 +549,6 @@ observe.content.action.closeAndCreate.maree.tip=Clôturer la marée courante et
 observe.content.action.closeAndCreate.route=Route suivante
 observe.content.action.closeAndCreate.route.tip=Clôturer la route courante et en créer une nouvelle
 observe.content.action.closeAndCreate.tip=Clôturer l'élément courant et en créer un nouveau
-observe.content.action.country.create.tip=Créer un nouveau pays
-observe.content.action.country.delete.tip=Supprimer le pays sélectionné
-observe.content.action.country.detail.tip=Voir les détails du pays sélectionné
-observe.content.action.country.modify.tip=Modifier le pays sélectionné
-observe.content.action.country.save.tip=Sauver les modifications du pays
 observe.content.action.create.entry.tip=Créer une nouvelle entrée
 observe.content.action.create.gearUseFeaturesSeine=Créer un équipement
 observe.content.action.create.gearUseFeaturesSeine.tip=Créer un nouvel équipement
@@ -595,36 +570,6 @@ observe.content.action.create.targetSample=Insérer cet échantillon
 observe.content.action.create.targetSample.tip=Insérer cet échantillon de thon rejeté
 observe.content.action.create.targetSampleCapture=Insérer cet échantillon
 observe.content.action.create.targetSampleCapture.tip=Insérer cet échantillon de thon capturé
-observe.content.action.detectionMode.create.tip=Créer un nouveau mode détection
-observe.content.action.detectionMode.delete.tip=Supprimer le mode de détection sélectionné
-observe.content.action.detectionMode.detail.tip=Voir les détails du mode détection sélectionné
-observe.content.action.detectionMode.modify.tip=Modifier le mode de détection sélectionné
-observe.content.action.detectionMode.save.tip=Sauver les modifications du mode de détection
-observe.content.action.encounterType.create.tip=Créer un nouveau type de rencontre
-observe.content.action.encounterType.delete.tip=Supprimer le type de rencontre sélectionné
-observe.content.action.encounterType.detail.tip=Voir les détails du type de rencontre sélectionné
-observe.content.action.encounterType.modify.tip=Modifier le type de rencontre sélectionné
-observe.content.action.encounterType.save.tip=Sauver les modifications du type de rencontre
-observe.content.action.fpaZone.create.tip=Créer une nouvelle zone FPA
-observe.content.action.fpaZone.delete.tip=Supprimer la zone FPA sélectionnée
-observe.content.action.fpaZone.detail.tip=Voir les détails de la zone FPA sélectionnée
-observe.content.action.fpaZone.modify.tip=Modifier la zone FPA sélectionnée
-observe.content.action.fpaZone.save.tip=Sauver les modifications de la zone FPA
-observe.content.action.gear.create.tip=Créer un nouvel équipment
-observe.content.action.gear.delete.tip=Supprimer l'équipment sélectionné
-observe.content.action.gear.detail.tip=Voir les détails de l'équipment sélectionné
-observe.content.action.gear.modify.tip=Modifier l'équipment sélectionné
-observe.content.action.gear.save.tip=Sauver les modifications de l'équipment
-observe.content.action.gearCaracteristic.create.tip=Créer une nouvelle caractéristique
-observe.content.action.gearCaracteristic.delete.tip=Supprimer la caractéristique sélectionnée
-observe.content.action.gearCaracteristic.detail.tip=Voir les détails de la caractéristique sélectionnée
-observe.content.action.gearCaracteristic.modify.tip=Modifier la caractéristique sélectionnée
-observe.content.action.gearCaracteristic.save.tip=Sauver les modifications de la caractéristique
-observe.content.action.gearCaracteristicType.create.tip=Créer un nouveau type de caractéristique
-observe.content.action.gearCaracteristicType.delete.tip=Supprimer le type de caractéristique sélectionné
-observe.content.action.gearCaracteristicType.detail.tip=Voir les détails du type de caractéristique sélectionné
-observe.content.action.gearCaracteristicType.modify.tip=Modifier le type de caractéristique sélectionné
-observe.content.action.gearCaracteristicType.save.tip=Sauver les modifications du type de caractéristique
 observe.content.action.gearUseFeaturesLongline=Créer un équipement
 observe.content.action.gearUseFeaturesLongline.tip=Créer un nouvel équipement
 observe.content.action.goto.open.activity=Accéder à l'activité ouverte
@@ -654,71 +599,6 @@ observe.content.action.goto.selected.maree=Accéder à la marée
 observe.content.action.goto.selected.maree.tip=Accéder à la marée sélectionnée
 observe.content.action.goto.selected.route=Accéder à la route
 observe.content.action.goto.selected.route.tip=Accéder à la route sélectionnée
-observe.content.action.harbour.create.tip=Créer un nouveau port
-observe.content.action.harbour.delete.tip=Supprimer le port sélectionné
-observe.content.action.harbour.detail.tip=Voir les détails du port sélectionné
-observe.content.action.harbour.modify.tip=Modifier le port sélectionné
-observe.content.action.harbour.save.tip=Sauver les modifications du port
-observe.content.action.healthness.create.tip=Créer un nouveau statut de santé
-observe.content.action.healthness.delete.tip=Supprimer le statut de santé sélectionné
-observe.content.action.healthness.detail.tip=Voir les détails du statut de santé sélectionné
-observe.content.action.healthness.modify.tip=Modifier le statut de santé sélectionné
-observe.content.action.healthness.save.tip=Sauver les modifications du statut de santé
-observe.content.action.hookPosition.create.tip=Créer une nouvelle position d'hameçon
-observe.content.action.hookPosition.delete.tip=Supprimer la position d'hameçon sélectionnée
-observe.content.action.hookPosition.detail.tip=Voir les détails de la position d'hameçon sélectionnée
-observe.content.action.hookPosition.modify.tip=Modifier la position d'hameçon sélectionnée
-observe.content.action.hookPosition.save.tip=Sauver les modifications de la position d'hameçon
-observe.content.action.hookSize.create.tip=Créer une nouvelle taille d'hameçon
-observe.content.action.hookSize.delete.tip=Supprimer la taille d'hameçon sélectionné
-observe.content.action.hookSize.detail.tip=Voir les détails de la taille d'hameçon sélectionné
-observe.content.action.hookSize.modify.tip=Modifier la taille d'hameçon sélectionné
-observe.content.action.hookSize.save.tip=Sauver les modifications du type de hameçon
-observe.content.action.hookType.create.tip=Créer un nouveau type d'hameçon
-observe.content.action.hookType.delete.tip=Supprimer le type d'hameçon sélectionné
-observe.content.action.hookType.detail.tip=Voir les détails du type d'hameçon sélectionné
-observe.content.action.hookType.modify.tip=Modifier le type d'hameçon sélectionné
-observe.content.action.hookType.save.tip=Sauver les modifications du type d'hameçon
-observe.content.action.itemHorizontalPosition.create.tip=Créer une nouvelle localisation de l'élément sur la ligne mère
-observe.content.action.itemHorizontalPosition.delete.tip=Supprimer la localisation de l'élément sur la ligne mère sélectionnée
-observe.content.action.itemHorizontalPosition.detail.tip=Voir les détails de la localisation de l'élément sur la ligne mère sélectionnée
-observe.content.action.itemHorizontalPosition.modify.tip=Modifier la localisation de l'élément sur la ligne mère sélectionnée
-observe.content.action.itemHorizontalPosition.save.tip=Sauver les modifications de la localisation de l'élément sur la ligne mère
-observe.content.action.itemVerticalPosition.create.tip=Créer une nouvelle localisation de l'élément sur l'avançon
-observe.content.action.itemVerticalPosition.delete.tip=Supprimer la localisation de l'élément sur l'avançon sélectionnée
-observe.content.action.itemVerticalPosition.detail.tip=Voir les détails de la localisation de l'élément sur l'avançon sélectionnée
-observe.content.action.itemVerticalPosition.modify.tip=Modifier la localisation de l'élément sur l'avançon sélectionnée
-observe.content.action.itemVerticalPosition.save.tip=Sauver les modifications de la localisation de l'élément sur l'avançon
-observe.content.action.lengthWeightParameter.create.tip=Créer un nouveau paramétrage taille-poids
-observe.content.action.lengthWeightParameter.delete.tip=Supprimer le paramétrage taille-poids sélectionné
-observe.content.action.lengthWeightParameter.detail.tip=Voir les détails du paramétrage taille-poids
-observe.content.action.lengthWeightParameter.modify.tip=Modifier le paramétrage taille-poids
-observe.content.action.lengthWeightParameter.save.tip=Sauver les modifications du paramétrage taille-poids
-observe.content.action.lightsticksColor.create.tip=Créer une nouvelle couleur de baton lumineux
-observe.content.action.lightsticksColor.delete.tip=Supprimer la couleur de baton lumineux sélectionnée
-observe.content.action.lightsticksColor.detail.tip=Voir les détails de la couleur de baton lumineux sélectionnée
-observe.content.action.lightsticksColor.modify.tip=Modifier la couleur de baton lumineux sélectionnée
-observe.content.action.lightsticksColor.save.tip=Sauver les modifications de la couleur de baton lumineux
-observe.content.action.lightsticksType.create.tip=Créer un nouveau type de baton lumineux
-observe.content.action.lightsticksType.delete.tip=Supprimer le type de baton lumineux sélectionné
-observe.content.action.lightsticksType.detail.tip=Voir les détails du type de baton lumineux sélectionné
-observe.content.action.lightsticksType.modify.tip=Modifier le type de baton lumineux sélectionné
-observe.content.action.lightsticksType.save.tip=Sauver les modifications du type de baton lumineux
-observe.content.action.lineType.create.tip=Créer un nouveau type de ligne
-observe.content.action.lineType.delete.tip=Supprimer le type de ligne sélectionné
-observe.content.action.lineType.detail.tip=Voir les détails du type de ligne sélectionné
-observe.content.action.lineType.modify.tip=Modifier le type de ligne sélectionné
-observe.content.action.lineType.save.tip=Sauver les modifications du type de ligne
-observe.content.action.maturityStatus.create.tip=Créer une nouvelle maturité
-observe.content.action.maturityStatus.delete.tip=Supprimer le maturité sélectionnée
-observe.content.action.maturityStatus.detail.tip=Voir les détails de la maturité sélectionnée
-observe.content.action.maturityStatus.modify.tip=Modifier la maturité sélectionnée
-observe.content.action.maturityStatus.save.tip=Sauver les modifications de la maturité
-observe.content.action.mitigationType.create.tip=Créer un nouveau type de mesure d'atténuation
-observe.content.action.mitigationType.delete.tip=Supprimer le type de mesure d'atténuation sélectionné
-observe.content.action.mitigationType.detail.tip=Voir les détails du type de mesure d'atténuation sélectionné
-observe.content.action.mitigationType.modify.tip=Modifier le type de mesure d'atténuation sélectionné
-observe.content.action.mitigationType.save.tip=Sauver les modifications du type de mesure d'atténuation
 observe.content.action.move.activities.longline=Changer de marée
 observe.content.action.move.activities.longline.tip=Changer la marée des activités sélectionnées
 observe.content.action.move.activities.seine=Changer de route
@@ -727,63 +607,8 @@ observe.content.action.move.routes=Changer de marée
 observe.content.action.move.routes.tip=Changer la marée des routes sélectionnées
 observe.content.action.move.trips=Changer de programme
 observe.content.action.move.trips.tip=Changer le programme des marées sélectionnées
-observe.content.action.objectFate.create.tip=Créer un nouveau devenir objet
-observe.content.action.objectFate.delete.tip=Supprimer le devenir objet sélectionné
-observe.content.action.objectFate.detail.tip=Voir les détails du devenir objet sélectionné
-observe.content.action.objectFate.modify.tip=Modifier le devenir objet sélectionné
-observe.content.action.objectFate.save.tip=Sauver les modifications du devenir objet
-observe.content.action.objectOperation.create.tip=Créer une nouvelle opération objet
-observe.content.action.objectOperation.delete.tip=Supprimer l'opération objet sélectionné
-observe.content.action.objectOperation.detail.tip=Voir les détails de l'opération objet sélectionnée
-observe.content.action.objectOperation.modify.tip=Modifier l'opération objet sélectionnée
-observe.content.action.objectOperation.save.tip=Sauver les modifications de l'opération objet
-observe.content.action.objectType.create.tip=Créer un nouveau type d'objet
-observe.content.action.objectType.delete.tip=Supprimer le type d'objet sélectionné
-observe.content.action.objectType.detail.tip=Voir les détails du type d'objet sélectionné
-observe.content.action.objectType.modify.tip=Modifier le type d'objet sélectionné
-observe.content.action.objectType.save.tip=Sauver les modifications du type d'objet
-observe.content.action.observedSystem.create.tip=Créer un nouveau système observé
-observe.content.action.observedSystem.delete.tip=Supprimer le système observé sélectionné
-observe.content.action.observedSystem.detail.tip=Voir les détails du système observé sélectionné
-observe.content.action.observedSystem.modify.tip=Modifier le système observé sélectionné
-observe.content.action.observedSystem.save.tip=Sauver les modifications du système observé
-observe.content.action.ocean.create.tip=Créer un nouvel océan
-observe.content.action.ocean.delete.tip=Supprimer l'océan sélectionné
-observe.content.action.ocean.detail.tip=Voir les détails sur l'océan sélectionné
-observe.content.action.ocean.modify.tip=Modifier l'océan sélectionné
-observe.content.action.ocean.save.tip=Sauver les modifications sur l'ocean
 observe.content.action.openLink.formsUrl.tip=Accéder aux formulaires dans un navigateur web
 observe.content.action.openLink.reportsUrl.tip=Accéder aux rapports dans un navigateur web
-observe.content.action.organism.create.tip=Créer un nouvel organisme
-observe.content.action.organism.delete.tip=Supprimer l'organisme sélectionné
-observe.content.action.organism.detail.tip=Voir les détaile de l'organisme
-observe.content.action.organism.modify.tip=Modifier l'organisme sélectionné
-observe.content.action.organism.save.tip=Sauver les modifications de l'organisme
-observe.content.action.person.create.tip=Créer un nouvelle personne
-observe.content.action.person.delete.tip=Supprimer la personne sélectionnée
-observe.content.action.person.detail.tip=Voir les détails de la personne sélectionnée
-observe.content.action.person.modify.tip=Modifier la personne sélectionnée
-observe.content.action.person.save.tip=Sauver les modifications sur la personne
-observe.content.action.program.create.tip=Créer un nouveau programme
-observe.content.action.program.delete.tip=Supprimer le programme sélectionné
-observe.content.action.program.detail.tip=Voir les détails du programme sélectionné
-observe.content.action.program.modify.tip=Modifier le programme sélectionné
-observe.content.action.program.save.tip=Sauver les modifications sur le programme
-observe.content.action.reasonForDiscard.create.tip=Créer une nouvelle raison de rejet
-observe.content.action.reasonForDiscard.delete.tip=Supprimer la raison de rejet sélectionnée
-observe.content.action.reasonForDiscard.detail.tip=voir les détail de la raison de rejet sélectionnée
-observe.content.action.reasonForDiscard.modify.tip=Modifier la raison de rejet sélectionnée
-observe.content.action.reasonForDiscard.save.tip=Sauver les modifications du raison de rejet
-observe.content.action.reasonForNoFishing.create.tip=Créer une nouvelle raison de non coup de senne
-observe.content.action.reasonForNoFishing.delete.tip=Supprimer la raison de non coup de senne sélectionné
-observe.content.action.reasonForNoFishing.detail.tip=Voir les détails de la raison de non coup de senne sélectionnée
-observe.content.action.reasonForNoFishing.modify.tip=Modifier la raison de non coup de senne sélectionnée
-observe.content.action.reasonForNoFishing.save.tip=Sauver les modifications de la raison de non coup de senne
-observe.content.action.reasonForNullSet.create.tip=Créer une nouvelle cause de coup nul
-observe.content.action.reasonForNullSet.delete.tip=Supprimer la cause de coup nul sélectionnée
-observe.content.action.reasonForNullSet.detail.tip=Voir les détails de la cause de coup nul sélectionnée
-observe.content.action.reasonForNullSet.modify.tip=Modifier la cause de coup nul sélectionnée
-observe.content.action.reasonForNullSet.save.tip=Sauver les modifications du cause de coup nul
 observe.content.action.reopen=Réouvrir
 observe.content.action.reopen.activity.tip=Réouvrir l'activité
 observe.content.action.reopen.maree.tip=Réouvrir la marée
@@ -806,127 +631,8 @@ observe.content.action.reset.reportsUrl.tip=Réinitialiser l'url des rapports
 observe.content.action.reset.supportVesselName.tip=Réinitialiser
 observe.content.action.reset.tip=Annuler les modifications
 observe.content.action.reset.well.tip=Réinitialiser
-observe.content.action.sensorBrand.create.tip=Créer une nouvelle marque de capteur
-observe.content.action.sensorBrand.delete.tip=Supprimer la marque de capteur sélectionnée
-observe.content.action.sensorBrand.detail.tip=Voir les détails de la marque de capteur sélectionnée
-observe.content.action.sensorBrand.modify.tip=Modifier la marque de capteur sélectionnée
-observe.content.action.sensorBrand.save.tip=Sauver les modifications de la marque de capteur
-observe.content.action.sensorDataFormat.create.tip=Créer un nouveau format de données de capteur
-observe.content.action.sensorDataFormat.delete.tip=Supprimer le format de données de capteur sélectionné
-observe.content.action.sensorDataFormat.detail.tip=Voir les détails du format de données de capteur sélectionné
-observe.content.action.sensorDataFormat.modify.tip=Modifier le format de données de capteur sélectionné
-observe.content.action.sensorDataFormat.save.tip=Sauver les modifications du format de données de capteur
-observe.content.action.sensorType.create.tip=Créer un nouveau type de capteur
-observe.content.action.sensorType.delete.tip=Supprimer le type de capteur sélectionné
-observe.content.action.sensorType.detail.tip=Voir les détails du type de capteur sélectionné
-observe.content.action.sensorType.modify.tip=Modifier le type de capteur sélectionné
-observe.content.action.sensorType.save.tip=Sauver les modifications du type de capteur
-observe.content.action.settingShape.create.tip=Créer une nouvelle forme au filage
-observe.content.action.settingShape.delete.tip=Supprimer la forme au filage sélectionnée
-observe.content.action.settingShape.detail.tip=Voir les détails de la forme au filage sélectionnée
-observe.content.action.settingShape.modify.tip=Modifier la forme au filage sélectionnée
-observe.content.action.settingShape.save.tip=Sauver les modifications de la forme au filage
-observe.content.action.sex.create.tip=Créer un nouveau sexe
-observe.content.action.sex.delete.tip=Supprimer le sexe sélectionné
-observe.content.action.sex.detail.tip=Voir les détails du sexe sélectionné
-observe.content.action.sex.modify.tip=Modifier le sexe sélectionné
-observe.content.action.sex.save.tip=Sauver les modifications du sexe
-observe.content.action.sizeMeasureType.create.tip=Créer un nouveau type de mesure de taille
-observe.content.action.sizeMeasureType.delete.tip=Supprimer le type de mesure de taille sélectionné
-observe.content.action.sizeMeasureType.detail.tip=Voir les détails du type de mesure de taille sélectionné
-observe.content.action.sizeMeasureType.modify.tip=Modifier le type de mesure de taille sélectionné
-observe.content.action.sizeMeasureType.save.tip=Sauver les modifications du type de mesure de taille
-observe.content.action.species.create.tip=Créer une nouvelle espèce
-observe.content.action.species.delete.tip=Supprimer l'espèce sélectionnée
-observe.content.action.species.detail.tip=Voir les détails de l'espèce sélectionnée
-observe.content.action.species.modify.tip=Modifier l'espèce sélectionnée
-observe.content.action.species.save.tip=Sauver les modifications de l'espèce
-observe.content.action.speciesFate.create.tip=Créer un nouveau devenir
-observe.content.action.speciesFate.delete.tip=Supprimer le devenir sélectionné
-observe.content.action.speciesFate.detail.tip=Voir les détails du devenir sélectionné
-observe.content.action.speciesFate.modify.tip=Modifier le devenir sélectionné
-observe.content.action.speciesFate.save.tip=Sauver les modifications du devenir
-observe.content.action.speciesGroupSpecies.create.tip=Créer un nouveau groupe d'espèce
-observe.content.action.speciesGroupSpecies.delete.tip=Supprimer le groupe d'espèce sélectionné
-observe.content.action.speciesGroupSpecies.detail.tip=Voir les détails du groupe d'espèce sélectionné
-observe.content.action.speciesGroupSpecies.modify.tip=Modifier le groupe d'espèce sélectionné
-observe.content.action.speciesGroupSpecies.save.tip=Sauver les modifications du groupe d'espèce
-observe.content.action.speciesList.create.tip=Créer une nouvelle liste d'espèce
-observe.content.action.speciesList.delete.tip=Supprimer la liste d'espèce sélectionnée
-observe.content.action.speciesList.detail.tip=Voir les détails de la liste d'espèce sélectionnée
-observe.content.action.speciesList.modify.tip=Modifier la liste d'espèce sélectionnée
-observe.content.action.speciesStatus.create.tip=Créer un nouveau statut d'espèce
-observe.content.action.speciesStatus.delete.tip=Supprimer le statut d'espèce sélectionné
-observe.content.action.speciesStatus.detail.tip=Voir les détails du statut d'espèce sélectionné
-observe.content.action.speciesStatus.modify.tip=Modifier le statut d'espèce sélectionné
-observe.content.action.speciesStatus.save.tip=Sauver les modifications du statut d'espèce
-observe.content.action.stomacFullness.create.tip=Créer un nouveau niveau de remplissage de l'estomac
-observe.content.action.stomacFullness.delete.tip=Supprimer le niveau de remplissage de l'estomac sélectionné
-observe.content.action.stomacFullness.detail.tip=Voir les détails du niveau de remplissage de l'estomac sélectionné
-observe.content.action.stomacFullness.modify.tip=Modifier le niveau de remplissage de l'estomac sélectionné
-observe.content.action.stomacFullness.save.tip=Sauver les modifications du niveau de remplissage de l'estomac
-observe.content.action.surroundingActivity.create.tip=Créer un nouvelle activité environnante
-observe.content.action.surroundingActivity.delete.tip=Supprimer l'activité environnante sélectionnée
-observe.content.action.surroundingActivity.detail.tip=Voir les détails de l'activité environnante sélectionnée
-observe.content.action.surroundingActivity.modify.tip=Modifier l'activité environnante sélectionnée
-observe.content.action.surroundingActivity.save.tip=Sauver les modifications de l'activité environnante
-observe.content.action.transmittingBuoyOperation.create.tip=Créer une nouvelle opération sur balise
-observe.content.action.transmittingBuoyOperation.delete.tip=Supprimer l'opération sur balise sélectionné
-observe.content.action.transmittingBuoyOperation.detail.tip=Voir les détails de l'opération sur balise sélectionnée
-observe.content.action.transmittingBuoyOperation.modify.tip=Modifier l'opération sur balise sélectionnée
-observe.content.action.transmittingBuoyOperation.save.tip=Sauver les modifications de l'opération sur balise
-observe.content.action.transmittingBuoyType.create.tip=Créer un nouveau type de balise
-observe.content.action.transmittingBuoyType.delete.tip=Supprimer le type de balise sélectionné
-observe.content.action.transmittingBuoyType.detail.tip=Voir les détails du type de balise sélectionné
-observe.content.action.transmittingBuoyType.modify.tip=Modifier le type de balise sélectionné
-observe.content.action.transmittingBuoyType.save.tip=Sauver les modifications du type de balise
 observe.content.action.trip=Créer une nouvelle marée
 observe.content.action.trip.tip=Créer une nouvelle marée pour le programme courant
-observe.content.action.tripType.create.tip=Créer un nouveau type de marée
-observe.content.action.tripType.delete.tip=Supprimer le type de marée sélectionné
-observe.content.action.tripType.detail.tip=Voir les détails du type de marée sélectionné
-observe.content.action.tripType.modify.tip=Modifier le type de marée sélectionné
-observe.content.action.tripType.save.tip=Sauver les modifications du type de marée
-observe.content.action.vessel.create.tip=Créer un nouveau bateau
-observe.content.action.vessel.delete.tip=Supprimer le bateau sélectionné
-observe.content.action.vessel.detail.tip=Voir les détails du bateau sélectionné
-observe.content.action.vessel.modify.tip=Modifier le bateau sélectionné
-observe.content.action.vessel.save.tip=Sauver les modifications sur le bateau
-observe.content.action.vesselActivityLongline.create.tip=Créer un nouveau type d'activité
-observe.content.action.vesselActivityLongline.delete.tip=Supprimer le type d'activité sélectionné
-observe.content.action.vesselActivityLongline.detail.tip=Voir les détails du type d'activité sélectionné
-observe.content.action.vesselActivityLongline.modify.tip=Modifier le type d'activité sélectionné
-observe.content.action.vesselActivityLongline.save.tip=Sauver les modifications du type d'activité
-observe.content.action.vesselActivitySeine.create.tip=Créer un nouveau type d'activité
-observe.content.action.vesselActivitySeine.delete.tip=Supprimer le type d'activité sélectionnée
-observe.content.action.vesselActivitySeine.detail.tip=Voir les détails du type d'activité sélectionnée
-observe.content.action.vesselActivitySeine.modify.tip=Modifier le type d'activité sélectionnée
-observe.content.action.vesselActivitySeine.save.tip=Sauver les modifications du type d'activité
-observe.content.action.vesselSizeCategory.create.tip=Créer une nouvelle catégorie de taille de navire
-observe.content.action.vesselSizeCategory.delete.tip=Supprimer la catégorie de taille de navire sélectionnée
-observe.content.action.vesselSizeCategory.detail.tip=Voir les détails de la catégorie de taille de navire sélectionnée
-observe.content.action.vesselSizeCategory.modify.tip=Modifier la catégorie de taille de navire sélectionnée
-observe.content.action.vesselSizeCategory.save.tip=Sauver les modifications de la catégorie de vessel
-observe.content.action.vesselType.create.tip=Créer un nouveau type de navire
-observe.content.action.vesselType.delete.tip=Supprimer le type de navire sélectionné
-observe.content.action.vesselType.detail.tip=Voir les détails du type de navire sélectionné
-observe.content.action.vesselType.modify.tip=Modifier le type de navire sélectionné
-observe.content.action.vesselType.save.tip=Sauver les modifications du type de navire
-observe.content.action.weightCategory.create.tip=Créer une nouvelle catégorie de poids
-observe.content.action.weightCategory.delete.tip=Supprimer la catégorie de poids sélectionnée
-observe.content.action.weightCategory.detail.tip=Voir les détails de la catégorie de poids sélectionnée
-observe.content.action.weightCategory.modify.tip=Modifier la catégorie de poids sélectionnée
-observe.content.action.weightCategory.save.tip=Sauver les modifications de la catégorie de poids
-observe.content.action.weightMeasureType.create.tip=Créer un nouveau type de mesure de poids
-observe.content.action.weightMeasureType.delete.tip=Supprimer le type de mesure de poids sélectionné
-observe.content.action.weightMeasureType.detail.tip=Voir les détails du type de mesure de poids sélectionné
-observe.content.action.weightMeasureType.modify.tip=Modifier le type de mesure de poids sélectionné
-observe.content.action.weightMeasureType.save.tip=Sauver les modifications du type de mesure de poids
-observe.content.action.wind.create.tip=Créer un nouveau vent Beaufort
-observe.content.action.wind.delete.tip=Supprimer le vent Beaufort sélectionné
-observe.content.action.wind.detail.tip=Voir les détails du vent Beaufort sélectionné
-observe.content.action.wind.modify.tip=Modifier le vent Beaufort sélectionné
-observe.content.action.wind.save.tip=Sauver les modifications du vent Beaufort
 observe.content.baitsComposition.action.create=Inserer cet appât
 observe.content.baitsComposition.action.create.tip=Inserer cet appât
 observe.content.baitsComposition.baitSettingStatus=État au filage
@@ -1185,65 +891,6 @@ observe.content.label.usage.referentiel.title=Référentiel '%1$s' (%2$d occurre
 observe.content.label.weightLengthFormula.info=La relation taille permet de calculer la taille à partir du poids, elle doit contenir la variable P
 observe.content.lengthWeightParameter.tab.general=Caractéristiques générales
 observe.content.lengthWeightParameter.tab.other=Autres caractéristiques
-observe.content.list.HookSize=Liste des tailles d'hameçon enregistrés
-observe.content.list.HookType=Liste des types d'hameçon enregistrés
-observe.content.list.baitHaulingStatus=Liste des statuts de l'appât au virage enregistrés
-observe.content.list.baitSettingStatus=Liste des statuts de l'appât au filage enregistrés
-observe.content.list.baitType=Liste des types d'appât enregistrés
-observe.content.list.catchFateLongline=Liste des devenirs capture enregistrés
-observe.content.list.country=Liste des pays enregistrés
-observe.content.list.detectionMode=Liste des modes de détection enregistrés
-observe.content.list.encounterType=Liste des types de rencontre enregistrés
-observe.content.list.fpaZone=Liste des zones FPA enregistrées
-observe.content.list.gear=Liste des équipements enregistrées
-observe.content.list.gearCaracteristic=Liste des caractéristiques d'équipement enregistrées
-observe.content.list.gearCaracteristicType=Liste des types de caractéristique enregistrés
-observe.content.list.harbour=Liste des ports enregistrés
-observe.content.list.healthness=Liste des états de santé enregistrés
-observe.content.list.hookPosition=Liste des positions d'hameçon enregistrées
-observe.content.list.itemHorizontalPosition=Liste des localisations de l'élément sur la ligne mère enregistrées
-observe.content.list.itemVerticalPosition=Liste des localisations de l'élément sur l'avançon enregistrées
-observe.content.list.lengthWeightParameter=Liste des paramétrages taille-poids thons
-observe.content.list.lightsticksColor=Liste des couleurs de cyalumes enregistrées
-observe.content.list.lightsticksType=Liste des types de cyalumes enregistrés
-observe.content.list.lineType=Liste des types de ligne enregistrés
-observe.content.list.maturityStatus=Liste des maturités enregistrées
-observe.content.list.mitigationType=Listes des types de mesure d'atténuation enregistrés
-observe.content.list.objectFate=Liste des devenirs objet enregistrés
-observe.content.list.objectOperation=Liste des opérations objet enregistrées
-observe.content.list.objectType=Liste des types d'opération enregistrés
-observe.content.list.observedSystem=Liste des systèmes observés enregistrés
-observe.content.list.ocean=Liste des océans enregistrés
-observe.content.list.operation=Liste des opérations sur balise enregistrées
-observe.content.list.organism=Liste des organismes enregistrés
-observe.content.list.person=Liste des personnes enregistrés
-observe.content.list.program=Liste des programmes enregistrés
-observe.content.list.reasonForDiscard=Liste des raisons de rejet enregistrées
-observe.content.list.reasonForNoFishing=Liste des non coup de senne enregistrées
-observe.content.list.reasonForNullSet=Liste des causes coup nul enregistrées
-observe.content.list.sensorBrand=Liste des marques de capteur enregistrées
-observe.content.list.sensorDataFormat=Liste des formats de données de capteur enregistrés
-observe.content.list.sensorType=Liste des types de capteur enregistrés
-observe.content.list.settingShape=Liste des formes au filage enregistrées
-observe.content.list.sex=Liste des sexes enregistrés
-observe.content.list.sizeMeasureType=Liste des types de mesure de taille enregistrés
-observe.content.list.speciesFate=Liste des devenirs de faune enregistrés
-observe.content.list.speciesFaune=[devrait s'appeler speciesNonTarget ou nonTargetSpecies]
-observe.content.list.speciesGroupSpecies=Liste des groupes d'espèce de faune enregistrés
-observe.content.list.speciesList=Liste des listes de favoris d'espèces enregistrées
-observe.content.list.speciesStatus=Liste des statuts d'espèce enregistrés
-observe.content.list.stomacFullness=Liste des niveaux de remplissage de l'estomac enregistrés
-observe.content.list.surroundingActivity=Liste des activités environnantes
-observe.content.list.transmittingBuoyType=Liste des types de balise enregistrées
-observe.content.list.tripType=Liste des types de marée enregistrés
-observe.content.list.vessel=Liste des bateaux enregistrés
-observe.content.list.vesselActivityLongline=Liste des activités bateau enregistrées
-observe.content.list.vesselActivitySeine=Lise des activités bateau enregistrées
-observe.content.list.vesselSizeCategory=Liste des catégories de bateaux enregistrées
-observe.content.list.vesselType=Liste des types de bateaux enregistrés
-observe.content.list.weightCategory=Liste des catégories poids enregistrées
-observe.content.list.weightMeasureType=Liste des types de mesure de poids enregistrés
-observe.content.list.wind=Liste des vents Beaufort enregistrés
 observe.content.longlineDetailComposition.action.deleteAllSections=Tout supprimer
 observe.content.longlineDetailComposition.action.deleteAllSections.tip=Supprimer toutes les section - paniers et avançons
 observe.content.longlineDetailComposition.action.deleteSelectedBasket=Supprimer
@@ -1595,65 +1242,6 @@ observe.content.tdr.table.sensorBrand.tip=Marque du capteur
 observe.content.tdr.table.serialNo=N°
 observe.content.tdr.table.serialNo.tip=Numéro de série
 observe.content.tdr.title=Enregistreur de profondeur
-observe.content.title.HookSizes=Gestion des tailles d'hameçon
-observe.content.title.HookTypes=Gestion des types d'hameçon
-observe.content.title.baitHaulingStatuss=Gestion des statuts de l'appât au virage
-observe.content.title.baitSettingStatuss=Gestion des statuts de l'appât au filage
-observe.content.title.baitTypes=Gestion des types d'appât
-observe.content.title.catchFateLonglines=Gestion des devenirs capture
-observe.content.title.country=Gestion des pays
-observe.content.title.detectionModes=Gestion des modes de détection
-observe.content.title.encounterTypes=Gestion des types de rencontre
-observe.content.title.fpaZones=Gestion des zones FPA
-observe.content.title.gearCaracteristicTypes=Gestion des types de caractéristiques
-observe.content.title.gearCaracteristics=Gestion des caractéristiques d'équipement
-observe.content.title.gears=Gestion des équipements
-observe.content.title.harbours=GEstion des ports
-observe.content.title.healthnesss=Gestion des statuts de santé
-observe.content.title.hookPositions=Gestion des positions d'hameçon
-observe.content.title.itemHorizontalPositions=Gestion des localisations de l'élément sur la ligne mère
-observe.content.title.itemVerticalPositions=Gestion des localisations de l'élément sur l'avançon
-observe.content.title.lengthWeightParameters=Gestion des paramétrages taille-poids
-observe.content.title.lightsticksColors=Gestion des couleurs de baton lumineux
-observe.content.title.lightsticksTypes=Gestion des types de baton lumineux
-observe.content.title.lineTypes=Gestion des types de ligne
-observe.content.title.maturityStatuss=Gestion des maturité
-observe.content.title.mitigationTypes=Gestion des types de mesure d'atténuation
-observe.content.title.objectFates=Gestion des devenirs objet
-observe.content.title.objectOperations=Gestion des opérations objet
-observe.content.title.objectTypes=Gestion des types d'objet
-observe.content.title.observedSystems=Gestion des systèmes observés
-observe.content.title.oceans=Gestion des océans
-observe.content.title.organisms=Gestion des organismes
-observe.content.title.persons=Gestion des observateurs
-observe.content.title.programs=Gestion des programmes
-observe.content.title.reasonForDiscards=Gestion des raisons de rejet
-observe.content.title.reasonForNoFishings=Gestion des non coup de senne
-observe.content.title.reasonForNullSets=Gestion des causes coup nul
-observe.content.title.sensorBrands=Gestion des marques de capteur
-observe.content.title.sensorDataFormats=Gestion des formats de données de capteur
-observe.content.title.sensorTypes=Gestion des types de capteur
-observe.content.title.settingShapes=Gestion des formes au filage
-observe.content.title.sexx=Gestion des sexes
-observe.content.title.sizeMeasureTypes=Gestion des types de mesure de taille
-observe.content.title.speciesFates=Gestion des devenir d'espèces
-observe.content.title.speciesGroupSpeciess=Gestion des groupes d'espèces
-observe.content.title.speciesLists=Gestion des listes d'espèces
-observe.content.title.speciesStatuss=Gestion des statuts d'espèces
-observe.content.title.speciess=Gestion des espèces
-observe.content.title.stomacFullnesss=Gestion des niveaux de remplissage de l'estomac
-observe.content.title.surroundingActivitys=Gestion des activités environnantes
-observe.content.title.transmittingBuoyOperations=Gestion des opérations sur balise
-observe.content.title.transmittingBuoyTypes=Gestion des types de balise
-observe.content.title.tripTypes=Gestion des types de marée
-observe.content.title.vesselActivityLonglines=Gestion des types d'activité
-observe.content.title.vesselActivitySeines=Gestion des types d'activités
-observe.content.title.vesselSizeCategoryx=Gestion des catégories de navires
-observe.content.title.vesselTypex=Gestion des types de vessel
-observe.content.title.vesselx=Gestion des bateaux
-observe.content.title.weightCategory=Gestion des catégories poids
-observe.content.title.weightMeasureTypes=Gestion des types de mesure de poids
-observe.content.title.windSpeeds=Gestion des vents Beaufort
 observe.content.tripLongline.captain=Capitaine
 observe.content.tripLongline.dataEntryOperator=Opérateur de saisie
 observe.content.tripLongline.endDate=Date fin
@@ -2086,98 +1674,24 @@ observe.tree.action.collapseAll.tip=Tout grouper
 observe.tree.action.expandAll.tip=Tout déplier
 observe.tree.action.selectAll.tip=Tout sélectionner
 observe.tree.action.unselectAll.tip=Tout désélectionner
-observe.tree.activityLongline=Activités
-observe.tree.activityLongline.unsaved=Nouvelle activité
-observe.tree.activitySeine=Activités
-observe.tree.activitySeine.unsaved=Nouvelle activité
-observe.tree.baitHaulingStatus=Statut de l'appât au virage
-observe.tree.baitSettingStatus=Statut de l'appât au filage
-observe.tree.baitType=Type d'appât
-observe.tree.catchFateLongline=Devenir capture
-observe.tree.catchLongline=Captures
-observe.tree.country=Pays
-observe.tree.detectionMode=Mode détection
-observe.tree.encounter=Rencontres
-observe.tree.encounterType=Type de rencontre
-observe.tree.floatingObject.unsaved=Nouveau DCP
-observe.tree.fpaZone=Zone FPA
-observe.tree.gear=Équipement
-observe.tree.gearCaracteristic=Caractéristique d'un équipement
-observe.tree.gearCaracteristicType=Type de caractéristique d'équipement
-observe.tree.gearUseFeaturesLongline=Équipements
-observe.tree.gearUseFeaturesSeine=Équipements
-observe.tree.harbour=Port
-observe.tree.healthness=Statuts de la capture
-observe.tree.hookPosition=Position du hameçon
-observe.tree.hookSize=Taille d'hameçon
-observe.tree.hookType=Type d'hameçon
-observe.tree.itemHorizontalPosition=Localisation de l'élément sur la ligne mère
-observe.tree.itemVerticalPosition=Localisation de l'élément sur l'avançon
-observe.tree.lengthWeightParameter=Relation Taille-Poids
-observe.tree.lightsticksColor=Couleur de baton lumineux
-observe.tree.lightsticksType=Type de baton lumineux
-observe.tree.lineType=Type de ligne
-observe.tree.longlineDetailComposition=Schéma de palangre
-observe.tree.longlineGlobalComposition=Composition
-observe.tree.maturityStatus=Maturité
-observe.tree.mitigationType=Type de mesure d'atténuation
-observe.tree.nonTargetCatch=Faune accessoire conservée ou rejetée
-observe.tree.nonTargetSample=Echantillon faune accessoire
-observe.tree.objectFate=Devenir de l'objet
-observe.tree.objectObservedSpecies=Faune observée
-observe.tree.objectOperation=Opération sur l'objet
-observe.tree.objectSchoolEstimate=Estimation banc objet
-observe.tree.objectType=Type d'objet
-observe.tree.observedSystem=Système observé
-observe.tree.ocean=Océan
-observe.tree.organism=Organisme
-observe.tree.person=Personne
-observe.tree.program=Programme
-observe.tree.reasonForDiscard=Raison rejet
-observe.tree.reasonForNoFishing=Raison de non coup de Senne
-observe.tree.reasonForNullSet=Cause coup nul
-observe.tree.reference.common=Référentiel commun
-observe.tree.reference.longline=Référentiel Palangre
-observe.tree.reference.seine=Référentiel Senne
-observe.tree.route=Routes
-observe.tree.route.unsaved=Nouvelle route
-observe.tree.schoolEstimate=Estimation banc
-observe.tree.sensorBrand=Marque de capteur
-observe.tree.sensorDataFormat=Format de données de capteur
-observe.tree.sensorType=Type de capteur
-observe.tree.sensorUsed=Capteurs utilisés
-observe.tree.setLongline=Détails de l'opération
-observe.tree.setLongline.unsaved=Nouvelle opération de pêche
-observe.tree.setSeine=Calée
-observe.tree.setSeine.unsaved=Nouvelle calée
-observe.tree.settingShape=Forme au filage
-observe.tree.sex=Sexe
-observe.tree.sizeMeasureType=Type de mesure de taille
-observe.tree.species=Espèce
-observe.tree.speciesFate=Devenir espèce
-observe.tree.speciesGroup=Groupe espèce
-observe.tree.speciesList=Liste d'espèces
-observe.tree.speciesStatus=Statut faune observée
-observe.tree.stomacFullness=Niveau de remplissage de l'estomac
-observe.tree.surroundingActivity=Activité environnante
-observe.tree.targetCatch=Capture cible
-observe.tree.targetDiscarded=Rejet de thon
-observe.tree.targetSample=Echantillon thon rejeté
-observe.tree.targetSampleCapture=Echantillon thon capturé
-observe.tree.tdr=Enregistreurs de profondeur
-observe.tree.transmittingBuoyOperation=Opération balise
-observe.tree.transmittingBuoyType=Type de balise
-observe.tree.tripLongline.unsaved=Nouvelle marée
-observe.tree.tripSeine.unsaved=Nouvelle marée
-observe.tree.tripType=Type de marée
-observe.tree.vessel=Bateau
-observe.tree.vesselActivityLongline=Activité bateau
-observe.tree.vesselActivitySeine=Activité bateau
-observe.tree.vesselSizeCategory=Catégorie de bateau
-observe.tree.vesselType=Type de pêcherie
-observe.tree.weightCategory=Catégorie de poids
-observe.tree.weightMeasureType=Type de mesure de poids
-observe.tree.wind=Vent Beaufort
+observe.type.action.create=Créer un objet de type '%s'
+observe.type.action.delete=Supprimer l'objet de type '%s' sélectionné
+observe.type.action.edit=Modifier l'objet de type '%s' sélectionné
+observe.type.action.save=Sauver les modifications sur l'objet de type '%s'
+observe.type.action.view=Voir les détails de l'objet de type '%s' sélectionné
+observe.type.activityLongline.unsaved=Nouvelle activité
+observe.type.activitySeine.unsaved=Nouvelle activité
+observe.type.floatingObject.unsaved=Nouveau DCP
+observe.type.list=Liste des %s
+observe.type.management=Gestion des %s
+observe.type.reference.common=Référentiel commun
+observe.type.reference.longline=Référentiel Palangre
+observe.type.reference.seine=Référentiel Senne
+observe.type.route.unsaved=Nouvelle route
+observe.type.setLongline.unsaved=Nouvelle opération de pêche
+observe.type.setSeine.unsaved=Nouvelle calée
+observe.type.tripLongline.unsaved=Nouvelle marée
+observe.type.tripSeine.unsaved=Nouvelle marée
 observe.validator.field.tip=Propriété '%1$s'
 observe.validator.message.tip=Message \: %1$s
 observe.validator.scope.tip=Type de message \: '%1$s'

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

    

[Observe-commits] 10/13: Use observe.type i18n instead of observe.tree, clean up a lots of code... + use new decorator api + refactor i18n (-400 trads \o/)

codelutin.com scm