This is an automated email from the git hooks/post-receive script. New commit to branch feature/7623 in repository observe. See http://git.codelutin.com/observe.git commit 51c988f0d6d6edea8cb0f9a507fffbd7e913741c Author: Kevin Morin <morin@codelutin.com> Date: Wed Nov 18 12:44:21 2015 +0100 wording (refs #7623) --- .../observe/ui/tree/ObserveNavigationTreeShowPopupAction.java | 2 +- .../resources/i18n/observe-application-swing_en_GB.properties | 10 ++++++++++ .../resources/i18n/observe-application-swing_es_ES.properties | 10 ++++++++++ .../resources/i18n/observe-application-swing_fr_FR.properties | 8 ++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java index cd0dc65..38ca04e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -74,7 +74,7 @@ public class ObserveNavigationTreeShowPopupAction { static { n("observe.navigationMenu.move.trip"); n("observe.navigationMenu.move.route"); - n("observe.navigationMenu.move.activity"); + n("observe.navigationMenu.move.activitySeine"); } private final ObserveTreeHelper treeHelper; 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 f6f520e..93f97b3 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 @@ -55,10 +55,14 @@ observe.action.choose.program.title= observe.action.choose.report.directory=Choose reports directory observe.action.choose.reportFile=Choose the reports directory observe.action.choose.reportFile.description=Report's file (*.properties) +observe.action.choose.route.message= +observe.action.choose.route.title= observe.action.choose.sensorUsed.exportData= observe.action.choose.sensorUsed.importData= observe.action.choose.tdr.exportData= observe.action.choose.tdr.importData= +observe.action.choose.tripSeine.message= +observe.action.choose.tripSeine.title= observe.action.close=Close observe.action.close.activity.tip=Close the opened activity observe.action.close.maree.tip=Clse the opened maree @@ -284,6 +288,10 @@ observe.action.mitigationType.detail.tip= observe.action.mitigationType.modify.tip= observe.action.mitigationType.save.tip= observe.action.modify=Modify +observe.action.move.activities= +observe.action.move.activities.tip= +observe.action.move.actvities= +observe.action.move.actvities.tip= observe.action.move.maree= observe.action.move.maree.tip= observe.action.move.routes= @@ -1560,6 +1568,8 @@ observe.navigationMenu.closeRouteAction= observe.navigationMenu.closeTripAction= observe.navigationMenu.deleteRouteAction= observe.navigationMenu.deleteTripAction= +observe.navigationMenu.move.activity= +observe.navigationMenu.move.activitySeine= observe.navigationMenu.move.route= observe.navigationMenu.move.trip= observe.navigationMenu.moveRoute= 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 48f5351..a92dbfb 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 @@ -55,10 +55,14 @@ observe.action.choose.program.title= observe.action.choose.report.directory=Elegir el directorio de los informes observe.action.choose.reportFile=Elegir el archivo de definición de informe observe.action.choose.reportFile.description=Archivo de definición (*.properties) +observe.action.choose.route.message= +observe.action.choose.route.title= observe.action.choose.sensorUsed.exportData= observe.action.choose.sensorUsed.importData= observe.action.choose.tdr.exportData= observe.action.choose.tdr.importData= +observe.action.choose.tripSeine.message= +observe.action.choose.tripSeine.title= observe.action.close=Cerrar observe.action.close.activity.tip=Cierre de la actividad abierta observe.action.close.maree.tip=Cierre de la marea abierta @@ -284,6 +288,10 @@ observe.action.mitigationType.detail.tip= observe.action.mitigationType.modify.tip= observe.action.mitigationType.save.tip= observe.action.modify=Modificar +observe.action.move.activities= +observe.action.move.activities.tip= +observe.action.move.actvities= +observe.action.move.actvities.tip= observe.action.move.maree= observe.action.move.maree.tip= observe.action.move.routes= @@ -1562,6 +1570,8 @@ observe.navigationMenu.closeRouteAction= observe.navigationMenu.closeTripAction= observe.navigationMenu.deleteRouteAction= observe.navigationMenu.deleteTripAction= +observe.navigationMenu.move.activity= +observe.navigationMenu.move.activitySeine= observe.navigationMenu.move.route= observe.navigationMenu.move.trip= observe.navigationMenu.moveRoute= 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 b1bbaaa..cf4f7e9 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 @@ -53,10 +53,14 @@ observe.action.choose.program.title=Changer le programme des marées observe.action.choose.report.directory=Choisir le répertoire des rapports observe.action.choose.reportFile=Choisir le fichier de définition de report observe.action.choose.reportFile.description=Fichier de définition (*.properties) +observe.action.choose.route.message=A quelle route voulez-vous associer les activités sélectionnées ? +observe.action.choose.route.title=Changer la route des activités observe.action.choose.sensorUsed.exportData=Exporter le fichier de données observe.action.choose.sensorUsed.importData=Importer le fichier de données observe.action.choose.tdr.exportData=Exporter le fichier de données observe.action.choose.tdr.importData=Importer le fichier de données +observe.action.choose.tripSeine.message=A quelle marée voulez-vous associer les routes sélectionnées ? +observe.action.choose.tripSeine.title=Changer la marée des routes observe.action.close=Fermer observe.action.close.activity.tip=Clôturer l'activité ouverte observe.action.close.maree.tip=Clôturer la marée ouverte @@ -282,6 +286,8 @@ observe.action.mitigationType.detail.tip=Voir les détails du type de mesure d'a observe.action.mitigationType.modify.tip=Modifier le type de mesure d'atténuation sélectionné observe.action.mitigationType.save.tip=Sauver les modifications du type de mesure d'atténuation observe.action.modify=Modifier +observe.action.move.activities=Changer de route +observe.action.move.activities.tip=Changer la route des activités sélectionnées observe.action.move.routes=Changer de marée observe.action.move.routes.tip=Changer la marée des routes sélectionnées observe.action.move.trips=Changer de programme @@ -1551,6 +1557,8 @@ observe.navigationMenu.closeRouteAction=Clôturer la route observe.navigationMenu.closeTripAction=Clôturer la marée observe.navigationMenu.deleteRouteAction=Supprimer la route observe.navigationMenu.deleteTripAction=Supprimer la marée +observe.navigationMenu.move.activity=Changer de route +observe.navigationMenu.move.activitySeine= observe.navigationMenu.move.route=Changer de marée observe.navigationMenu.move.trip=Réallocation du programme observe.navigationMenu.noAction=< Aucune action définie > -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.