Author: tchemit Date: 2013-11-26 17:19:57 +0100 (Tue, 26 Nov 2013) New Revision: 1396 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1396 Log: fixes #3869: [CAPTURE] harmoniser les intitul?\195?\169s des boutons cr?\195?\169er - cr?\195?\169er et fermer Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx 2013-11-26 16:16:18 UTC (rev 1395) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx 2013-11-26 16:19:57 UTC (rev 1396) @@ -137,7 +137,6 @@ <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> <JButton id='saveAndContinueButton' onActionPerformed='handler.saveAndContinue()'/> - <!--<JButton id='saveFromBatchAndCloseButton' onActionPerformed='handler.saveFromBatchAndClose()'/>--> <JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/> </JPanel> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-11-26 16:16:18 UTC (rev 1395) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-11-26 16:19:57 UTC (rev 1396) @@ -242,7 +242,7 @@ tutti.createIndividualObservationBatch.action.saveAndClose=Créer et Fermer tutti.createIndividualObservationBatch.action.saveAndClose.mnemonic=F tutti.createIndividualObservationBatch.action.saveAndClose.tip=Créer l'observation individuelle et fermer -tutti.createIndividualObservationBatch.action.saveAndContinue=Créer et Continuer +tutti.createIndividualObservationBatch.action.saveAndContinue=Créer tutti.createIndividualObservationBatch.action.saveAndContinue.mnemonic=C tutti.createIndividualObservationBatch.action.saveAndContinue.tip=Créer et saisir une nouvelle observation indidivuelle tutti.createIndividualObservationBatch.confirm.alreadyUsedSpecies.help=Que voulez-vous faire?<ul><li><strong>Annuler</strong> pour annuler la création des données individuelles</li><li><strong>Ok</strong> pour confirmer la création des données individuellesd</li></ul>