- Coser-commits - mailman.cloud.codelutin.com

r915 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/java/fr/ifremer/coser/util coser-ui/src/main/java/fr/ifremer/coser/ui/maps
by echatellier＠users.forge.codelutin.com Dec. 6, 2011

Dec. 6, 2011

Author: echatellier Date: 2011-12-06 18:18:23 +0100 (Tue, 06 Dec 2011) New Revision: 915 Url: http://forge.codelutin.com/repositories/revision/coser/915 Log: Display each haul series in differents colors Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/util/Coordinate.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-12-05 10:08:58 UTC (rev 914) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-12-06 17:18:23 UTC (rev 915) @@ -2886,12 +2886,22 @@ public List<Coordinate> getStrataHaulCoordinate(Selection selection, Collection<String> strataCollection) throws CoserBusinessException { List<Coordinate> hauls = new ArrayList<Coordinate>(); + + // serie cache to compute serie index + List<String> serieCache = new ArrayList<String>(); Iterator<String[]> itData = selection.getHaul().iterator(true); while (itData.hasNext()) { String[] tuple = itData.next(); String strata = tuple[Haul.INDEX_STRATUM]; + + // add it to cache (even not selected to stay same color + // in different display) + if (!serieCache.contains(strata)) { + serieCache.add(strata); + } + if (strataCollection.contains(strata)) { String stratum = tuple[Haul.INDEX_STRATUM]; String year = tuple[Haul.INDEX_YEAR]; @@ -2904,7 +2914,8 @@ double dlong = Double.parseDouble(longi); String name = _("coser.business.map.haulname", stratum, year, haul); - Coordinate coordinate = new Coordinate(name, dlat, dlong); + int serieIndex = serieCache.indexOf(strata); + Coordinate coordinate = new Coordinate(serieIndex, name, dlat, dlong); hauls.add(coordinate); } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/util/Coordinate.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/util/Coordinate.java 2011-12-05 10:08:58 UTC (rev 914) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/util/Coordinate.java 2011-12-06 17:18:23 UTC (rev 915) @@ -41,6 +41,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = -5111417883474394223L; + protected int serie; + protected String name; protected double latitude; @@ -51,13 +53,22 @@ } - public Coordinate(String name, double latitude, double longitude) { + public Coordinate(int serie, String name, double latitude, double longitude) { this(); + this.serie = serie; this.name = name; this.latitude = latitude; this.longitude = longitude; } + public int getSerie() { + return serie; + } + + public void setSerie(int serie) { + this.serie = serie; + } + public String getName() { return name; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2011-12-05 10:08:58 UTC (rev 914) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2011-12-06 17:18:23 UTC (rev 915) @@ -46,11 +46,25 @@ */ public class HaulLocationHandler extends AbstractLocationHandler { + protected static Color[] markerColors = new Color[] { + Color.RED, + Color.BLUE, + Color.CYAN, + Color.GRAY, + Color.BLACK, + Color.GREEN, + Color.GREEN.darker(), + Color.MAGENTA, + Color.PINK, + Color.YELLOW, + new Color(165, 3, 63) // purple + }; + protected List<Coordinate> coordinates; public HaulLocationHandler(List<Coordinate> coordinates) { this.coordinates = coordinates; - setLocationColor(Color.RED); + setLocationColor(Color.GREEN); setShowLocations(true); } @@ -61,14 +75,14 @@ public OMGraphicList get(float nwLat, float nwLon, float seLat, float seLon, OMGraphicList graphicList) { for (Coordinate coordinate : coordinates) { + + // get color index in color array depending on serie + int serie = coordinate.getSerie(); + serie = serie % markerColors.length; + Location location = new BasicLocation(coordinate.getLatitude(), coordinate.getLongitude(), coordinate.getName(), null); location.setLocationHandler(this); - //location.getLabel().setLinePaint(Color.BLACK); - //location.getLabel().setMatted(true); - //location.setLinePaint(Color.BLUE); - location.setShowName(true); - location.setShowLocation(true); - + location.getLocationMarker().setLinePaint(markerColors[serie]); graphicList.add(location); }

1 0

r914 - trunk/coser-business/src/test/resources
by oberthel＠users.forge.codelutin.com Dec. 5, 2011

Dec. 5, 2011

Author: oberthel Date: 2011-12-05 11:08:58 +0100 (Mon, 05 Dec 2011) New Revision: 914 Url: http://forge.codelutin.com/repositories/revision/coser/914 Log: Petites modif de texte pour crustaflam Modified: trunk/coser-business/src/test/resources/webzones.csv Modified: trunk/coser-business/src/test/resources/webzones.csv =================================================================== --- trunk/coser-business/src/test/resources/webzones.csv 2011-12-05 09:31:54 UTC (rev 913) +++ trunk/coser-business/src/test/resources/webzones.csv 2011-12-05 10:08:58 UTC (rev 914) @@ -10,7 +10,7 @@ "noursom";"mancheorientale";"Manche orientale";"Baie de Somme";"1994 >";"Noursom";;"C_Noursom.png" "nurvil";"atlantique";"Atlantique";"Baie de Vilaine";"1997 >";"Nurvil";"";"C_Nurvil.png" "noursein";"mancheorientale";"Manche orientale";"Baie de Seine";"1995 - 2010";"Noursein";"Série arrêtée en 2010";"C_Noursein.png" -"crustaflam";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"1985 >";"Crustaflam";;"C_Crustaflam.png" +"crustaflam";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"Juin 1985 >";"Crustaflam";"Série du mois de juin";"C_Crustaflam.png" "crustaflam2";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"Sept. – 1985 >";"Crustaflam";"Série du mois de septembre";"C_Crustaflam.png" "gdgmc";"atlantique";"Atlantique";"Golfe de Gascogne + mer Celtique";"1997 >";"Evhoe";"Ensemble de la couverture Evhoe";"C_GdG-MC.png" "mcech";"atlantique";"Atlantique";"Mer Celtique (strates d'échantillonnage)";"1997 >";"Evhoe";;"C_MC-Ech.png"

1 0

r913 - trunk/coser-business/src/test/resources
by oberthel＠users.forge.codelutin.com Dec. 5, 2011

Dec. 5, 2011

Author: oberthel Date: 2011-12-05 10:31:54 +0100 (Mon, 05 Dec 2011) New Revision: 913 Url: http://forge.codelutin.com/repositories/revision/coser/913 Log: ajout?\195?\169 campagne nurvil et modifi?\195?\169 texte de crustaflam (chang?\195?\169 1986 et 1985) Modified: trunk/coser-business/src/test/resources/webzones.csv Modified: trunk/coser-business/src/test/resources/webzones.csv =================================================================== --- trunk/coser-business/src/test/resources/webzones.csv 2011-12-04 21:50:34 UTC (rev 912) +++ trunk/coser-business/src/test/resources/webzones.csv 2011-12-05 09:31:54 UTC (rev 913) @@ -8,9 +8,10 @@ "cieme7d";"mancheorientale";"Manche orientale";"Est de 1° 15' O";"1988 >";"CGFS";;"C_Ciem-E7d.png" "ciem7d";"mancheorientale";"Manche orientale";"Ensemble Manche orientale";"1990 >";"CGFS";"Correspond à l'ensemble de la zone VIId du CIEM";"C_Ciem-7d.png" "noursom";"mancheorientale";"Manche orientale";"Baie de Somme";"1994 >";"Noursom";;"C_Noursom.png" +"nurvil";"atlantique";"Atlantique";"Baie de Vilaine";"1997 >";"Nurvil";"";"C_Nurvil.png" "noursein";"mancheorientale";"Manche orientale";"Baie de Seine";"1995 - 2010";"Noursein";"Série arrêtée en 2010";"C_Noursein.png" -"crustaflam";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"1986 >";"Crustaflam";;"C_Crustaflam.png" -"crustaflam2";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"Sept. – 1986 >";"Crustaflam";"Série du mois de septembre";"C_Crustaflam.png" +"crustaflam";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"1985 >";"Crustaflam";;"C_Crustaflam.png" +"crustaflam2";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"Sept. – 1985 >";"Crustaflam";"Série du mois de septembre";"C_Crustaflam.png" "gdgmc";"atlantique";"Atlantique";"Golfe de Gascogne + mer Celtique";"1997 >";"Evhoe";"Ensemble de la couverture Evhoe";"C_GdG-MC.png" "mcech";"atlantique";"Atlantique";"Mer Celtique (strates d'échantillonnage)";"1997 >";"Evhoe";;"C_MC-Ech.png" "mcciem7";"atlantique";"Atlantique";"Mer Celtique (zone VII du CIEM)";"1997 >";"Evhoe";"La limite sud de la zone VII du CIEM (48 °N) constitue aussi une limite de régions de la DCSMM";"C_MC-Ciem-7.png"

1 0

r912 - in trunk: . coser-business coser-ui
by echatellier＠users.forge.codelutin.com Dec. 4, 2011

Dec. 4, 2011

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 Dec. 1, 2011

Dec. 1, 2011

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 Dec. 1, 2011

Dec. 1, 2011

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

r909 - trunk
by maven-release＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: maven-release Date: 2011-11-28 23:23:19 +0100 (Mon, 28 Nov 2011) New Revision: 909 Url: http://forge.codelutin.com/repositories/revision/coser/909 Log: Update mavenpom4redmine to 3.0.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 13:40:44 UTC (rev 908) +++ trunk/pom.xml 2011-11-28 22:23:19 UTC (rev 909) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r908 - in trunk: coser-business coser-ui
by echatellier＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: echatellier Date: 2011-11-28 14:40:44 +0100 (Mon, 28 Nov 2011) New Revision: 908 Url: http://forge.codelutin.com/repositories/revision/coser/908 Log: Update jfreechart Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-11-28 09:41:30 UTC (rev 907) +++ trunk/coser-business/pom.xml 2011-11-28 13:40:44 UTC (rev 908) @@ -86,11 +86,11 @@ <artifactId>javassist</artifactId> </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jcommon</artifactId> </dependency> <dependency> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-11-28 09:41:30 UTC (rev 907) +++ trunk/coser-ui/pom.xml 2011-11-28 13:40:44 UTC (rev 908) @@ -101,7 +101,7 @@ <artifactId>jxlayer</artifactId> </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> <dependency>

1 0

r907 - trunk
by echatellier＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: echatellier Date: 2011-11-28 10:41:30 +0100 (Mon, 28 Nov 2011) New Revision: 907 Url: http://forge.codelutin.com/repositories/revision/coser/907 Log: Update nuiton-matrix (with relocated jfreechart). Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 09:06:59 UTC (rev 906) +++ trunk/pom.xml 2011-11-28 09:41:30 UTC (rev 907) @@ -130,14 +130,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2</version> + <version>2.2.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2</version> + <version>2.2.1</version> <scope>compile</scope> </dependency> @@ -184,16 +184,16 @@ </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> - <version>1.0.13</version> + <version>1.0.14</version> <scope>compile</scope> </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jcommon</artifactId> - <version>1.0.16</version> + <version>1.0.17</version> <scope>compile</scope> </dependency>

1 0

r906 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: echatellier Date: 2011-11-28 10:06:59 +0100 (Mon, 28 Nov 2011) New Revision: 906 Url: http://forge.codelutin.com/repositories/revision/coser/906 Log: Fix test (zones added by olivier) Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-11-25 16:49:31 UTC (rev 905) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-11-28 09:06:59 UTC (rev 906) @@ -100,7 +100,7 @@ @Test public void testGetZones() throws CoserBusinessException { DataStorage zones = webService.getZonesMap(); - Assert.assertEquals(21, zones.size()); + Assert.assertEquals(22, zones.size()); } /**

1 0