Author: fdesbois Date: 2012-09-12 16:37:52 +0200 (Wed, 12 Sep 2012) New Revision: 574 Url: http://forge.codelutin.com/repositories/revision/sammoa/574 Log: some labels corrections Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-09-12 14:37:34 UTC (rev 573) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-09-12 14:37:52 UTC (rev 574) @@ -384,7 +384,7 @@ ), /** The auto commit delay for {@link AutoSaveListener} */ AUTO_COMMIT_DELAY("auto.commit.delay", - n_("sammoa.config.flight.number"), + n_("sammoa.config.autoCommitDelay"), "30000", Long.class ), Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-09-12 14:37:34 UTC (rev 573) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-09-12 14:37:52 UTC (rev 574) @@ -808,7 +808,7 @@ } protected String computeObservationId(Flight flight, Observation observation) { - return "O" + observation.getObservationNumber() + "-" + + return "S" + observation.getObservationNumber() + "-" + flight.getFlightNumber() + "-" + flight.getSystemId(); } Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-09-12 14:37:34 UTC (rev 573) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-09-12 14:37:52 UTC (rev 574) @@ -1,12 +1,13 @@ sammoa.config.admin.email=Administrator's email sammoa.config.application.site.url=Website URL of the application sammoa.config.application.version=Version of the application -sammoa.config.audio.compression= +sammoa.config.audio.compression=Audio compression (possible values \: ULAW) sammoa.config.audio.recordDelayInSeconds=Delay in seconds between each audio record. This will record multiple files at the same time to avoid too sudden stops. (Warning \: this is not supported by all sound systems) sammoa.config.audio.sampleRate=Rate for the audio sampling (possible values \: 8000, 11025, 16000, 22050, 44100) sammoa.config.audio.sampleSizeInBits=Size of bits for the audio sampling (possible values \: 8, 16) +sammoa.config.autoCommitDelay=Time in milliseconds between each auto save in database sammoa.config.background.shape.file=Location of the Background shape file -sammoa.config.backup.directory=BAckup directory where to sotre all data backup +sammoa.config.backup.directory=Backup directory where to store all data backup sammoa.config.campaign.directory=Directory where are stored campaign data (maps, flight audio files,...) sammoa.config.campaign.id=Id of the default campaign to use sammoa.config.csv.separator=Csv separator caracter to use @@ -19,23 +20,23 @@ sammoa.config.gps.handler=GpsHandler class \: fr.ulr.sammoa.application.device.gps.GpsHandlerGpylon or fr.ulr.sammoa.application.device.gps.FakeGpsHandler sammoa.config.gps.speed=GPS speed for capture sammoa.config.gps.timeout=Time in seconds before GPS going to timeout (always the same data is received for this laps of time) and return error -sammoa.config.license.organizationName= +sammoa.config.license.organizationName=Name of the organization for license sammoa.config.log.file=Path for application log file sammoa.config.system.id=Id of the default system to use sammoa.config.tmp.directory=Temporary directory used for different task (import, export,...) -sammoa.config.ui.add=Add -sammoa.config.ui.begin=Begin -sammoa.config.ui.centerObservation=Observation from the center place +sammoa.config.ui.add=Add a new LEG (conditions have changed) +sammoa.config.ui.begin=Begin the effort on the next transect or restart effort from previous Circle-Back +sammoa.config.ui.centerObservation=Sighting from the center observer sammoa.config.ui.circleBack=Start a circle-back sammoa.config.ui.config=Path for application windows configuration file -sammoa.config.ui.end=End -sammoa.config.ui.leftObservation=Observation from the left place +sammoa.config.ui.end=End the effort +sammoa.config.ui.leftObservation=Sighting from the left observer sammoa.config.ui.locale=Application language -sammoa.config.ui.next=Next -sammoa.config.ui.rightObservation=Observation from the right place -sammoa.config.ui.start=Start -sammoa.config.ui.stop=Stop -sammoa.config.ui.validObservation=Validate the selected observation +sammoa.config.ui.next=Next effort will end the current one and begin on the next transect +sammoa.config.ui.rightObservation=Sighting from the right observer +sammoa.config.ui.start=Start the flight +sammoa.config.ui.stop=Stop the flight +sammoa.config.ui.validObservation=Validate the selected sighting sammoa.config.ui.validRoute=Validate the selected route sammoa.config.ui.validTransect=Validate the selected transect sammoa.dateTimePattern=dd/MM/yyyy HH\:mm\:ss Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-12 14:37:34 UTC (rev 573) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-12 14:37:52 UTC (rev 574) @@ -4,16 +4,16 @@ sammoa.action.about=About sammoa.action.about.tip=About sammoa.action.add=Add -sammoa.action.add.tip=ADD \: create a new LEG route for the current Transect (the observation conditions have changed) +sammoa.action.add.tip=ADD \: create a new LEG route for the current Transect (the sighting conditions have changed) sammoa.action.audioCheck=Audio test sammoa.action.audioCheck.tip=Audio test sammoa.action.begin=Begin sammoa.action.begin.tip=BEGIN \: begin effort to create a new LEG route for the next selected Transect sammoa.action.cancel=Cancel sammoa.action.cancelExport=Cancel -sammoa.action.center.tip=CENTER \: create a new Observation for the navigator's observer +sammoa.action.center.tip=CENTER \: create a new sighting for the navigator's observer sammoa.action.choose.export.directory=Accept -sammoa.action.circleBack.tip=CIRCLE-BACK \: create a CIRCLE_BACK route for this observation as cause +sammoa.action.circleBack.tip=CIRCLE-BACK \: create a CIRCLE_BACK route for this sighting as cause sammoa.action.close=Close sammoa.action.configuration=Configuration sammoa.action.configuration.tip=Configuration @@ -26,11 +26,11 @@ sammoa.action.exportEffortsMap=Export Efforts sammoa.action.exportGeoPointsMap=Export GPS Points sammoa.action.exportMap=Export Maps -sammoa.action.exportObservationsMap=Export Observations +sammoa.action.exportObservationsMap=Export Sightings sammoa.action.home=Home sammoa.action.home.tip=Home sammoa.action.importApplication=Import -sammoa.action.left.tip=LEFT \: create a new Observation for the observer on the left side +sammoa.action.left.tip=LEFT \: create a new sighting for the observer on the left side sammoa.action.loadImportApplicationFile=Load selected import file sammoa.action.new=New sammoa.action.next=Next @@ -40,11 +40,11 @@ sammoa.action.quitExportMaps=Quit sammoa.action.quitImportApplication=Quit sammoa.action.reload.actions=Reload actions -sammoa.action.reload.audio=Relad Audio device +sammoa.action.reload.audio=Reload Audio device sammoa.action.reload.gps=Reload GPS device sammoa.action.reload.home=Reload home screen sammoa.action.reload.ui=Reload sammoa ui -sammoa.action.right.tip=RIGHT \: create a new Observation for the observer on the right side +sammoa.action.right.tip=RIGHT \: create a new sighting for the observer on the right side sammoa.action.save=Save sammoa.action.site=Site sammoa.action.site.tip=Display project site @@ -53,14 +53,14 @@ sammoa.action.startAudio.tip=Start audio sammoa.action.startExport=Start sammoa.action.stop=Stop flight -sammoa.action.stop.tip=STOP \: stop the flight. No other actions on routes and observations could be done after stop. +sammoa.action.stop.tip=STOP \: stop the flight. No other actions on routes and sightings could be done after stop. sammoa.action.stopAudio.tip=Stop audio -sammoa.action.validObservation=Observation -sammoa.action.validObservation.tip=Validate the selected observation +sammoa.action.validObservation=Sighting +sammoa.action.validObservation.tip=Validate the selected sighting sammoa.action.validRoute=Route -sammoa.action.validRoute.tip=Validate the selected route and all its observations +sammoa.action.validRoute.tip=Validate the selected route and all its sightings sammoa.action.validTransect=Transect -sammoa.action.validTransect.tip=Validate the selected transect and all its routes and observations +sammoa.action.validTransect.tip=Validate the selected transect and all its routes and sightings sammoa.action.validation=Validation sammoa.config.category.applications=Application sammoa.config.category.applications.description=Application @@ -110,7 +110,7 @@ sammoa.importApplication.flightTable.column.toTreat.tip=Select the flight to import it sammoa.info.importApplication.importfile.loaded.on.existingCampaign=Import an existing campaign %s, please choose which flights of the following list to import sammoa.info.importApplication.importfile.loaded.on.newCampaign=Import a new campaign %s, all the flights of the following list will be imported -sammoa.info.importApplication.no.importfile.loaded=No import file loaded, choose an file to import then press the 'load import file' button +sammoa.info.importApplication.no.importfile.loaded=No import file loaded, choose a file to import then press the 'load import file' button sammoa.inputDialog.flightNumber.error.lessThanNextFlightNumber=The flight number can't be less than %d sammoa.inputDialog.flightNumber.error.notANumber=The flight number must be a valid integer sammoa.inputDialog.flightNumber.message=Choose the flight number @@ -181,7 +181,7 @@ sammoa.observation.observations.center=Center sammoa.observation.observations.left=Left sammoa.observation.observations.right=Right -sammoa.observation.title=<html><b>Observation</b></html> +sammoa.observation.title=<html><b>Sighting</b></html> sammoa.observationCondition.title=<html><b>Conditions</b></html> sammoa.observations.observationTable.column.age=Age sammoa.observations.observationTable.column.age.tip=Age @@ -263,7 +263,7 @@ sammoa.title.choose.export.directory=Choose directory where to export maps sammoa.title.export.exportEfforts=Efforts Export sammoa.title.export.exportGeoPoints=GPS Points ExportGPS -sammoa.title.export.exportObservations=Observations Export +sammoa.title.export.exportObservations=Sightings Export sammoa.title.exportApplication=Application Export sammoa.title.exportshape=Export Maps sammoa.title.flight=System %1$s - Campaign %2$s - Region %3$s - Flight n°%4$d @@ -278,7 +278,7 @@ sammoa.validator.campaign.endDate.required=The end date must be defined sammoa.validator.campaign.region.required=The region must be set sammoa.validator.campaign.uniqueKey=The campaign code '%1$s' already exists for the region '%2$s' -sammoa.validator.observation.age.unkownValue=The age must be \: J for "juvénile", I for "immature", A for "adulte" and M for mixed groups +sammoa.validator.observation.age.unkownValue=The age must be \: J for "juvenile", I for "immature", A for "adult" and M for mixed groups sammoa.validator.observation.behaviour.unkownValue=The behaviour must be one of this value \: SW (normal), MI (milling), BR (breaching), LO (logging), FE (feeding), FA (feeding aggregation), SB (following boat), OT (other) sammoa.validator.observation.cue.unkownValue=The cue must be between 2 and 9 or U for underwater and A for surface sammoa.validator.observation.decAngle.invalidRange=The angle must be between %1$s and %2$s degrees or for the band \: 1 (in the band), 2 (outside the band), 3 (put in the band)