Author: chatellier Date: 2010-11-26 13:47:45 +0000 (Fri, 26 Nov 2010) New Revision: 291 Log: Fill i18n en_GB file Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-26 13:47:45 UTC (rev 291) @@ -109,7 +109,7 @@ VALIDATOR_DIRECTORY("coser.validator.directory", _("coser.config.validator.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "validators", String.class, false, false), REFERENCE_SPECIES("coser.reference.species", _("coser.config.reference.species.description"), "", String.class, false, false), - REFERENCE_TYPE_ESPECES("coser.reference.typeEspeces", _("coser.config.reference.typeEspeces.description"), "", String.class, false, false), + REFERENCE_TYPE_ESPECES("coser.reference.typeSpecies", _("coser.config.reference.typeSpecies.description"), "", String.class, false, false), CONTROL_NOBSMIN("coser.control.nobsmin", _("coser.config.control.nobsmin.description"), "1.0", Double.class, false, false), CONTROL_DIFF_CATCH_LENGTH("coser.control.diffcatchlength", _("coser.config.control.diffcatchlength.description"), "5.0", Double.class, false, false), 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 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-26 13:47:45 UTC (rev 291) @@ -1682,7 +1682,7 @@ public Project mergeSpecies(Project project, Selection selection, String newSpecyName, String comment, String... speciesNames) throws CoserBusinessException { if (!isSpecyNameExist(project, newSpecyName)) { - throw new CoserBusinessException(_("Specy %s doesn't exist in referential", newSpecyName)); + throw new CoserBusinessException(_("Species %s doesn't exist in referential", newSpecyName)); } MergeSpeciesCommand command = new MergeSpeciesCommand(); Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Catch-error-validation.xml 2010-11-26 13:47:45 UTC (rev 291) @@ -47,7 +47,7 @@ <field name="species"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>Missing specy name</message> + <message>Missing species name</message> </field-validator> </field> <field name="numberAsString"> Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-11-26 13:47:45 UTC (rev 291) @@ -47,7 +47,7 @@ <field name="species"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>Missing specy name</message> + <message>Missing species name</message> </field-validator> </field> <field name="sex"> 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 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-11-26 13:47:45 UTC (rev 291) @@ -9,64 +9,64 @@ Missing\ haul\ name= Missing\ maturity\ attribute= Missing\ sex\ attribute= -Missing\ specy\ name= +Missing\ species\ name= Missing\ stratum\ name= Missing\ survey\ name= Project\ %s\ already\ exist= Project\ %s\ doesn't\ exists\ \!= Selection\ %s\ already\ exists= -Specy\ %s\ doesn't\ exist\ in\ referential= +Species\ %s\ doesn't\ exist\ in\ referential= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= coser.business.category.catch=Catch coser.business.category.haul=Haul coser.business.category.length=Length -coser.business.category.reftax.species= +coser.business.category.reftax.species=Reftax (species) coser.business.category.strata=Stata -coser.business.category.typeEspece=Specy type code -coser.business.chart.compareCatchLengthNumberTitle= -coser.business.common.number= -coser.business.common.year= -coser.business.control.error.allCategories= -coser.business.control.error.diffCatchLength= -coser.business.control.error.diffCatchLengthDetail= -coser.business.control.error.duplicatedLine= -coser.business.control.error.duplicatedLineDetails= -coser.business.control.error.invalidLengthLengthStep= -coser.business.control.error.minObservationCount= -coser.business.control.error.minObservationCountDetail= -coser.business.control.error.missingYearHaulForCatchData= -coser.business.control.error.missingYearHaulForCatchDataDetail= -coser.business.control.error.missingYearHaulForCatchDataTip= -coser.business.control.error.missingYearHaulForLengthData= -coser.business.control.error.missingYearHaulForLengthDataDetail= -coser.business.control.error.missingYearHaulForLengthDataTip= -coser.business.control.error.missingYearHaulSpeciesForCatchData= -coser.business.control.error.missingYearHaulSpeciesForCatchDataDetail= -coser.business.control.error.missingYearHaulSpeciesForCatchDataTip= -coser.business.control.error.noCatchNumberWithWeight= -coser.business.control.error.nonExistantSpecies= -coser.business.control.error.nonExistantSpeciesDetail= -coser.business.control.error.surveyNotEquals= -coser.business.control.error.yearsNotEquals= +coser.business.category.typeEspece=Species type code +coser.business.chart.compareCatchLengthNumberTitle=Comparison of numbers and length and catch (%s) +coser.business.common.number=Number +coser.business.common.year=Year +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.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.minObservationCount=Minimum number of observation not reached +coser.business.control.error.minObservationCountDetail=Minimum number of observation not reached (%s) \: %.2f +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.noCatchNumberWithWeight=Weight found without number +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= -coser.business.control.step.observation= -coser.business.control.step.xworks= +coser.business.control.step.crossFileChech=Cross file checks (%d%%) +coser.business.control.step.observation=Checking observation number (%d%%) +coser.business.control.step.xworks=Line checks (%d%%) coser.business.line=Line -coser.business.publication.htmlexportlines= -coser.business.publication.htmlexporttitle= -coser.business.result.rsufiResultAlreadyExists= -coser.business.selection.notValidatedControl= -coser.config.control.diffcatchlength.description= -coser.config.control.nobsmin.description= -coser.config.database.directory.description= -coser.config.projects.directory.description= -coser.config.reference.species.description= -coser.config.reference.typeEspeces.description= -coser.config.selection.densityFilter.description= -coser.config.selection.occurrenceFilter.description= -coser.config.validator.directory.description= +coser.business.publication.htmlexportlines=Lines +coser.business.publication.htmlexporttitle=Error report for project %s +coser.business.result.rsufiResultAlreadyExists=Result %s already exists \! +coser.business.selection.notValidatedControl=Not validated control \! +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.database.directory.description=Coser database directory (all Coser data) +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.validator.directory.description=Validation files directory location depth\ attribute\ is\ not\ a\ valid\ double= lat\ attribute\ is\ not\ a\ valid\ double= lat\ must\ contain\ at\ least\ 5\ decimals= 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 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-11-26 13:47:45 UTC (rev 291) @@ -9,13 +9,13 @@ Missing\ haul\ name=Nom de trait manquant Missing\ maturity\ attribute=Attribut maturit\u00E9 manquant Missing\ sex\ attribute=Attribut sex manquant -Missing\ specy\ name=Nom d'esp\u00E8ce manquant +Missing\ species\ name=Nom d'esp\u00E8ce manquant Missing\ stratum\ name=Nom de strate manquant Missing\ survey\ name=Nom de campagne manquant 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 \! -Specy\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel +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.\ Find\ \:\ %s,\ expected\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans\n%s.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s. Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s=Mauvais ent\u00EAte de fichier d\u00E9tect\u00E9 dans %s.\n\nTrouv\u00E9\u2009\:\n\t%s\nAttendu\u2009\:\n\t%s\nou\u2009\:\n\t%s. coser.business.category.catch=Captures @@ -37,7 +37,7 @@ coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f 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 et capture, il y a une donn\u00E9e dans le fichier 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 taits 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 @@ -63,7 +63,7 @@ coser.config.database.directory.description=Emplacement du dossier de toutes les donn\u00E9es relatives \u00E0 Coser 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.typeEspeces.description=Emplacement du fichier de code type des esp\u00E8ces +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.validator.directory.description=Emplacement des fichiers de validations Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-11-26 13:47:45 UTC (rev 291) @@ -43,7 +43,7 @@ <JMenuItem text="coser.ui.mainframe.menu.data.summary" onActionPerformed="getHandler().showSummaryView()"/> <JMenuItem text="coser.ui.mainframe.menu.data.control" onActionPerformed="getHandler().showControlView()"/> <SelectionsListMenuItem id="menuWindowSelectionMenuItem" - text="coser.ui.mainframe.menu.data.selection" constructorParams="this" /> + text="coser.ui.mainframe.menu.data.selections" constructorParams="this" /> </JMenu> <JMenu id='menuOptions' text="coser.ui.mainframe.menu.options"> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-26 13:47:45 UTC (rev 291) @@ -252,7 +252,7 @@ return; } if (!codeTypeEspeceFile.canRead()) { - JOptionPane.showMessageDialog(projectView, _("coser.ui.project.createProjectMissingCodeTypeEspeces"), + JOptionPane.showMessageDialog(projectView, _("coser.ui.project.createProjectMissingCodeTypeSpecies"), _("coser.ui.project.missingFile"), JOptionPane.ERROR_MESSAGE); return; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphDialog.jaxx 2010-11-26 13:47:45 UTC (rev 291) @@ -29,7 +29,7 @@ <Table> <row> <cell> - <JLabel text="coser.ui.control.graph.specy"/> + <JLabel text="coser.ui.control.graph.species"/> </cell> <cell fill="horizontal"> <SpecyComboModel id="specyComboModel" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 2010-11-26 13:47:45 UTC (rev 291) @@ -84,7 +84,7 @@ </row> <row> <cell anchor="west"> - <JLabel text="coser.ui.project.captureFile" /> + <JLabel text="coser.ui.project.catchFile" /> </cell> <cell weightx="1" fill="horizontal" columns="2"> <JTextField id="projectCatchFile" text="{project.getCatchFile()}" /> @@ -99,7 +99,7 @@ </row> <row> <cell anchor="west"> - <JLabel text="coser.ui.project.stratesFile" /> + <JLabel text="coser.ui.project.strataFile" /> </cell> <cell fill="horizontal" columns="2"> <JTextField id="projectStrataFile" text="{project.getStrataFile()}" /> @@ -129,7 +129,7 @@ </row> <row> <cell anchor="west"> - <JLabel text="coser.ui.project.traitsFile" /> + <JLabel text="coser.ui.project.haulFile" /> </cell> <cell fill="horizontal" columns="2"> <JTextField id="projectHaulFile" text="{project.getHaulFile()}" /> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-11-26 13:47:45 UTC (rev 291) @@ -1,24 +1,24 @@ coser.config.application.version.description=Application's version -coser.config.category.configuration= -coser.config.category.configuration.description= -coser.config.category.path= -coser.config.category.path.description= +coser.config.category.configuration=Configuration +coser.config.category.configuration.description=Configuration (numerics data) +coser.config.category.path=Path +coser.config.category.path.description=File and directory configuration coser.config.config.file.description=Coser configuration file coser.config.locale.description=Application's locale coser.config.lookandfeel.description=Application's swing theme coser.config.support.email.description=Support email address coser.ui.common.cancel=Cancel coser.ui.common.comment=Comment -coser.ui.common.selectAll=All -coser.ui.common.selectAll.short= +coser.ui.common.selectAll=Select all +coser.ui.common.selectAll.short=All coser.ui.common.selectFile=Select\u2026 -coser.ui.common.unselectAll=None -coser.ui.common.unselectAll.short= +coser.ui.common.unselectAll=Unselect all +coser.ui.common.unselectAll.short=None coser.ui.common.valid=Valid coser.ui.config.title=Configuration -coser.ui.control.categorylabel= +coser.ui.control.categorylabel=Displayed data \: coser.ui.control.checkData=Check data -coser.ui.control.comment= +coser.ui.control.comment=Comment \: coser.ui.control.confirmDeletionMessage=Are you sure you want to delete this data ? coser.ui.control.confirmDeletionTitle=Confirm delete coser.ui.control.confirmDeletionsMessage=Are you sure you want to delete %d selected lines ? @@ -27,34 +27,34 @@ coser.ui.control.dataMenuReplace=Replace in %s for selection coser.ui.control.dataMenuReplaceAll=Replace in %s in all data coser.ui.control.deleteLine=Delete line -coser.ui.control.error.allCategories= +coser.ui.control.error.allCategories=All categories coser.ui.control.global.done=\u2026 coser.ui.control.global.message=Message -coser.ui.control.globalErrorMenuGenerateHTML= +coser.ui.control.globalErrorMenuGenerateHTML=Export as HTML coser.ui.control.globalErrorMenuLabel=Error menu coser.ui.control.globalErrorMenuSelectAll=Select all lines -coser.ui.control.graph.specy=Specy \: +coser.ui.control.graph.species=Species \: coser.ui.control.graphtitle=Graph -coser.ui.control.htmlReportCantBeOpened= -coser.ui.control.htmlReportError= -coser.ui.control.project.requiredauthor= -coser.ui.control.project.requiredcatchFile= -coser.ui.control.project.requiredhaulFile= -coser.ui.control.project.requiredlengthFile= -coser.ui.control.project.requiredname= -coser.ui.control.project.requiredstrataFile= +coser.ui.control.htmlReportCantBeOpened=HTML report as been generated in \:\n%s\nbut it can't be opened because default system browser in undefined \! +coser.ui.control.htmlReportError=Open error +coser.ui.control.project.requiredauthor=Author field is required +coser.ui.control.project.requiredcatchFile=Catch file is required +coser.ui.control.project.requiredhaulFile=Haul file is required +coser.ui.control.project.requiredlengthFile=Length file is required +coser.ui.control.project.requiredname=Project name is required +coser.ui.control.project.requiredstrataFile=Strata file is required coser.ui.control.replace.find=Find \: coser.ui.control.replace.inField=In field \: coser.ui.control.replace.replace=Replace \: -coser.ui.control.replace.replacedCount= +coser.ui.control.replace.replacedCount=%d lines replaced coser.ui.control.replace.title=Find and replace coser.ui.control.save=Save -coser.ui.control.validcontrol= -coser.ui.control.validcontroltip= +coser.ui.control.validcontrol=Valid control +coser.ui.control.validcontroltip=Mark control as validated. Can be done only after data check ended without errors. coser.ui.error.htmlmessage=An error occurs \: %s coser.ui.error.title=Global application error -coser.ui.graph.compareNumberCatchSize= -coser.ui.graph.lengthStructure= +coser.ui.graph.compareNumberCatchSize=Comparison Catch/Length +coser.ui.graph.lengthStructure=Length structure coser.ui.locale.mustRestart=You must restart application to take effect coser.ui.locale.title=Locale modification coser.ui.mainframe.menu.configuration=Configuration @@ -62,9 +62,9 @@ coser.ui.mainframe.menu.data.control=Control coser.ui.mainframe.menu.data.newSelection=New selection coser.ui.mainframe.menu.data.noSelection=No selection -coser.ui.mainframe.menu.data.noValidation= -coser.ui.mainframe.menu.data.selection=S\u00E9lection -coser.ui.mainframe.menu.data.summary= +coser.ui.mainframe.menu.data.noValidation=Control not validated +coser.ui.mainframe.menu.data.selections=S\u00E9lections +coser.ui.mainframe.menu.data.summary=Summary coser.ui.mainframe.menu.file=File coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais coser.ui.mainframe.menu.locale.uk=English @@ -74,75 +74,75 @@ coser.ui.mainframe.menu.quit=Quit coser.ui.mainframe.menu.validators=Validators coser.ui.mainframe.menu.view=View -coser.ui.mainframe.menu.view.lookandfeel=Theme +coser.ui.mainframe.menu.view.lookandfeel=Look and feel coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi -coser.ui.project.captureFile=Capture file \: +coser.ui.project.catchFile=Catch file \: coser.ui.project.createProject=Create project -coser.ui.project.createProjectMissingCodeTypeEspeces= -coser.ui.project.createProjectMissingReftax= +coser.ui.project.createProjectMissingCodeTypeSpecies=File 'CodeTypeSpecies' is not valid \!\n(check configuration \: coser.reference.typeSpecies) +coser.ui.project.createProjectMissingReftax=File 'Reftax' is not valid \!\n(check configuration \: coser.reference.species) coser.ui.project.creationError=Creation error coser.ui.project.customReferenceSpeciesFile=New reference file \: +coser.ui.project.haulFile=Haul file \: coser.ui.project.lengthFile=Length file \: -coser.ui.project.missingFile= +coser.ui.project.missingFile=Missing file coser.ui.project.newProject=New project coser.ui.project.openError=Open error coser.ui.project.openProject=Open coser.ui.project.openProjectTitle=Open existing project coser.ui.project.project=Project \: -coser.ui.project.projectauthor= -coser.ui.project.projectcomment=Comments \: +coser.ui.project.projectauthor=Author \: +coser.ui.project.projectcomment=Comment \: coser.ui.project.projectname=Project name \: -coser.ui.project.stratesFile=Strates file \: -coser.ui.project.summary.path= -coser.ui.project.summary.title= -coser.ui.project.summary.validated= -coser.ui.project.traitsFile=Traits file \: +coser.ui.project.strataFile=Strata file \: +coser.ui.project.summary.path=Project path \: +coser.ui.project.summary.title=Project summary +coser.ui.project.summary.validated=Control validated \: coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file coser.ui.project.usedReferenceSpeciesFile=Current reference file (Reffax) \: coser.ui.result.addNewResult=Save result coser.ui.result.addOtherDataFile=Add file coser.ui.result.availableDataTitle=Available results \: -coser.ui.result.cancel= +coser.ui.result.cancel=Cancel coser.ui.result.dataFile1=Data file 1 \: coser.ui.result.dataFile2=Data file 2 \: -coser.ui.result.extractDataButton=Extract -coser.ui.result.extractDataLabel=Extraction directory +coser.ui.result.extractDataButton=Extract as Rsufi format +coser.ui.result.extractDataLabel=Extraction directory \: coser.ui.result.extractDataTitle=Extract RSufi data -coser.ui.result.newResult= +coser.ui.result.newResult=New Result coser.ui.result.otherDataFile=Other files \: -coser.ui.result.requiredname= -coser.ui.result.requiredrsufiVersion= +coser.ui.result.requiredname=Result name is required +coser.ui.result.requiredrsufiVersion=Rsufi version is required coser.ui.result.resultName=Result name \: -coser.ui.result.rsufiVersion=RSufi version -coser.ui.result.saveError= -coser.ui.result.table.dataFile1= -coser.ui.result.table.dataFile2= -coser.ui.result.table.resultName= -coser.ui.result.table.rsufiVersion= -coser.ui.result.validNewResult= +coser.ui.result.rsufiVersion=RSufi version \: +coser.ui.result.saveError=Save error +coser.ui.result.table.dataFile1=Data file 1 +coser.ui.result.table.dataFile2=Data file 2 +coser.ui.result.table.resultName=Result name +coser.ui.result.table.rsufiVersion=RSufi Version +coser.ui.result.validNewResult=Add this result coser.ui.selection.allSpecies=L1 \: All species -coser.ui.selection.comment= +coser.ui.selection.comment=Comment \: coser.ui.selection.createError=Creation error -coser.ui.selection.details.comment=Comments -coser.ui.selection.details.dates= +coser.ui.selection.details.comment=Comments \: +coser.ui.selection.details.dates=Years \: coser.ui.selection.details.description=Description \: -coser.ui.selection.details.filteredSpecies= +coser.ui.selection.details.filteredSpecies=Filtered species (%d/%d) \: coser.ui.selection.details.name=Selection name \: coser.ui.selection.details.saveSelection=Save selection -coser.ui.selection.details.selectedSpecies= -coser.ui.selection.details.showMapTip= -coser.ui.selection.details.showSpreciesTip= -coser.ui.selection.details.strata=Strata \: -coser.ui.selection.details.type= -coser.ui.selection.details.validDates= -coser.ui.selection.details.validFilter= -coser.ui.selection.details.validSelection= -coser.ui.selection.details.validStrata= +coser.ui.selection.details.selectedSpecies=L1 \: Selected species (%d/%d) \: +coser.ui.selection.details.showMapTip=Display strata map +coser.ui.selection.details.showSpreciesTip=Display sampling effort table +coser.ui.selection.details.strata=Strata (%d/%d) \: +coser.ui.selection.details.type=Filter by type (%d/%d) \: +coser.ui.selection.details.validDates=Valid years +coser.ui.selection.details.validFilter=Valid filter +coser.ui.selection.details.validSelection=Valid selection +coser.ui.selection.details.validStrata=Valid strata coser.ui.selection.filter.density=Density \: coser.ui.selection.filter.filter=Filter coser.ui.selection.filter.occurrence=Occurrence \: -coser.ui.selection.fusion.comment=Comment -coser.ui.selection.fusion.description=Species merge. Fill new specy name with name existing in referential. +coser.ui.selection.fusion.comment=Comment \: +coser.ui.selection.fusion.description=Species merge. Fill new species name with name existing in referential. coser.ui.selection.fusion.name=New name \: coser.ui.selection.fusion.title=Merge coser.ui.selection.fusionError=Merge error @@ -151,8 +151,8 @@ coser.ui.selection.occurenceDensitySpecies=L2 \: Filtered species coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> coser.ui.selection.saveError=Save error -coser.ui.selection.selection.requiredDescription= -coser.ui.selection.selection.requiredName= +coser.ui.selection.selection.requiredDescription=Selection description is required +coser.ui.selection.selection.requiredName=Selection name is required coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMenuLabel=Species menu Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-26 12:39:12 UTC (rev 290) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-26 13:47:45 UTC (rev 291) @@ -12,7 +12,7 @@ coser.ui.common.selectAll=S\u00E9lectionner tout coser.ui.common.selectAll.short=Tout coser.ui.common.selectFile=S\u00E9lectionner\u2026 -coser.ui.common.unselectAll=D\u00E9-s\u00E9lectionner tout +coser.ui.common.unselectAll=D\u00E9s\u00E9lectionner tout coser.ui.common.unselectAll.short=Aucun coser.ui.common.valid=Valider coser.ui.config.title=Configuration @@ -33,7 +33,7 @@ coser.ui.control.globalErrorMenuGenerateHTML=Exporter en HTML coser.ui.control.globalErrorMenuLabel=Menu des erreurs coser.ui.control.globalErrorMenuSelectAll=S\u00E9lectionner toutes les lignes -coser.ui.control.graph.specy=Esp\u00E8ces \: +coser.ui.control.graph.species=Esp\u00E8ces \: coser.ui.control.graphtitle=Graphique coser.ui.control.htmlReportCantBeOpened=Le rapport HTML a \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9 dans le fichier \:\n%s\nmais ne peut pas \u00EAtre ouvert automatiquement car le navigateur\npar d\u00E9faut du syst\u00E8me n'est pas d\u00E9fini \! coser.ui.control.htmlReportError=Erreur d'ouverture @@ -41,7 +41,7 @@ coser.ui.control.project.requiredcatchFile=Le fichier 'capture' est requis coser.ui.control.project.requiredhaulFile=Le fichier 'traits' est requis coser.ui.control.project.requiredlengthFile=Le fichier 'taille' est requis -coser.ui.control.project.requiredname=Le champ 'nom' est requis +coser.ui.control.project.requiredname=Le nom du project est requis coser.ui.control.project.requiredstrataFile=Le fichier 'strates' est requis coser.ui.control.replace.find=Chercher \: coser.ui.control.replace.inField=Dans le champ \: @@ -63,7 +63,7 @@ coser.ui.mainframe.menu.data.newSelection=Nouvelle s\u00E9lection coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection coser.ui.mainframe.menu.data.noValidation=Contr\u00F4le non valid\u00E9 -coser.ui.mainframe.menu.data.selection=S\u00E9lections +coser.ui.mainframe.menu.data.selections=S\u00E9lections coser.ui.mainframe.menu.data.summary=R\u00E9sum\u00E9 coser.ui.mainframe.menu.file=Fichier coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais @@ -76,13 +76,14 @@ coser.ui.mainframe.menu.view=Vue coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi -coser.ui.project.captureFile=Fichier de captures \: +coser.ui.project.catchFile=Fichier de captures \: coser.ui.project.createProject=Cr\u00E9er le projet -coser.ui.project.createProjectMissingCodeTypeEspeces=Le fichier 'CodeTypeEspeces' n'est pas valide \!\n(v\u00E9rifiez la configuration \: coser.reference.typeEspeces) +coser.ui.project.createProjectMissingCodeTypeSpecies=Le fichier 'CodeTypeEspeces' n'est pas valide \!\n(v\u00E9rifiez la configuration \: coser.reference.typeSpecies) coser.ui.project.createProjectMissingReftax=Le fichier 'Reftax' n'est pas valide \!\n(v\u00E9rifiez la configuration \: coser.reference.species) coser.ui.project.creationError=Erreur de cr\u00E9ation coser.ui.project.customReferenceSpeciesFile=Nouveau fichier de r\u00E9f\u00E9rence \: -coser.ui.project.lengthFile=Fichiers des tailles \: +coser.ui.project.haulFile=Fichier des traits \: +coser.ui.project.lengthFile=Fichier des tailles \: coser.ui.project.missingFile=Fichier manquant coser.ui.project.newProject=Nouveau projet coser.ui.project.openError=Erreur d'ouverture @@ -92,11 +93,10 @@ coser.ui.project.projectauthor=Auteur \: coser.ui.project.projectcomment=Commentaire \: coser.ui.project.projectname=Nom du projet \: -coser.ui.project.stratesFile=Fichiers des strates \: +coser.ui.project.strataFile=Fichier des strates \: coser.ui.project.summary.path=Chemin du projet \: coser.ui.project.summary.title=R\u00E9sum\u00E9 du projet coser.ui.project.summary.validated=Contr\u00F4le valid\u00E9 \: -coser.ui.project.traitsFile=Fichiers des traits \: coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence coser.ui.project.usedReferenceSpeciesFile=Fichier de r\u00E9f\u00E9rence utilis\u00E9 (Reftax) \: coser.ui.result.addNewResult=Ajouter un r\u00E9sultat @@ -105,12 +105,12 @@ coser.ui.result.cancel=Annuler coser.ui.result.dataFile1=Fichier r\u00E9sultat 1 \: coser.ui.result.dataFile2=Fichier r\u00E9sultat 2 \: -coser.ui.result.extractDataButton=Extraire +coser.ui.result.extractDataButton=Extraire au format RSufi coser.ui.result.extractDataLabel=Dossier d'extraction \: -coser.ui.result.extractDataTitle=Extraction des donn\u00E9es d'entr\u00E9e de RSufi +coser.ui.result.extractDataTitle=Extraction des donn\u00E9es RSufi coser.ui.result.newResult=Nouveau r\u00E9sultat coser.ui.result.otherDataFile=Autre fichiers \: -coser.ui.result.requiredname=Le champ 'name' est requis +coser.ui.result.requiredname=Le nom du r\u00E9sultat est requis coser.ui.result.requiredrsufiVersion=Le champ 'rsufiVersion' est requis coser.ui.result.resultName=Nom du r\u00E9sultat \: coser.ui.result.rsufiVersion=Version de RSufi \: @@ -130,8 +130,8 @@ coser.ui.selection.details.name=Nom de la s\u00E9lection \: coser.ui.selection.details.saveSelection=Sauvegarder la s\u00E9lection coser.ui.selection.details.selectedSpecies=L1 \: Esp\u00E8ces s\u00E9lectionn\u00E9es (%d/%d) \: -coser.ui.selection.details.showMapTip=Afficher la carte des zones -coser.ui.selection.details.showSpreciesTip=Afficher la table des esp\u00E8ces +coser.ui.selection.details.showMapTip=Afficher la carte des strates +coser.ui.selection.details.showSpreciesTip=Afficher la table de l'effort d'\u00E9chantillonage coser.ui.selection.details.strata=Strates (%d/%d) \: coser.ui.selection.details.type=Filtrer par type (%d/%d) \: coser.ui.selection.details.validDates=Valider les ann\u00E9es @@ -151,8 +151,8 @@ coser.ui.selection.occurenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> coser.ui.selection.saveError=Erreur de sauvegarde -coser.ui.selection.selection.requiredDescription=Le champ 'description' est requis -coser.ui.selection.selection.requiredName=Le champ 'nom' est requis +coser.ui.selection.selection.requiredDescription=La description de la s\u00E9lection est requise +coser.ui.selection.selection.requiredName=Le nom de la s\u00E9lection est requis coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es coser.ui.selection.speciesMenuFusion=Fusion coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces