This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 4d109c448f937d6bccfecc8de9c668cf7b565367 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:09:34 2016 +0100 Ajout des traduction pour les typed'opération et les type de balise (reste à les faire fonctionner avec l'EnumEditor) --- .../fr/ird/observe/db/constants/ConstantsI18n.java | 21 +++++++++++++++++++++ .../i18n/observe-application-swing_en_GB.properties | 8 ++++++++ .../i18n/observe-application-swing_es_ES.properties | 8 ++++++++ .../i18n/observe-application-swing_fr_FR.properties | 8 ++++++++ 4 files changed, 45 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java index 529f6ce..7d97735 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java @@ -1,6 +1,8 @@ package fr.ird.observe.db.constants; +import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.SchoolType; +import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -14,10 +16,29 @@ public class ConstantsI18n { n("observe.schoolType.undefined"); n("observe.schoolType.objet"); n("observe.schoolType.libre"); + + n("observe.typeTransmittingBuoyOperation.pasDeBalise"); + n("observe.typeTransmittingBuoyOperation.visite"); + n("observe.typeTransmittingBuoyOperation.recuperation"); + n("observe.typeTransmittingBuoyOperation.pose"); + n("observe.typeTransmittingBuoyOperation.recuperationEtRemplacement"); + + n("observe.ownership.unknown"); + n("observe.ownership.ceVessel"); + n("observe.ownership.autreVessel"); + } public static String getLabel(SchoolType schoolType) { return t("observe.schoolType." + schoolType.name()); } + public static String getLabel(TypeTransmittingBuoyOperation typeTransmittingBuoyOperation) { + return t("observe.typeTransmittingBuoyOperation." + typeTransmittingBuoyOperation.name()); + } + + public static String getLabel(Ownership ownership) { + return t("observe.ownership." + ownership.name()); + } + } 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 edc7187..f5da3ec 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 @@ -1628,6 +1628,9 @@ observe.obstuna.action.security= observe.obstuna.action.security.description= observe.obstuna.action.update= observe.obstuna.action.update.description= +observe.ownership.autreVessel=Other vessel +observe.ownership.ceVessel=This vessel +observe.ownership.unknown=Unknown observe.person.country=Nationality observe.program.tab.general=General caracteristics observe.program.tab.observations=Observations @@ -2403,6 +2406,11 @@ observe.tripSeine.message.updating=Updating a trip observe.tripSeine.tab.general=Caracteristics observe.tripSeine.tab.map=Map observe.tripSeine.title=Trip +observe.typeTransmittingBuoyOperation.pasDeBalise=No Beacon +observe.typeTransmittingBuoyOperation.pose=Posing +observe.typeTransmittingBuoyOperation.recuperation=Grab +observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change +observe.typeTransmittingBuoyOperation.visite=Visit observe.validation.model.type.all= observe.validation.model.type.all.description= observe.validation.model.type.data= 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 da2e158..b54b83a 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 @@ -1630,6 +1630,9 @@ observe.obstuna.action.security=Actualización de seguridad de Obstuna observe.obstuna.action.security.description=Actualización de securidad de una base remota Obstuna observe.obstuna.action.update=Actualización de Obstuna observe.obstuna.action.update.description=Actualización de una base remota Obstuna +observe.ownership.autreVessel=Barco ajeno +observe.ownership.ceVessel=Este barco o un barco del mismo armador +observe.ownership.unknown=Desconocido observe.person.country=Nacionalidad observe.program.tab.general= observe.program.tab.observations= @@ -2405,6 +2408,11 @@ observe.tripSeine.message.updating= observe.tripSeine.tab.general= observe.tripSeine.tab.map=Mapa observe.tripSeine.title= +observe.typeTransmittingBuoyOperation.pasDeBalise=DCP sin balizar +observe.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza +observe.typeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua +observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza +observe.typeTransmittingBuoyOperation.visite=Visita a la baliza observe.validation.model.type.all=Datos y referenciales observe.validation.model.type.all.description=Datos y referenciales observe.validation.model.type.data=Datos del observador 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 73dc619..f0b5e51 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 @@ -1615,6 +1615,9 @@ observe.obstuna.action.security=Mise à jour de la sécurité d'obstuna observe.obstuna.action.security.description=Mise à jour de la sécurité d'une base distante obstuna observe.obstuna.action.update=Mise à jour d'obstuna observe.obstuna.action.update.description=Mise à jour d'une base distante obstuna +observe.ownership.autreVessel=Navire d'un autre armement +observe.ownership.ceVessel=Ce navire ou cet armement +observe.ownership.unknown=Inconnue observe.person.country=Nationalité observe.program.tab.general=Caractértistiques générales observe.program.tab.observations=Observations @@ -2395,6 +2398,11 @@ observe.tripSeine.message.updating=La maréee est en cours de modification. observe.tripSeine.tab.general=Caractéristiques observe.tripSeine.tab.map=Carte observe.tripSeine.title=Marée +observe.typeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP +observe.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau +observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.visite=observe.typeTransmittingBuoyOperation.visite\= observe.validation.model.type.all=Données et référentiels observe.validation.model.type.all.description=Données et référentiels observe.validation.model.type.data=Données observées -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.