branch develop-3.x updated (197200c -> 3ae69f3)
This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git from 197200c fixes #7042: [IMPORT BIGFIN] erreur import fichier bigfin sur lot sexé Merge branch 'feature/7042' into develop-3.x new 9b74d5f lissage des traductions (refs #7040) new 3ae69f3 fixes #7040: Les libéllés dans les onglets espèces - benthos - macro-déchets non cohérent avec l'écran résumé Merge branch 'feature/7040' into develop-3.x The 2 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 3ae69f3abe765b901cdda72e92c3fae3f2d0a19b Merge: 197200c 9b74d5f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 11:48:07 2015 +0200 fixes #7040: Les libéllés dans les onglets espèces - benthos - macro-déchets non cohérent avec l'écran résumé Merge branch 'feature/7040' into develop-3.x commit 9b74d5fa940193be4857f81f31890029800b3709 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 11:48:04 2015 +0200 lissage des traductions (refs #7040) Summary of changes: .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit 9b74d5fa940193be4857f81f31890029800b3709 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 11:48:04 2015 +0200 lissage des traductions (refs #7040) --- .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 f462188..ffd4b4e 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 @@ -447,11 +447,11 @@ tutti.editBenthosBatch.field.benthosTotalInertWeight=Poids inerte trié tutti.editBenthosBatch.field.benthosTotalInertWeight.tip=Poids de la fraction inerte restante après le tri du benthos (cailloux, vase, débris coquilliers, etc.) tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight=Poids vivant non détaillé trié tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.tip=Poids de la fraction vivante restante après le tri du benthos (algues, matières vivantes non reconnaissable, etc.) -tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié +tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight=Poids total Vrac observé tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.tip=Poids total du benthos trié -tutti.editBenthosBatch.field.benthosTotalSortedWeight=Poids total VRAC +tutti.editBenthosBatch.field.benthosTotalSortedWeight=Poids total Vrac isolé tutti.editBenthosBatch.field.benthosTotalSortedWeight.tip=Poids total VRAC des espèces de type benthos dans la capture -tutti.editBenthosBatch.field.benthosTotalUnsortedWeight=Poids total HORS VRAC +tutti.editBenthosBatch.field.benthosTotalUnsortedWeight=Poids total HORS VRAC observé tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces de type benthos dans la capture tutti.editBenthosBatch.field.benthosTotalWeight=Poids TOTAL tutti.editBenthosBatch.field.benthosTotalWeight.tip=Poids total des espèces de type benthos dans la capture (Vrac + Hors Vrac) @@ -1150,12 +1150,12 @@ tutti.editSpeciesBatch.field.speciesTotalInertWeight=Poids inerte trié tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip=Poids de la fraction inerte restante après le tri des espèces (cailloux, vase, débris coquilliers, etc.) tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip=Poids de la fraction vivante restante après le tri des espèces (algues, matières vivantes non reconnaissable, etc.) -tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight=Poids total Vrac observé tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) -tutti.editSpeciesBatch.field.speciesTotalSortedWeight=Poids total VRAC +tutti.editSpeciesBatch.field.speciesTotalSortedWeight=Poids total Vrac isolé tutti.editSpeciesBatch.field.speciesTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (poissons, crustacés etc.) -tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC -tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (sans les captures accidentelles) +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC observé +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip=Poids total HORS VRAC observé des espèces dans la capture (sans les captures accidentelles) tutti.editSpeciesBatch.field.speciesTotalWeight=Poids TOTAL tutti.editSpeciesBatch.field.speciesTotalWeight.tip=Poids total des espèces dans la capture (poissons, crustacés etc.) tutti.editSpeciesBatch.filterBatch=Filtre -- 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 develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit 3ae69f3abe765b901cdda72e92c3fae3f2d0a19b Merge: 197200c 9b74d5f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 11:48:07 2015 +0200 fixes #7040: Les libéllés dans les onglets espèces - benthos - macro-déchets non cohérent avec l'écran résumé Merge branch 'feature/7040' into develop-3.x .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm