branch support/3.13.x updated (a225896 -> 9fe1ed4)
This is an automated email from the git hooks/post-receive script. New change to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git from a225896 fixes #6993: [AIDE] probleme d'affichage de l'aide en ligne, cf copie écran Merge branch 'feature/6993' into support/3.13.x new 58828ee refs #6924 changement traduction new 5a1e8d4 fixes #6924: [CAPTURE] modifier le libellé du champ Poids à "Poids individuel" dans le formulaire de création d'une observation individuelle Merge branch 'feature/6924' into support/3.13.x new 4ba8b0b refs #6916 le bouton de choix des synonymes d'espèce ne capture plus le focus new 9fe1ed4 fixes #6916: [ERGO] ne pas passer sur le bouton [...] quand je suis sur le champ espèce et que je tappe sur [Tab] Merge branch 'feature/6916' into support/3.13.x The 4 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 9fe1ed4738a7633ad5e0c4682ba7648fb390db18 Merge: 5a1e8d4 4ba8b0b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 21 10:48:42 2015 +0200 fixes #6916: [ERGO] ne pas passer sur le bouton [...] quand je suis sur le champ espèce et que je tappe sur [Tab] Merge branch 'feature/6916' into support/3.13.x commit 4ba8b0b52fe2acd9ba9d8ba2a8e287c39a5870da Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 21 10:48:38 2015 +0200 refs #6916 le bouton de choix des synonymes d'espèce ne capture plus le focus commit 5a1e8d4cce164eaa9db9478c0ea0b4d0099cca3a Merge: a225896 58828ee Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 21 10:33:19 2015 +0200 fixes #6924: [CAPTURE] modifier le libellé du champ Poids à "Poids individuel" dans le formulaire de création d'une observation individuelle Merge branch 'feature/6924' into support/3.13.x commit 58828ee2d7995fb1b5431524e1e9b19046848a5e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 21 10:33:07 2015 +0200 refs #6924 changement traduction Summary of changes: .../operation/catches/benthos/create/CreateBenthosBatchUI.css | 1 + .../create/CreateIndividualObservationBatchUI.css | 1 + .../operation/catches/species/create/CreateSpeciesBatchUI.css | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +++--- 4 files changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit 58828ee2d7995fb1b5431524e1e9b19046848a5e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 21 10:33:07 2015 +0200 refs #6924 changement traduction --- .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 9f7b40e..f462188 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -240,8 +240,8 @@ tutti.createIndividualObservationBatch.field.individualObservationSize=Taille tutti.createIndividualObservationBatch.field.individualObservationSize.tip=Taille tutti.createIndividualObservationBatch.field.individualObservationSpecies=Espèce tutti.createIndividualObservationBatch.field.individualObservationSpecies.tip=Espèce -tutti.createIndividualObservationBatch.field.individualObservationWeight=Poids -tutti.createIndividualObservationBatch.field.individualObservationWeight.tip=Poids +tutti.createIndividualObservationBatch.field.individualObservationWeight=Poids individuel +tutti.createIndividualObservationBatch.field.individualObservationWeight.tip=Poids individuel tutti.createIndividualObservationBatch.title=Créer une observation tutti.createIndividualObservationBatch.warn.nocount=Aucune donnée individuelle pour l'espèce <strong>%s</strong> ne sera remplie pour la raison suivante\:<br/>Aucune mensuration (ou dénombrement) renseigné pour cette espèce dans l'onglet <strong>Espèces</strong>. tutti.createIndividualObservationBatch.warn.nocount.title=Pas de mensuration pour l'éespèce sélectionnée @@ -850,7 +850,7 @@ tutti.editIndividualObservationBatch.table.header.size.tip=Taille tutti.editIndividualObservationBatch.table.header.species=Espèce tutti.editIndividualObservationBatch.table.header.species.tip=Espèce tutti.editIndividualObservationBatch.table.header.weight=Poids -tutti.editIndividualObservationBatch.table.header.weight.tip=Poids +tutti.editIndividualObservationBatch.table.header.weight.tip=Poids individuel tutti.editIndividualObservationCaracteristics.action.cancel=Annuler tutti.editIndividualObservationCaracteristics.action.cancel.mnemonic=A tutti.editIndividualObservationCaracteristics.action.cancel.tip=Annuler l'édition des caractéristiques de l'observation -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit 5a1e8d4cce164eaa9db9478c0ea0b4d0099cca3a Merge: a225896 58828ee Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 21 10:33:19 2015 +0200 fixes #6924: [CAPTURE] modifier le libellé du champ Poids à "Poids individuel" dans le formulaire de création d'une observation individuelle Merge branch 'feature/6924' into support/3.13.x .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit 4ba8b0b52fe2acd9ba9d8ba2a8e287c39a5870da Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 21 10:48:38 2015 +0200 refs #6916 le bouton de choix des synonymes d'espèce ne capture plus le focus --- .../content/operation/catches/benthos/create/CreateBenthosBatchUI.css | 1 + .../individualobservation/create/CreateIndividualObservationBatchUI.css | 1 + .../content/operation/catches/species/create/CreateSpeciesBatchUI.css | 1 + 3 files changed, 3 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css index 75e1332..d2849d3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css @@ -141,6 +141,7 @@ NumberEditor { text: "tutti.createBenthosBatch.action.addSpecies"; toolTipText: "tutti.createBenthosBatch.action.addSpecies.tip"; i18nMnemonic: "tutti.createBenthosBatch.action.addSpecies.mnemonic"; + focusable: false; _applicationAction: {fr.ifremer.tutti.ui.swing.action.SelectSpeciesForBenthosBatchAction.class}; _help: {"tutti.createBenthosBatch.action.addSpecies.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css index 2da9999..4ae80b7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css @@ -102,6 +102,7 @@ NumberEditor { text: "tutti.createIndividualObservationBatch.action.addSpecies"; toolTipText: "tutti.createIndividualObservationBatch.action.addSpecies.tip"; i18nMnemonic: "tutti.createIndividualObservationBatch.action.addSpecies.mnemonic"; + focusable: false; _applicationAction: {fr.ifremer.tutti.ui.swing.action.SelectSpeciesForIndividualObservationBatchAction.class}; _help: {"tutti.createIndividualObservationBatch.action.addSpecies.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css index b40fa6f..61989b8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css @@ -141,6 +141,7 @@ NumberEditor { text: "tutti.createSpeciesBatch.action.addSpecies"; toolTipText: "tutti.createSpeciesBatch.action.addSpecies.tip"; i18nMnemonic: "tutti.createSpeciesBatch.action.addSpecies.mnemonic"; + focusable: false; _applicationAction: {fr.ifremer.tutti.ui.swing.action.SelectSpeciesForSpeciesBatchAction.class}; _help: {"tutti.createSpeciesBatch.action.addSpecies.help"}; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit 9fe1ed4738a7633ad5e0c4682ba7648fb390db18 Merge: 5a1e8d4 4ba8b0b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 21 10:48:42 2015 +0200 fixes #6916: [ERGO] ne pas passer sur le bouton [...] quand je suis sur le champ espèce et que je tappe sur [Tab] Merge branch 'feature/6916' into support/3.13.x .../content/operation/catches/benthos/create/CreateBenthosBatchUI.css | 1 + .../individualobservation/create/CreateIndividualObservationBatchUI.css | 1 + .../content/operation/catches/species/create/CreateSpeciesBatchUI.css | 1 + 3 files changed, 3 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm