branch develop updated (580ed6a -> dd02f87)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 580ed6a Ajout de plus de log pour voir essayer de voir comment sont fermées les data source new dd02f87 Correction du label d'un noeud de création + correction des traductions correspondantes The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit dd02f87bbe42b6e1f5ea2eae341c085d9a0add35 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 22 08:31:24 2015 +0200 Correction du label d'un noeud de création + correction des traductions correspondantes Summary of changes: .../java/fr/ird/observe/ui/content/ContentUIManager.java | 12 ++++++------ .../i18n/observe-application-swing_en_GB.properties | 10 +--------- .../i18n/observe-application-swing_es_ES.properties | 12 ++---------- .../i18n/observe-application-swing_fr_FR.properties | 12 ++++++------ 4 files changed, 15 insertions(+), 31 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit dd02f87bbe42b6e1f5ea2eae341c085d9a0add35 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 22 08:31:24 2015 +0200 Correction du label d'un noeud de création + correction des traductions correspondantes --- .../java/fr/ird/observe/ui/content/ContentUIManager.java | 12 ++++++------ .../i18n/observe-application-swing_en_GB.properties | 10 +--------- .../i18n/observe-application-swing_es_ES.properties | 12 ++---------- .../i18n/observe-application-swing_fr_FR.properties | 12 ++++++------ 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index 873964d..6a5ac2b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -124,16 +124,16 @@ public class ContentUIManager { addMapping(DATA, ProgramDto.class, GearType.seine.name(), TripSeinesUI.class); addMapping(DATA, TripSeineDto.class, TripSeineUI.class); - addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeineDto.unsaved"), 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, RouteDto.class, RouteUI.class); - addMapping(DATA, RouteDto.class, n("observe.tree.routeDto.unsaved"), 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, ActivitySeineDto.class, ActivitySeineUI.class); - addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeineDto.unsaved"), 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, SetSeineDto.class, SetSeineUI.class); @@ -158,17 +158,17 @@ public class ContentUIManager { addMapping(DATA, ProgramDto.class, GearType.longline.name(), TripLonglinesUI.class); addMapping(DATA, TripLonglineDto.class, TripLonglineUI.class); - addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLonglineDto.unsaved"), 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, ActivityLonglineDto.class, ActivityLonglineUI.class); - addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLonglineDto.unsaved"), ActivityLonglineUI.class); + addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER, EncounterUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED, SensorUsedUI.class); addMapping(DATA, SetLonglineDto.class, SetLonglineUI.class); - addMapping(DATA, SetLonglineDto.class, n("observe.tree.setLonglineDto.unsaved"), 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); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index cb0dd3a..108bca2 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -2239,10 +2239,8 @@ observe.title.validate.tip=Validate datas of a storage observe.title.welcome.admin=Observe Admin observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity -observe.tree.activityLonglineDto.unsaved= observe.tree.activitySeine=Activity observe.tree.activitySeine.unsaved=New activity -observe.tree.activitySeineDto.unsaved= observe.tree.baitHaulingStatus=Bait hauling status observe.tree.baitSettingStatus=Bait setting status observe.tree.baitType=Bait type @@ -2253,7 +2251,6 @@ observe.tree.detectionMode=Detection mode observe.tree.encounter=Encounter observe.tree.encounterType= observe.tree.floatingObject.unsaved=New DCP -observe.tree.floatingObjectDto.unsaved= observe.tree.fpaZone=Fpa zone observe.tree.gear=Gear observe.tree.gearCaracteristic=Gear caracteristic @@ -2295,7 +2292,6 @@ observe.tree.reference.longline=Longline Referential observe.tree.reference.seine=Seine Referential observe.tree.route=Road observe.tree.route.unsaved=New route -observe.tree.routeDto.unsaved= observe.tree.schoolEstimate=School estimate observe.tree.sensorBrand=Sensor brand observe.tree.sensorDataFormat=Sensor data format @@ -2303,10 +2299,8 @@ observe.tree.sensorType=Sensor type observe.tree.sensorUsed=Sensor used observe.tree.setLongline= observe.tree.setLongline.unsaved=New fishing operation -observe.tree.setLonglineDto.unsaved= -observe.tree.setSeine= +observe.tree.setSeine=Fishing operation observe.tree.setSeine.unsaved=New set -observe.tree.setSeineDto.unsaved= observe.tree.settingShape=Setting shape observe.tree.sex=Sex observe.tree.sizeMeasureType=Size measure type @@ -2325,9 +2319,7 @@ observe.tree.tdr=TDR observe.tree.transmittingBuoyOperation=Transmitting buoy operation observe.tree.transmittingBuoyType=Transmitting buoy type observe.tree.tripLongline.unsaved=New trip -observe.tree.tripLonglineDto.unsaved= observe.tree.tripSeine.unsaved=New trip -observe.tree.tripSeineDto.unsaved= observe.tree.tripType=Trip type observe.tree.vessel=Boat observe.tree.vesselActivityLongline=Boat activity diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 29a9f9c..faa9f19 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -2240,11 +2240,9 @@ observe.title.validate= observe.title.validate.tip= observe.title.welcome.admin= observe.tree.activityLongline=Actividad -observe.tree.activityLongline.unsaved= -observe.tree.activityLonglineDto.unsaved= +observe.tree.activityLongline.unsaved=Nueva actividad observe.tree.activitySeine=Actividad -observe.tree.activitySeine.unsaved= -observe.tree.activitySeineDto.unsaved= +observe.tree.activitySeine.unsaved=Nueva actividad observe.tree.baitHaulingStatus= observe.tree.baitSettingStatus= observe.tree.baitType= @@ -2255,7 +2253,6 @@ observe.tree.detectionMode=Modo de detección observe.tree.encounter= observe.tree.encounterType= observe.tree.floatingObject.unsaved=Nuevo DCP -observe.tree.floatingObjectDto.unsaved= observe.tree.fpaZone= observe.tree.gear= observe.tree.gearCaracteristic= @@ -2297,7 +2294,6 @@ observe.tree.reference.longline= observe.tree.reference.seine= observe.tree.route=Ruta observe.tree.route.unsaved=Nueva ruta -observe.tree.routeDto.unsaved= observe.tree.schoolEstimate=Estimación del banco observe.tree.sensorBrand= observe.tree.sensorDataFormat= @@ -2305,10 +2301,8 @@ observe.tree.sensorType= observe.tree.sensorUsed= observe.tree.setLongline= observe.tree.setLongline.unsaved=Nuevo Lance -observe.tree.setLonglineDto.unsaved= observe.tree.setSeine= observe.tree.setSeine.unsaved=Nuevo Lance -observe.tree.setSeineDto.unsaved= observe.tree.settingShape= observe.tree.sex=Sexo observe.tree.sizeMeasureType= @@ -2327,9 +2321,7 @@ observe.tree.tdr= observe.tree.transmittingBuoyOperation= observe.tree.transmittingBuoyType= observe.tree.tripLongline.unsaved=Nueva marea -observe.tree.tripLonglineDto.unsaved= observe.tree.tripSeine.unsaved=Nueva marea -observe.tree.tripSeineDto.unsaved= observe.tree.tripType= observe.tree.vessel=Barco observe.tree.vesselActivityLongline= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index f27351e..24b6ff0 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -2238,9 +2238,9 @@ observe.title.validate=Validation des données observe.title.validate.tip=Valider les données d'une source de données observe.title.welcome.admin=Observe Administrateur observe.tree.activityLongline=Activités -observe.tree.activityLonglineDto.unsaved=Nouvelle activité +observe.tree.activityLongline.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -observe.tree.activitySeineDto.unsaved=Nouvelle activité +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 @@ -2291,14 +2291,14 @@ 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.routeDto.unsaved=Nouvelle route +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.setLonglineDto.unsaved=Nouvelle opération de pêche +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 @@ -2318,8 +2318,8 @@ 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.tripLonglineDto.unsaved=Nouvelle marée -observe.tree.tripSeineDto.unsaved=Nouvelle marée +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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm