Coser-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
December 2011
- 2 participants
- 23 discussions
04 Dec '11
Author: echatellier
Date: 2011-12-04 22:50:34 +0100 (Sun, 04 Dec 2011)
New Revision: 912
Url: http://forge.codelutin.com/repositories/revision/coser/912
Log:
Update libs
Modified:
trunk/coser-business/pom.xml
trunk/coser-ui/pom.xml
trunk/pom.xml
Modified: trunk/coser-business/pom.xml
===================================================================
--- trunk/coser-business/pom.xml 2011-12-01 13:23:26 UTC (rev 911)
+++ trunk/coser-business/pom.xml 2011-12-04 21:50:34 UTC (rev 912)
@@ -86,11 +86,11 @@
<artifactId>javassist</artifactId>
</dependency>
<dependency>
- <groupId>org.jfree</groupId>
+ <groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
<dependency>
- <groupId>org.jfree</groupId>
+ <groupId>jfree</groupId>
<artifactId>jcommon</artifactId>
</dependency>
<dependency>
Modified: trunk/coser-ui/pom.xml
===================================================================
--- trunk/coser-ui/pom.xml 2011-12-01 13:23:26 UTC (rev 911)
+++ trunk/coser-ui/pom.xml 2011-12-04 21:50:34 UTC (rev 912)
@@ -101,7 +101,7 @@
<artifactId>jxlayer</artifactId>
</dependency>
<dependency>
- <groupId>org.jfree</groupId>
+ <groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-12-01 13:23:26 UTC (rev 911)
+++ trunk/pom.xml 2011-12-04 21:50:34 UTC (rev 912)
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<scope>compile</scope>
</dependency>
@@ -117,27 +117,27 @@
<dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-validator</artifactId>
- <version>2.3.1</version>
+ <version>2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.nuiton.matrix</groupId>
<artifactId>nuiton-matrix</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.nuiton.matrix</groupId>
<artifactId>nuiton-matrix-gui</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
<scope>compile</scope>
</dependency>
@@ -179,21 +179,21 @@
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.jfree</groupId>
+ <groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
- <version>1.0.14</version>
+ <version>1.0.13</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.jfree</groupId>
+ <groupId>jfree</groupId>
<artifactId>jcommon</artifactId>
- <version>1.0.17</version>
+ <version>1.0.16</version>
<scope>compile</scope>
</dependency>
1
0
r911 - trunk/coser-business/src/main/resources/i18n
by echatellier@users.forge.codelutin.com 01 Dec '11
by echatellier@users.forge.codelutin.com 01 Dec '11
01 Dec '11
Author: echatellier
Date: 2011-12-01 14:23:26 +0100 (Thu, 01 Dec 2011)
New Revision: 911
Url: http://forge.codelutin.com/repositories/revision/coser/911
Log:
Revert modification
Modified:
trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties
trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties
Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties
===================================================================
--- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-12-01 13:05:30 UTC (rev 910)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-12-01 13:23:26 UTC (rev 911)
@@ -1,145 +1,3 @@
-<<<<<<< .mine
-Can't\ create\ project=
-Can't\ find\ line\ %s\ for\ deletion=
-Can't\ find\ line\ %s\ for\ undeletion=
-Can't\ read\ file\ %s\ for\ category\ %s=
-Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=
-Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s=
-Creating\ matrix\ \:\ %d*%d*%d*%d=
-Missing\ file\ %s=
-Project\ %s\ already\ exist=
-Project\ %s\ doesn't\ exists\ \!=
-Selection\ %s\ already\ exists=
-Species\ %s\ doesn't\ exist\ in\ referential=
-Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s
-Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s\ or\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s\nor\n\t%s
-coser.business.category.catch=Catch
-coser.business.category.haul=Haul
-coser.business.category.length=Length
-coser.business.category.reftax.species=Reftax (species)
-coser.business.category.strata=Strata
-coser.business.category.typeEspece=Species type code
-coser.business.chart.compareCatchLengthNumberTitle=Comparison of numbers in Catch and Length (%s)
-coser.business.command.deleteline.log=In file %s, line %s has been deleted
-coser.business.command.mergespecies.log=Species "%2$s" has been merged to "%1$s"
-coser.business.command.modifyfield.log=In file %s at line %s, field "%s" value as been modify from "%s" to "%s"
-coser.business.common.length=Length
-coser.business.common.number=Number
-coser.business.common.species=Species
-coser.business.common.strata=Strata
-coser.business.common.year=Year
-coser.business.common.years=Years
-coser.business.control.error.allCategories=All categories
-coser.business.control.error.diffCatchLength=Differences between length and catch
-coser.business.control.error.diffCatchLengthDetail=Differences between length and catch for species %s (year \: %s)
-coser.business.control.error.diffCatchLengthMissingYear=Years without length
-coser.business.control.error.diffCatchLengthMissingYearDetail=%s, year(s) without length
-coser.business.control.error.duplicatedLine=Duplicated line
-coser.business.control.error.duplicatedLineDetails=Duplicated line for key \: %s
-coser.business.control.error.invalidLengthLengthStep=Invalid length step (authorized centimeters and half-centimeters)
-coser.business.control.error.invalidLengthLengthStepDetail=Invalid length step %s for species %s
-coser.business.control.error.invalidLengthLengthStepTip=Length field must be in centimeters.
-coser.business.control.error.minObservationCount=Minimum number of observation not reached
-coser.business.control.error.minObservationCountDetail=Minimum number of observation not reached (%s) \: %.2f
-coser.business.control.error.missingCatchHaulFromHaul=Missing haul file hauls in catch file
-coser.business.control.error.missingCatchHaulFromHaulDetail=Missing haul %s in catch file
-coser.business.control.error.missingCatchHaulFromHaulTip=Check that all haul defined in haul file appear in catch file
-coser.business.control.error.missingCatchHaulFromLength=Missing length file hauls in catch file
-coser.business.control.error.missingCatchHaulFromLengthDetail=Missing haul %s in catch file
-coser.business.control.error.missingCatchHaulFromLengthTip=Check that all haul defined in length file appear in catch file
-coser.business.control.error.missingCatchSpeciesFromLength=Missing length file species in catch file
-coser.business.control.error.missingCatchSpeciesFromLengthDetail=Missing species %s in catch file
-coser.business.control.error.missingCatchSpeciesFromLengthTip=Check that all species defined in length file appear in catch file
-coser.business.control.error.missingHaulHaulFromCatch=Missing catch file hauls in haul file
-coser.business.control.error.missingHaulHaulFromCatchDetail=Missing haul %s in haul file
-coser.business.control.error.missingHaulHaulFromCatchTip=Check that all haul defined in catch file appear in haul file
-coser.business.control.error.missingHaulStrataFromStrata=Missing strata file strata in haul file
-coser.business.control.error.missingHaulStrataFromStrataDetail=Missing strata %s in haul file
-coser.business.control.error.missingHaulStrataFromStrataTip=Check that all strata defined in strata file appear in haul file
-coser.business.control.error.missingLengthHaulFromCatch=Missing catch file hauls in length file
-coser.business.control.error.missingLengthHaulFromCatchDetail=Missing haul %s in length file
-coser.business.control.error.missingLengthHaulFromCatchTip=Check that all haul defined in catch file appear in length file
-coser.business.control.error.missingLengthSpeciesFromCatch=Missing catch file species in length file
-coser.business.control.error.missingLengthSpeciesFromCatchDetail=Missing species %s in length file
-coser.business.control.error.missingLengthSpeciesFromCatchTip=Check that all species defined in catch file appear in length file
-coser.business.control.error.missingStrataStrataFromHaul=Missing haul file stratas in strata file
-coser.business.control.error.missingStrataStrataFromHaulDetail=Missing strata %s in strata file
-coser.business.control.error.missingStrataStrataFromHaulTip=Check that all strata defined in haul fail appear in strata file
-coser.business.control.error.missingYearHaulForCatchData=Missing hauls in haul data for some catch
-coser.business.control.error.missingYearHaulForCatchDataDetail=Missing %s tuple in hauls
-coser.business.control.error.missingYearHaulForCatchDataTip=Check that for each haul present one year (denoted Year|Line) in the capture file there is a data in the haul file
-coser.business.control.error.missingYearHaulForLengthData=Missing hauls in haul data for some length
-coser.business.control.error.missingYearHaulForLengthDataDetail=Missing %s tuple in hauls
-coser.business.control.error.missingYearHaulForLengthDataTip=Check that for each haul present one year (denoted Year|Line) in the length file there is a data in the haul file
-coser.business.control.error.missingYearHaulSpeciesForCatchData=Missing species in catch file for some length
-coser.business.control.error.missingYearHaulSpeciesForCatchDataDetail=Missing %s tuple in catch
-coser.business.control.error.missingYearHaulSpeciesForCatchDataTip=Check that for each species present in a line from one year to the file sizes (denoted Year | Line | Species) there is a catch-up in the file (the opposite is not true, ie there are species in catches which there is no information in file size)
-coser.business.control.error.nonExistantSpecies=Species not present in Reftax
-coser.business.control.error.nonExistantSpeciesDetail=Species %S is not present in Reftax
-coser.business.control.error.surveyNotEquals=Survey names are not equals in 4 data files
-coser.business.control.error.yearsNotEquals=Years are not equals in 4 data files
-coser.business.control.noerrorfound=No error found
-coser.business.control.step.crossFileChech=Cross file checks (%d%%)
-coser.business.control.step.diffCatchLength=Check diff catch/length (%d%%)
-coser.business.control.step.observation=Checking observation number \: %s (%d%%)
-coser.business.control.step.xworks=Line checks \: %s (%d%%)
-coser.business.extract.creationdate=Creation date \:
-coser.business.extract.projectAuthor=Project author \:
-coser.business.extract.projectComment=Project comment \:
-coser.business.extract.projectName=Project name \:
-coser.business.extract.selectionName=Selection name \:
-coser.business.line=Line
-coser.business.matrix.density=Density
-coser.business.matrix.lengthstructure=Length structures
-coser.business.matrix.occurrence=Occurrence
-coser.business.matrix.samplingeffort=Sampling effort
-coser.business.notificationmail.body=Data has been updated on website.\n\n--\nCoser.
-coser.business.notificationmail.subject=Coser \: Data updated
-coser.business.publication.author=Author
-coser.business.publication.catchfilename=Catch file name
-coser.business.publication.comment=Comment
-coser.business.publication.controllogexporttitle=Modifications report (project %s)
-coser.business.publication.creationdate=Creation date
-coser.business.publication.datamodification=Data modifications
-coser.business.publication.date=On
-coser.business.publication.errorexportlines=Lines
-coser.business.publication.errorexporttitle=Control report (project %s)
-coser.business.publication.errorgraph=Graph
-coser.business.publication.errorgraphs=Graphs
-coser.business.publication.haulfilename=Haul file name
-coser.business.publication.lengthfilename=Length file name
-coser.business.publication.projectdetails=Project details
-coser.business.publication.selectionchoices=Selection choices
-coser.business.publication.selectionlogexporttitle=Selection report for %s (project %s)
-coser.business.publication.stratafilename=Strata file name
-coser.business.result.rsufiResultAlreadyExists=Result %s already exists \!
-coser.business.resultupload.duplicatedresult=Result %s/%s/%s duplicate another result for zone %s \!
-coser.business.selection.notValidatedControl=Not validated control \!
-coser.business.uploadresult.checkcollision=Checking zone collisions
-coser.business.uploadresult.modifyResultOptions=Modify result options
-coser.business.uploadresult.preparezip=Preparing zip archive\u2026
-coser.business.uploadresult.sendzip=Sending zip archive\u2026
-coser.config.control.diffcatchlength.description=Percentage difference allowed between catch and length (in percent, for example 5% set 5.0)
-coser.config.control.nobsmin.description=Minimal observation number
-coser.config.control.typeFish.description=Fish species code type
-coser.config.database.directory.description=Coser database directory (all Coser data)
-coser.config.locale.description=Application's locale
-coser.config.projects.directory.description=Coser projects directory
-coser.config.reference.species.description=Species reference file location (reftax)
-coser.config.reference.typeSpecies.description=Code type species file location
-coser.config.selection.densityFilter.description=Default density filter value
-coser.config.selection.occurrenceFilter.description=Default occurrence filter value
-coser.config.smtp.host.description=SMTP host address
-coser.config.validator.directory.description=Controls files directory location
-coser.config.web.frontend.description=Coser server url
-coser.config.web.indicators.file.description=Indicators match file
-coser.config.web.indicators.projects.directory.description=Web indicators projects storage directory
-coser.config.web.maps.projects.directory.description=Web maps projects storage directory
-coser.config.web.newresult.emails.description=New results notification receivers
-coser.config.web.properties.file.description=Web informations properties file
-coser.config.web.uploadurl.description=Coser server upload result url
-coser.config.web.zones.file.description=Zones match file
-=======
Can't\ create\ project=
Can't\ find\ line\ %s\ for\ deletion=
Can't\ find\ line\ %s\ for\ undeletion=
@@ -306,4 +164,3 @@
sweptSurface\ must\ contain\ at\ least\ 3\ decimals=
weight\ attribute\ is\ not\ a\ valid\ double=
year\ is\ not\ valid\ (4\ digits.2\ digits)=
->>>>>>> .r909
Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties
===================================================================
--- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-12-01 13:05:30 UTC (rev 910)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-12-01 13:23:26 UTC (rev 911)
@@ -1,145 +1,3 @@
-<<<<<<< .mine
-Can't\ create\ project=Impossible de cr\u00E9er le projet
-Can't\ find\ line\ %s\ for\ deletion=
-Can't\ find\ line\ %s\ for\ undeletion=
-Can't\ read\ file\ %s\ for\ category\ %s=Impossible de lire le fichier %s pour la cat\u00E9gorie %s \!
-Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=Impossible de lire le fichier '%s'.\nMerci de v\u00E9rifier le s\u00E9parateur utilis\u00E9 est bien un point-virgule ';'
-Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s=
-Creating\ matrix\ \:\ %d*%d*%d*%d=
-Missing\ file\ %s=Fichier manquant \: %s
-Project\ %s\ already\ exist=Le projet %s existe d\u00E9j\u00E0 \!
-Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \!
-Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \!
-Species\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel
-Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s.
-Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans %s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s.
-coser.business.category.catch=Captures
-coser.business.category.haul=Traits
-coser.business.category.length=Tailles
-coser.business.category.reftax.species=Reftax (esp\u00E8ce)
-coser.business.category.strata=Strates
-coser.business.category.typeEspece=Code type des esp\u00E8ces
-coser.business.chart.compareCatchLengthNumberTitle=Comparaison des nombres dans Capture et Taille (%s)
-coser.business.command.deleteline.log=Dans le fichier %s, la ligne %s a \u00E9t\u00E9 supprim\u00E9e
-coser.business.command.mergespecies.log=Les esp\u00E8ces "%2$s" ont \u00E9t\u00E9 fusionn\u00E9es en "%1$s"
-coser.business.command.modifyfield.log=Dans le ficher %s \u00E0 la ligne %s, le champs "%s" est pass\u00E9 de la valeur "%s" \u00E0 "%s"
-coser.business.common.length=Taille
-coser.business.common.number=Nombre
-coser.business.common.species=Esp\u00E8ces
-coser.business.common.strata=Strates
-coser.business.common.year=Ann\u00E9e
-coser.business.common.years=Ann\u00E9es
-coser.business.control.error.allCategories=Toutes les cat\u00E9gories
-coser.business.control.error.diffCatchLength=Diff\u00E9rence entre les captures et taille
-coser.business.control.error.diffCatchLengthDetail=Diff\u00E9rence entre les captures et taille pour l'esp\u00E8ce %s (ann\u00E9e %s)
-coser.business.control.error.diffCatchLengthMissingYear=Ann\u00E9e(s) avec absence de taille
-coser.business.control.error.diffCatchLengthMissingYearDetail=%s, ann\u00E9e(s) avec absence de taille
-coser.business.control.error.duplicatedLine=Ligne en doublon
-coser.business.control.error.duplicatedLineDetails=Ligne en doublon pour la cl\u00E9 \: %s
-coser.business.control.error.invalidLengthLengthStep=Le pas de longueur est invalide (autoris\u00E9 centim\u00E8tre et demi-centim\u00E8tre)
-coser.business.control.error.invalidLengthLengthStepDetail=Le pas longueur %s est invalide pour l'esp\u00E8ce %s
-coser.business.control.error.invalidLengthLengthStepTip=Le champs de longueur doit \u00EAtre en centim\u00E8tre (ou demi centim\u00E8tre)
-coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint
-coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f
-coser.business.control.error.missingCatchHaulFromHaul=Traits du fichier traits absents dans le fichier captures
-coser.business.control.error.missingCatchHaulFromHaulDetail=Trait %s absent dans le fichier captures
-coser.business.control.error.missingCatchHaulFromHaulTip=V\u00E9rifier que tous les traits d\u00E9finis dans le fichier traits apparaissent dans le fichier captures
-coser.business.control.error.missingCatchHaulFromLength=Traits du fichier tailles manquants dans le fichier captures
-coser.business.control.error.missingCatchHaulFromLengthDetail=Trait %s manquant dans le fichier captures
-coser.business.control.error.missingCatchHaulFromLengthTip=V\u00E9rifier que tous les traits d\u00E9finis dans le fichier tailles apparaissent dans le fichier captures
-coser.business.control.error.missingCatchSpeciesFromLength=Esp\u00E8ces du fichier tailles manquantes dans le fichier captures
-coser.business.control.error.missingCatchSpeciesFromLengthDetail=Esp\u00E8ce %s manquante dans le fichier captures
-coser.business.control.error.missingCatchSpeciesFromLengthTip=V\u00E9rifier que toutes les esp\u00E8ces d\u00E9finies dans le fichier tailles apparaissent dans le fichier captures
-coser.business.control.error.missingHaulHaulFromCatch=Traits du fichier captures manquants dans le fichier traits
-coser.business.control.error.missingHaulHaulFromCatchDetail=Trait %s manquant dans le fichier traits
-coser.business.control.error.missingHaulHaulFromCatchTip=V\u00E9rifier que tous les traits d\u00E9finis dans le fichier traits apparaissent dans le fichier captures
-coser.business.control.error.missingHaulStrataFromStrata=Strates du fichier strates absentes dans le fichier traits
-coser.business.control.error.missingHaulStrataFromStrataDetail=Strate %s absente dans le fichier traits
-coser.business.control.error.missingHaulStrataFromStrataTip=V\u00E9rifier que toutes les strates d\u00E9finies dans le fichier strates apparaissent dans le fichier traits
-coser.business.control.error.missingLengthHaulFromCatch=Traits du fichier captures absents dans le fichier tailles
-coser.business.control.error.missingLengthHaulFromCatchDetail=Trait %s absent dans le fichier tailles
-coser.business.control.error.missingLengthHaulFromCatchTip=V\u00E9rifier que tous les traits d\u00E9finis dans le fichier captures apparaissent dans le fichier tailles
-coser.business.control.error.missingLengthSpeciesFromCatch=Esp\u00E8ces du fichier captures absentes dans le fichier tailles
-coser.business.control.error.missingLengthSpeciesFromCatchDetail=Esp\u00E8ce %s absente dans le fichier tailles
-coser.business.control.error.missingLengthSpeciesFromCatchTip=V\u00E9rifier que toutes les esp\u00E8ces d\u00E9finies dans le fichier captures apparaissent dans le fichier tailles
-coser.business.control.error.missingStrataStrataFromHaul=Strates du fichier traits manquantes dans le fichier strates
-coser.business.control.error.missingStrataStrataFromHaulDetail=Strate %s manquante dans le fichier strates
-coser.business.control.error.missingStrataStrataFromHaulTip=V\u00E9rifier que toutes les strates d\u00E9finies dans le fichier traits apparaissent dans le fichier strates
-coser.business.control.error.missingYearHaulForCatchData=Traits manquants dans les traits pour certaines captures
-coser.business.control.error.missingYearHaulForCatchDataDetail=Couple %s manquant dans les traits
-coser.business.control.error.missingYearHaulForCatchDataTip=V\u00E9rifier que pour chaque trait pr\u00E9sent une ann\u00E9e (not\u00E9 Annee|Trait) dans le fichier capture, il y a une donn\u00E9e dans le fichier traits
-coser.business.control.error.missingYearHaulForLengthData=Traits manquants dans les traits pour certaines tailles
-coser.business.control.error.missingYearHaulForLengthDataDetail=Couple %s manquant dans les traits
-coser.business.control.error.missingYearHaulForLengthDataTip=V\u00E9rifier que pour chaque trait pr\u00E9sent une ann\u00E9e (not\u00E9 Annee|Trait) dans le fichier tailles, il y a une donn\u00E9e dans le fichier traits
-coser.business.control.error.missingYearHaulSpeciesForCatchData=Especes manquantes dans les captures pour certaines tailles
-coser.business.control.error.missingYearHaulSpeciesForCatchDataDetail=Couple %s manquant dans les captures
-coser.business.control.error.missingYearHaulSpeciesForCatchDataTip=V\u00E9rifier que pour chaque esp\u00E8ce pr\u00E9sent dans un trait d'une ann\u00E9e dans le fichier tailles (not\u00E9 Annee|Trait|Espece) il y a une donn\u00E9e dans le fichier captures (le contraire n'est pas vrai, i.e. il y a des esp\u00E8ces dans captures pour lesquelles il n'y a pas d'information dans le fichier tailles)
-coser.business.control.error.nonExistantSpecies=Esp\u00E8ces non existantes dans le reftax
-coser.business.control.error.nonExistantSpeciesDetail=Esp\u00E8ce %s non existante dans le reftax
-coser.business.control.error.surveyNotEquals=Les noms de campagnes de sont pas \u00E9gaux dans les 4 fichiers
-coser.business.control.error.yearsNotEquals=Les ann\u00E9es ne sont pas identiques dans les 4 fichiers
-coser.business.control.noerrorfound=Aucune erreur d\u00E9tect\u00E9e
-coser.business.control.step.crossFileChech=V\u00E9rification par croisement de fichiers (%d%%)
-coser.business.control.step.diffCatchLength=V\u00E9rification des diff\u00E9rences captures/taille (%d%%)
-coser.business.control.step.observation=V\u00E9rification du nombre d'observation \: %s (%d%%)
-coser.business.control.step.xworks=Validation par lignes \: %s (%d%%)
-coser.business.extract.creationdate=Date de cr\u00E9ation \:
-coser.business.extract.projectAuthor=Auteur du projet \:
-coser.business.extract.projectComment=Commentaire du projet \:
-coser.business.extract.projectName=Nom du project \:
-coser.business.extract.selectionName=Nom de la s\u00E9lection \:
-coser.business.line=Ligne
-coser.business.matrix.density=Densit\u00E9
-coser.business.matrix.lengthstructure=Structures en taille
-coser.business.matrix.occurrence=Occurrence
-coser.business.matrix.samplingeffort=Effort d'\u00E9chantillonnage
-coser.business.notificationmail.body=Les donn\u00E9es du site internet viennent d'\u00EAtre mises \u00E0 jour\n\n--\nCoser.
-coser.business.notificationmail.subject=Coser \: Donn\u00E9es mises \u00E0 jour
-coser.business.publication.author=Auteur
-coser.business.publication.catchfilename=Nom du fichier captures
-coser.business.publication.comment=Commentaire
-coser.business.publication.controllogexporttitle=Rapport des modifications (projet %s)
-coser.business.publication.creationdate=Date de cr\u00E9action
-coser.business.publication.datamodification=Modifications sur les donn\u00E9es
-coser.business.publication.date=Le
-coser.business.publication.errorexportlines=Lignes
-coser.business.publication.errorexporttitle=Rapport de contr\u00F4le (projet %s)
-coser.business.publication.errorgraph=Graphique
-coser.business.publication.errorgraphs=Graphiques
-coser.business.publication.haulfilename=Nom du fichier traits
-coser.business.publication.lengthfilename=Nom du fichier tailles
-coser.business.publication.projectdetails=D\u00E9tails du projet
-coser.business.publication.selectionchoices=Choix de s\u00E9lections
-coser.business.publication.selectionlogexporttitle=Rapport de la s\u00E9lection %s (projet %s)
-coser.business.publication.stratafilename=Nom du fichier strates
-coser.business.result.rsufiResultAlreadyExists=Le r\u00E9sultat %D existe d\u00E9j\u00E0 \!
-coser.business.resultupload.duplicatedresult=Le r\u00E9sultat %s/%s/%s duplique un autre r\u00E9sultat pour la zone %s \!
-coser.business.selection.notValidatedControl=Contr\u00F4le non valid\u00E9 \!
-coser.business.uploadresult.checkcollision=V\u00E9rification des collisions de zones
-coser.business.uploadresult.modifyResultOptions=Modification des options des r\u00E9sultats
-coser.business.uploadresult.preparezip=Pr\u00E9paration de l'archive zip\u2026
-coser.business.uploadresult.sendzip=Envoi de l'archive zip\u2026
-coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles (en pourcent, par exemple pour 5% mettre 5.0)
-coser.config.control.nobsmin.description=Nombre minimal d'observation
-coser.config.control.typeFish.description=Nom du type d'esp\u00E8ces correspondant aux poissons
-coser.config.database.directory.description=Emplacement du dossier de toutes les donn\u00E9es relatives \u00E0 Coser
-coser.config.locale.description=Langue de l'application
-coser.config.projects.directory.description=Emplacement du dossier de sauvegarde des projets
-coser.config.reference.species.description=Emplacement du fichier de r\u00E9f\u00E9rence des esp\u00E8ces (Reftax)
-coser.config.reference.typeSpecies.description=Emplacement du fichier de code type des esp\u00E8ces
-coser.config.selection.densityFilter.description=Filtre par d\u00E9faut sur la moyenne des densit\u00E9s
-coser.config.selection.occurrenceFilter.description=Filtre par d\u00E9faut sur la moyenne des occurrences
-coser.config.smtp.host.description=Adresse du serveur SMTP pour envoyer les mails
-coser.config.validator.directory.description=Emplacement des fichiers de contr\u00F4les
-coser.config.web.frontend.description=Adresse du serveur web coser
-coser.config.web.indicators.file.description=Fichier de correspondance des indicateurs
-coser.config.web.indicators.projects.directory.description=Dossier de stockage des projets indicateurs pour le Web
-coser.config.web.maps.projects.directory.description=Dossier de stockage des projets cartes pour le Web
-coser.config.web.newresult.emails.description=Liste des destinataires des notifications de nouveaux r\u00E9sultats
-coser.config.web.properties.file.description=Fichier d'enregistrement des informations serveur
-coser.config.web.uploadurl.description=Adresse d'envoi des r\u00E9sultats
-coser.config.web.zones.file.description=Fichier de correspondance des zones
-=======
Can't\ create\ project=Impossible de créer le projet
Can't\ find\ line\ %s\ for\ deletion=
Can't\ find\ line\ %s\ for\ undeletion=
@@ -306,4 +164,3 @@
sweptSurface\ must\ contain\ at\ least\ 3\ decimals=L'attribut SurfaceBalayee doit contenir au moins 3 decimales
weight\ attribute\ is\ not\ a\ valid\ double=L'attribut Poids n'est pas un réel valide
year\ is\ not\ valid\ (4\ digits.2\ digits)=L'attribut Année n'est pas valide (4 chiffres.2 chiffres)
->>>>>>> .r909
1
0
r910 - trunk/coser-business/src/main/resources/i18n
by oberthel@users.forge.codelutin.com 01 Dec '11
by oberthel@users.forge.codelutin.com 01 Dec '11
01 Dec '11
Author: oberthel
Date: 2011-12-01 14:05:30 +0100 (Thu, 01 Dec 2011)
New Revision: 910
Url: http://forge.codelutin.com/repositories/revision/coser/910
Log:
Modified:
trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties
trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties
Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties
===================================================================
--- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-11-28 22:23:19 UTC (rev 909)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-12-01 13:05:30 UTC (rev 910)
@@ -1,3 +1,145 @@
+<<<<<<< .mine
+Can't\ create\ project=
+Can't\ find\ line\ %s\ for\ deletion=
+Can't\ find\ line\ %s\ for\ undeletion=
+Can't\ read\ file\ %s\ for\ category\ %s=
+Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=
+Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s=
+Creating\ matrix\ \:\ %d*%d*%d*%d=
+Missing\ file\ %s=
+Project\ %s\ already\ exist=
+Project\ %s\ doesn't\ exists\ \!=
+Selection\ %s\ already\ exists=
+Species\ %s\ doesn't\ exist\ in\ referential=
+Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s
+Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s\ or\ %s=Wrong header detected in file %s.\n\nFound \:\n\t%s\nexpected\n\t%s\nor\n\t%s
+coser.business.category.catch=Catch
+coser.business.category.haul=Haul
+coser.business.category.length=Length
+coser.business.category.reftax.species=Reftax (species)
+coser.business.category.strata=Strata
+coser.business.category.typeEspece=Species type code
+coser.business.chart.compareCatchLengthNumberTitle=Comparison of numbers in Catch and Length (%s)
+coser.business.command.deleteline.log=In file %s, line %s has been deleted
+coser.business.command.mergespecies.log=Species "%2$s" has been merged to "%1$s"
+coser.business.command.modifyfield.log=In file %s at line %s, field "%s" value as been modify from "%s" to "%s"
+coser.business.common.length=Length
+coser.business.common.number=Number
+coser.business.common.species=Species
+coser.business.common.strata=Strata
+coser.business.common.year=Year
+coser.business.common.years=Years
+coser.business.control.error.allCategories=All categories
+coser.business.control.error.diffCatchLength=Differences between length and catch
+coser.business.control.error.diffCatchLengthDetail=Differences between length and catch for species %s (year \: %s)
+coser.business.control.error.diffCatchLengthMissingYear=Years without length
+coser.business.control.error.diffCatchLengthMissingYearDetail=%s, year(s) without length
+coser.business.control.error.duplicatedLine=Duplicated line
+coser.business.control.error.duplicatedLineDetails=Duplicated line for key \: %s
+coser.business.control.error.invalidLengthLengthStep=Invalid length step (authorized centimeters and half-centimeters)
+coser.business.control.error.invalidLengthLengthStepDetail=Invalid length step %s for species %s
+coser.business.control.error.invalidLengthLengthStepTip=Length field must be in centimeters.
+coser.business.control.error.minObservationCount=Minimum number of observation not reached
+coser.business.control.error.minObservationCountDetail=Minimum number of observation not reached (%s) \: %.2f
+coser.business.control.error.missingCatchHaulFromHaul=Missing haul file hauls in catch file
+coser.business.control.error.missingCatchHaulFromHaulDetail=Missing haul %s in catch file
+coser.business.control.error.missingCatchHaulFromHaulTip=Check that all haul defined in haul file appear in catch file
+coser.business.control.error.missingCatchHaulFromLength=Missing length file hauls in catch file
+coser.business.control.error.missingCatchHaulFromLengthDetail=Missing haul %s in catch file
+coser.business.control.error.missingCatchHaulFromLengthTip=Check that all haul defined in length file appear in catch file
+coser.business.control.error.missingCatchSpeciesFromLength=Missing length file species in catch file
+coser.business.control.error.missingCatchSpeciesFromLengthDetail=Missing species %s in catch file
+coser.business.control.error.missingCatchSpeciesFromLengthTip=Check that all species defined in length file appear in catch file
+coser.business.control.error.missingHaulHaulFromCatch=Missing catch file hauls in haul file
+coser.business.control.error.missingHaulHaulFromCatchDetail=Missing haul %s in haul file
+coser.business.control.error.missingHaulHaulFromCatchTip=Check that all haul defined in catch file appear in haul file
+coser.business.control.error.missingHaulStrataFromStrata=Missing strata file strata in haul file
+coser.business.control.error.missingHaulStrataFromStrataDetail=Missing strata %s in haul file
+coser.business.control.error.missingHaulStrataFromStrataTip=Check that all strata defined in strata file appear in haul file
+coser.business.control.error.missingLengthHaulFromCatch=Missing catch file hauls in length file
+coser.business.control.error.missingLengthHaulFromCatchDetail=Missing haul %s in length file
+coser.business.control.error.missingLengthHaulFromCatchTip=Check that all haul defined in catch file appear in length file
+coser.business.control.error.missingLengthSpeciesFromCatch=Missing catch file species in length file
+coser.business.control.error.missingLengthSpeciesFromCatchDetail=Missing species %s in length file
+coser.business.control.error.missingLengthSpeciesFromCatchTip=Check that all species defined in catch file appear in length file
+coser.business.control.error.missingStrataStrataFromHaul=Missing haul file stratas in strata file
+coser.business.control.error.missingStrataStrataFromHaulDetail=Missing strata %s in strata file
+coser.business.control.error.missingStrataStrataFromHaulTip=Check that all strata defined in haul fail appear in strata file
+coser.business.control.error.missingYearHaulForCatchData=Missing hauls in haul data for some catch
+coser.business.control.error.missingYearHaulForCatchDataDetail=Missing %s tuple in hauls
+coser.business.control.error.missingYearHaulForCatchDataTip=Check that for each haul present one year (denoted Year|Line) in the capture file there is a data in the haul file
+coser.business.control.error.missingYearHaulForLengthData=Missing hauls in haul data for some length
+coser.business.control.error.missingYearHaulForLengthDataDetail=Missing %s tuple in hauls
+coser.business.control.error.missingYearHaulForLengthDataTip=Check that for each haul present one year (denoted Year|Line) in the length file there is a data in the haul file
+coser.business.control.error.missingYearHaulSpeciesForCatchData=Missing species in catch file for some length
+coser.business.control.error.missingYearHaulSpeciesForCatchDataDetail=Missing %s tuple in catch
+coser.business.control.error.missingYearHaulSpeciesForCatchDataTip=Check that for each species present in a line from one year to the file sizes (denoted Year | Line | Species) there is a catch-up in the file (the opposite is not true, ie there are species in catches which there is no information in file size)
+coser.business.control.error.nonExistantSpecies=Species not present in Reftax
+coser.business.control.error.nonExistantSpeciesDetail=Species %S is not present in Reftax
+coser.business.control.error.surveyNotEquals=Survey names are not equals in 4 data files
+coser.business.control.error.yearsNotEquals=Years are not equals in 4 data files
+coser.business.control.noerrorfound=No error found
+coser.business.control.step.crossFileChech=Cross file checks (%d%%)
+coser.business.control.step.diffCatchLength=Check diff catch/length (%d%%)
+coser.business.control.step.observation=Checking observation number \: %s (%d%%)
+coser.business.control.step.xworks=Line checks \: %s (%d%%)
+coser.business.extract.creationdate=Creation date \:
+coser.business.extract.projectAuthor=Project author \:
+coser.business.extract.projectComment=Project comment \:
+coser.business.extract.projectName=Project name \:
+coser.business.extract.selectionName=Selection name \:
+coser.business.line=Line
+coser.business.matrix.density=Density
+coser.business.matrix.lengthstructure=Length structures
+coser.business.matrix.occurrence=Occurrence
+coser.business.matrix.samplingeffort=Sampling effort
+coser.business.notificationmail.body=Data has been updated on website.\n\n--\nCoser.
+coser.business.notificationmail.subject=Coser \: Data updated
+coser.business.publication.author=Author
+coser.business.publication.catchfilename=Catch file name
+coser.business.publication.comment=Comment
+coser.business.publication.controllogexporttitle=Modifications report (project %s)
+coser.business.publication.creationdate=Creation date
+coser.business.publication.datamodification=Data modifications
+coser.business.publication.date=On
+coser.business.publication.errorexportlines=Lines
+coser.business.publication.errorexporttitle=Control report (project %s)
+coser.business.publication.errorgraph=Graph
+coser.business.publication.errorgraphs=Graphs
+coser.business.publication.haulfilename=Haul file name
+coser.business.publication.lengthfilename=Length file name
+coser.business.publication.projectdetails=Project details
+coser.business.publication.selectionchoices=Selection choices
+coser.business.publication.selectionlogexporttitle=Selection report for %s (project %s)
+coser.business.publication.stratafilename=Strata file name
+coser.business.result.rsufiResultAlreadyExists=Result %s already exists \!
+coser.business.resultupload.duplicatedresult=Result %s/%s/%s duplicate another result for zone %s \!
+coser.business.selection.notValidatedControl=Not validated control \!
+coser.business.uploadresult.checkcollision=Checking zone collisions
+coser.business.uploadresult.modifyResultOptions=Modify result options
+coser.business.uploadresult.preparezip=Preparing zip archive\u2026
+coser.business.uploadresult.sendzip=Sending zip archive\u2026
+coser.config.control.diffcatchlength.description=Percentage difference allowed between catch and length (in percent, for example 5% set 5.0)
+coser.config.control.nobsmin.description=Minimal observation number
+coser.config.control.typeFish.description=Fish species code type
+coser.config.database.directory.description=Coser database directory (all Coser data)
+coser.config.locale.description=Application's locale
+coser.config.projects.directory.description=Coser projects directory
+coser.config.reference.species.description=Species reference file location (reftax)
+coser.config.reference.typeSpecies.description=Code type species file location
+coser.config.selection.densityFilter.description=Default density filter value
+coser.config.selection.occurrenceFilter.description=Default occurrence filter value
+coser.config.smtp.host.description=SMTP host address
+coser.config.validator.directory.description=Controls files directory location
+coser.config.web.frontend.description=Coser server url
+coser.config.web.indicators.file.description=Indicators match file
+coser.config.web.indicators.projects.directory.description=Web indicators projects storage directory
+coser.config.web.maps.projects.directory.description=Web maps projects storage directory
+coser.config.web.newresult.emails.description=New results notification receivers
+coser.config.web.properties.file.description=Web informations properties file
+coser.config.web.uploadurl.description=Coser server upload result url
+coser.config.web.zones.file.description=Zones match file
+=======
Can't\ create\ project=
Can't\ find\ line\ %s\ for\ deletion=
Can't\ find\ line\ %s\ for\ undeletion=
@@ -164,3 +306,4 @@
sweptSurface\ must\ contain\ at\ least\ 3\ decimals=
weight\ attribute\ is\ not\ a\ valid\ double=
year\ is\ not\ valid\ (4\ digits.2\ digits)=
+>>>>>>> .r909
Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties
===================================================================
--- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-11-28 22:23:19 UTC (rev 909)
+++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-12-01 13:05:30 UTC (rev 910)
@@ -1,3 +1,145 @@
+<<<<<<< .mine
+Can't\ create\ project=Impossible de cr\u00E9er le projet
+Can't\ find\ line\ %s\ for\ deletion=
+Can't\ find\ line\ %s\ for\ undeletion=
+Can't\ read\ file\ %s\ for\ category\ %s=Impossible de lire le fichier %s pour la cat\u00E9gorie %s \!
+Can't\ read\ file\ '%s'.\ Check\ CSV\ file\ separator=Impossible de lire le fichier '%s'.\nMerci de v\u00E9rifier le s\u00E9parateur utilis\u00E9 est bien un point-virgule ';'
+Can't\ replace\ data\ value.\ Expected\ %s\ but\ was\ %s=
+Creating\ matrix\ \:\ %d*%d*%d*%d=
+Missing\ file\ %s=Fichier manquant \: %s
+Project\ %s\ already\ exist=Le projet %s existe d\u00E9j\u00E0 \!
+Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \!
+Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \!
+Species\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel
+Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s.
+Wrong\ header\ detected\ in\ file\ %s.\ Found\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans %s. Corrigez les ent\u00EAtes et relancez la cr\u00E9ation du projet.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s.
+coser.business.category.catch=Captures
+coser.business.category.haul=Traits
+coser.business.category.length=Tailles
+coser.business.category.reftax.species=Reftax (esp\u00E8ce)
+coser.business.category.strata=Strates
+coser.business.category.typeEspece=Code type des esp\u00E8ces
+coser.business.chart.compareCatchLengthNumberTitle=Comparaison des nombres dans Capture et Taille (%s)
+coser.business.command.deleteline.log=Dans le fichier %s, la ligne %s a \u00E9t\u00E9 supprim\u00E9e
+coser.business.command.mergespecies.log=Les esp\u00E8ces "%2$s" ont \u00E9t\u00E9 fusionn\u00E9es en "%1$s"
+coser.business.command.modifyfield.log=Dans le ficher %s \u00E0 la ligne %s, le champs "%s" est pass\u00E9 de la valeur "%s" \u00E0 "%s"
+coser.business.common.length=Taille
+coser.business.common.number=Nombre
+coser.business.common.species=Esp\u00E8ces
+coser.business.common.strata=Strates
+coser.business.common.year=Ann\u00E9e
+coser.business.common.years=Ann\u00E9es
+coser.business.control.error.allCategories=Toutes les cat\u00E9gories
+coser.business.control.error.diffCatchLength=Diff\u00E9rence entre les captures et taille
+coser.business.control.error.diffCatchLengthDetail=Diff\u00E9rence entre les captures et taille pour l'esp\u00E8ce %s (ann\u00E9e %s)
+coser.business.control.error.diffCatchLengthMissingYear=Ann\u00E9e(s) avec absence de taille
+coser.business.control.error.diffCatchLengthMissingYearDetail=%s, ann\u00E9e(s) avec absence de taille
+coser.business.control.error.duplicatedLine=Ligne en doublon
+coser.business.control.error.duplicatedLineDetails=Ligne en doublon pour la cl\u00E9 \: %s
+coser.business.control.error.invalidLengthLengthStep=Le pas de longueur est invalide (autoris\u00E9 centim\u00E8tre et demi-centim\u00E8tre)
+coser.business.control.error.invalidLengthLengthStepDetail=Le pas longueur %s est invalide pour l'esp\u00E8ce %s
+coser.business.control.error.invalidLengthLengthStepTip=Le champs de longueur doit \u00EAtre en centim\u00E8tre (ou demi centim\u00E8tre)
+coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint
+coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f
+coser.business.control.error.missingCatchHaulFromHaul=Traits du fichier traits absents dans le fichier captures
+coser.business.control.error.missingCatchHaulFromHaulDetail=Trait %s absent dans le fichier captures
+coser.business.control.error.missingCatchHaulFromHaulTip=V\u00E9rifier que tous les traits d\u00E9finis dans le fichier traits apparaissent dans le fichier captures
+coser.business.control.error.missingCatchHaulFromLength=Traits du fichier tailles manquants dans le fichier captures
+coser.business.control.error.missingCatchHaulFromLengthDetail=Trait %s manquant dans le fichier captures
+coser.business.control.error.missingCatchHaulFromLengthTip=V\u00E9rifier que tous les traits d\u00E9finis dans le fichier tailles apparaissent dans le fichier captures
+coser.business.control.error.missingCatchSpeciesFromLength=Esp\u00E8ces du fichier tailles manquantes dans le fichier captures
+coser.business.control.error.missingCatchSpeciesFromLengthDetail=Esp\u00E8ce %s manquante dans le fichier captures
+coser.business.control.error.missingCatchSpeciesFromLengthTip=V\u00E9rifier que toutes les esp\u00E8ces d\u00E9finies dans le fichier tailles apparaissent dans le fichier captures
+coser.business.control.error.missingHaulHaulFromCatch=Traits du fichier captures manquants dans le fichier traits
+coser.business.control.error.missingHaulHaulFromCatchDetail=Trait %s manquant dans le fichier traits
+coser.business.control.error.missingHaulHaulFromCatchTip=V\u00E9rifier que tous les traits d\u00E9finis dans le fichier traits apparaissent dans le fichier captures
+coser.business.control.error.missingHaulStrataFromStrata=Strates du fichier strates absentes dans le fichier traits
+coser.business.control.error.missingHaulStrataFromStrataDetail=Strate %s absente dans le fichier traits
+coser.business.control.error.missingHaulStrataFromStrataTip=V\u00E9rifier que toutes les strates d\u00E9finies dans le fichier strates apparaissent dans le fichier traits
+coser.business.control.error.missingLengthHaulFromCatch=Traits du fichier captures absents dans le fichier tailles
+coser.business.control.error.missingLengthHaulFromCatchDetail=Trait %s absent dans le fichier tailles
+coser.business.control.error.missingLengthHaulFromCatchTip=V\u00E9rifier que tous les traits d\u00E9finis dans le fichier captures apparaissent dans le fichier tailles
+coser.business.control.error.missingLengthSpeciesFromCatch=Esp\u00E8ces du fichier captures absentes dans le fichier tailles
+coser.business.control.error.missingLengthSpeciesFromCatchDetail=Esp\u00E8ce %s absente dans le fichier tailles
+coser.business.control.error.missingLengthSpeciesFromCatchTip=V\u00E9rifier que toutes les esp\u00E8ces d\u00E9finies dans le fichier captures apparaissent dans le fichier tailles
+coser.business.control.error.missingStrataStrataFromHaul=Strates du fichier traits manquantes dans le fichier strates
+coser.business.control.error.missingStrataStrataFromHaulDetail=Strate %s manquante dans le fichier strates
+coser.business.control.error.missingStrataStrataFromHaulTip=V\u00E9rifier que toutes les strates d\u00E9finies dans le fichier traits apparaissent dans le fichier strates
+coser.business.control.error.missingYearHaulForCatchData=Traits manquants dans les traits pour certaines captures
+coser.business.control.error.missingYearHaulForCatchDataDetail=Couple %s manquant dans les traits
+coser.business.control.error.missingYearHaulForCatchDataTip=V\u00E9rifier que pour chaque trait pr\u00E9sent une ann\u00E9e (not\u00E9 Annee|Trait) dans le fichier capture, il y a une donn\u00E9e dans le fichier traits
+coser.business.control.error.missingYearHaulForLengthData=Traits manquants dans les traits pour certaines tailles
+coser.business.control.error.missingYearHaulForLengthDataDetail=Couple %s manquant dans les traits
+coser.business.control.error.missingYearHaulForLengthDataTip=V\u00E9rifier que pour chaque trait pr\u00E9sent une ann\u00E9e (not\u00E9 Annee|Trait) dans le fichier tailles, il y a une donn\u00E9e dans le fichier traits
+coser.business.control.error.missingYearHaulSpeciesForCatchData=Especes manquantes dans les captures pour certaines tailles
+coser.business.control.error.missingYearHaulSpeciesForCatchDataDetail=Couple %s manquant dans les captures
+coser.business.control.error.missingYearHaulSpeciesForCatchDataTip=V\u00E9rifier que pour chaque esp\u00E8ce pr\u00E9sent dans un trait d'une ann\u00E9e dans le fichier tailles (not\u00E9 Annee|Trait|Espece) il y a une donn\u00E9e dans le fichier captures (le contraire n'est pas vrai, i.e. il y a des esp\u00E8ces dans captures pour lesquelles il n'y a pas d'information dans le fichier tailles)
+coser.business.control.error.nonExistantSpecies=Esp\u00E8ces non existantes dans le reftax
+coser.business.control.error.nonExistantSpeciesDetail=Esp\u00E8ce %s non existante dans le reftax
+coser.business.control.error.surveyNotEquals=Les noms de campagnes de sont pas \u00E9gaux dans les 4 fichiers
+coser.business.control.error.yearsNotEquals=Les ann\u00E9es ne sont pas identiques dans les 4 fichiers
+coser.business.control.noerrorfound=Aucune erreur d\u00E9tect\u00E9e
+coser.business.control.step.crossFileChech=V\u00E9rification par croisement de fichiers (%d%%)
+coser.business.control.step.diffCatchLength=V\u00E9rification des diff\u00E9rences captures/taille (%d%%)
+coser.business.control.step.observation=V\u00E9rification du nombre d'observation \: %s (%d%%)
+coser.business.control.step.xworks=Validation par lignes \: %s (%d%%)
+coser.business.extract.creationdate=Date de cr\u00E9ation \:
+coser.business.extract.projectAuthor=Auteur du projet \:
+coser.business.extract.projectComment=Commentaire du projet \:
+coser.business.extract.projectName=Nom du project \:
+coser.business.extract.selectionName=Nom de la s\u00E9lection \:
+coser.business.line=Ligne
+coser.business.matrix.density=Densit\u00E9
+coser.business.matrix.lengthstructure=Structures en taille
+coser.business.matrix.occurrence=Occurrence
+coser.business.matrix.samplingeffort=Effort d'\u00E9chantillonnage
+coser.business.notificationmail.body=Les donn\u00E9es du site internet viennent d'\u00EAtre mises \u00E0 jour\n\n--\nCoser.
+coser.business.notificationmail.subject=Coser \: Donn\u00E9es mises \u00E0 jour
+coser.business.publication.author=Auteur
+coser.business.publication.catchfilename=Nom du fichier captures
+coser.business.publication.comment=Commentaire
+coser.business.publication.controllogexporttitle=Rapport des modifications (projet %s)
+coser.business.publication.creationdate=Date de cr\u00E9action
+coser.business.publication.datamodification=Modifications sur les donn\u00E9es
+coser.business.publication.date=Le
+coser.business.publication.errorexportlines=Lignes
+coser.business.publication.errorexporttitle=Rapport de contr\u00F4le (projet %s)
+coser.business.publication.errorgraph=Graphique
+coser.business.publication.errorgraphs=Graphiques
+coser.business.publication.haulfilename=Nom du fichier traits
+coser.business.publication.lengthfilename=Nom du fichier tailles
+coser.business.publication.projectdetails=D\u00E9tails du projet
+coser.business.publication.selectionchoices=Choix de s\u00E9lections
+coser.business.publication.selectionlogexporttitle=Rapport de la s\u00E9lection %s (projet %s)
+coser.business.publication.stratafilename=Nom du fichier strates
+coser.business.result.rsufiResultAlreadyExists=Le r\u00E9sultat %D existe d\u00E9j\u00E0 \!
+coser.business.resultupload.duplicatedresult=Le r\u00E9sultat %s/%s/%s duplique un autre r\u00E9sultat pour la zone %s \!
+coser.business.selection.notValidatedControl=Contr\u00F4le non valid\u00E9 \!
+coser.business.uploadresult.checkcollision=V\u00E9rification des collisions de zones
+coser.business.uploadresult.modifyResultOptions=Modification des options des r\u00E9sultats
+coser.business.uploadresult.preparezip=Pr\u00E9paration de l'archive zip\u2026
+coser.business.uploadresult.sendzip=Envoi de l'archive zip\u2026
+coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles (en pourcent, par exemple pour 5% mettre 5.0)
+coser.config.control.nobsmin.description=Nombre minimal d'observation
+coser.config.control.typeFish.description=Nom du type d'esp\u00E8ces correspondant aux poissons
+coser.config.database.directory.description=Emplacement du dossier de toutes les donn\u00E9es relatives \u00E0 Coser
+coser.config.locale.description=Langue de l'application
+coser.config.projects.directory.description=Emplacement du dossier de sauvegarde des projets
+coser.config.reference.species.description=Emplacement du fichier de r\u00E9f\u00E9rence des esp\u00E8ces (Reftax)
+coser.config.reference.typeSpecies.description=Emplacement du fichier de code type des esp\u00E8ces
+coser.config.selection.densityFilter.description=Filtre par d\u00E9faut sur la moyenne des densit\u00E9s
+coser.config.selection.occurrenceFilter.description=Filtre par d\u00E9faut sur la moyenne des occurrences
+coser.config.smtp.host.description=Adresse du serveur SMTP pour envoyer les mails
+coser.config.validator.directory.description=Emplacement des fichiers de contr\u00F4les
+coser.config.web.frontend.description=Adresse du serveur web coser
+coser.config.web.indicators.file.description=Fichier de correspondance des indicateurs
+coser.config.web.indicators.projects.directory.description=Dossier de stockage des projets indicateurs pour le Web
+coser.config.web.maps.projects.directory.description=Dossier de stockage des projets cartes pour le Web
+coser.config.web.newresult.emails.description=Liste des destinataires des notifications de nouveaux r\u00E9sultats
+coser.config.web.properties.file.description=Fichier d'enregistrement des informations serveur
+coser.config.web.uploadurl.description=Adresse d'envoi des r\u00E9sultats
+coser.config.web.zones.file.description=Fichier de correspondance des zones
+=======
Can't\ create\ project=Impossible de créer le projet
Can't\ find\ line\ %s\ for\ deletion=
Can't\ find\ line\ %s\ for\ undeletion=
@@ -164,3 +306,4 @@
sweptSurface\ must\ contain\ at\ least\ 3\ decimals=L'attribut SurfaceBalayee doit contenir au moins 3 decimales
weight\ attribute\ is\ not\ a\ valid\ double=L'attribut Poids n'est pas un réel valide
year\ is\ not\ valid\ (4\ digits.2\ digits)=L'attribut Année n'est pas valide (4 chiffres.2 chiffres)
+>>>>>>> .r909
1
0