Author: chatellier
Date: 2009-12-16 14:19:25 +0000 (Wed, 16 Dec 2009)
New Revision: 2847
Modified:
isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Improve translation
Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-16 11:51:57 UTC (rev 2846)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-12-16 14:19:25 UTC (rev 2847)
@@ -40,7 +40,6 @@
Process\ template\ error=
Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import=
Region\ %s\ already\ inited=
-Remote\ IsisFish\ server=
Remote\ control\ file\ doesn't\ exists\ %s=
Remote\ information\ file\ doesn't\ exists\ %s=
Rename\ data\ directory\ to\ %s=
@@ -118,7 +117,7 @@
isisfish.common.population=Population
isisfish.common.populationGroup=Population group
isisfish.common.populations=Populations
-isisfish.common.port=port
+isisfish.common.port=Port
isisfish.common.prev=Previous
isisfish.common.region=Region
isisfish.common.remove=Remove
@@ -145,28 +144,23 @@
isisfish.config.category.misc.description=Miscealenous
isisfish.config.category.versioning=VCS
isisfish.config.category.versioning.description=Versioning system
-isisfish.config.database.lockmode.description=
-isisfish.config.main.compileDirectory.description=
-isisfish.config.main.configFileName.description=
-isisfish.config.main.defaultBackupDirectory.description=
-isisfish.config.main.defaultExportDirectory.description=
-isisfish.config.main.defaultExportNames.description=
-isisfish.config.main.defaultMapFile.description=
-isisfish.config.main.defaultResultNames.description=
-isisfish.config.main.defaultSimulator.description=
+isisfish.config.database.lockmode.description=Database lock mode
+isisfish.config.main.compileDirectory.description=Script compilation directory
+isisfish.config.main.configFileName.description=Configuration filename
+isisfish.config.main.defaultBackupDirectory.description=Backup directory
+isisfish.config.main.defaultExportNames.description=Exports to do after simulation
+isisfish.config.main.defaultMapFile.description=Default map file to use for map without custom maps
+isisfish.config.main.defaultResultNames.description=Result names to manage during a simulation
+isisfish.config.main.defaultSimulator.description=Default simulator to use to simulate
isisfish.config.main.defaultTagValue.description=
isisfish.config.main.encoding.description=encoding used on system
-isisfish.config.main.javadocDirectory.description=
-isisfish.config.main.javadocURL.description=
-isisfish.config.main.launchUI.description=
-isisfish.config.main.localSimulator.description=
+isisfish.config.main.javadocDirectory.description=Javadoc generation directory
+isisfish.config.main.javadocURL.description=Javadoc url
+isisfish.config.main.launchUI.description=Display user interface
+isisfish.config.main.localSimulator.description=Local simulator launcher name (same process)
isisfish.config.main.locale.description=user locale
-isisfish.config.main.login.description=
isisfish.config.main.monitoringDirectory.description=Folder containing all necessary information needed to restart simulation
-isisfish.config.main.password.description=
-isisfish.config.main.regionMap.description=
-isisfish.config.main.remoteCaparmor.description=
-isisfish.config.main.resultExport.description=
+isisfish.config.main.remoteCaparmor.description=Remote simulator launcher name
isisfish.config.main.simulation.ssh.control.check.interval=Control check interval (seconds)
isisfish.config.main.simulation.ssh.control.check.interval.description=Control check interval (seconds)
isisfish.config.main.simulation.ssh.datapath=Isis-Fish database
@@ -186,17 +180,14 @@
isisfish.config.main.simulation.ssh.userhome.description=User home directory
isisfish.config.main.simulation.ssh.username=SSH identifier
isisfish.config.main.simulation.ssh.username.description=SSH identifier
-isisfish.config.main.simulationServer.description=
isisfish.config.main.simulationShowOnlyError.description=
-isisfish.config.main.simulationShowOnlyQueue.description=
-isisfish.config.main.smtpServer.description=
-isisfish.config.main.subSimulator.description=
-isisfish.config.main.userMail.description=
-isisfish.config.main.userName.description=
+isisfish.config.main.smtpServer.description=Smtp server address
+isisfish.config.main.subSimulator.description=Sub process simulator launcher name
+isisfish.config.main.userMail.description=User email address
+isisfish.config.main.userName.description=User name
isisfish.config.ssh.key.file=SSH key
isisfish.config.ssh.key.file.description=Private SSH key path
isisfish.config.vcs.hostName.description=
-isisfish.config.vcs.keyFile.description=
isisfish.config.vcs.localDatabasePath.description=
isisfish.config.vcs.noPassPhrase.description=
isisfish.config.vcs.passphrase.description=
@@ -259,7 +250,7 @@
isisfish.error.empty.species.name=specie's name is empty
isisfish.error.empty.unit=measure unit is empty
isisfish.error.equation.openeditor=Can't open equation editor
-isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s
+isisfish.error.equation.return.number=EquationImpl must return a number\: %1$s
isisfish.error.equation.savemodel=Can't save equation as model
isisfish.error.errorpane.htmlmessage=<html><b>IsisFish has handled \:</b><br />%s</b></html>
isisfish.error.errorpane.title=Error
@@ -392,7 +383,7 @@
isisfish.error.undefined.zone.population=No population's zone defined
isisfish.error.undefined.zone.recruitment=No recrutment's zone defined
isisfish.error.undefined.zone.reproduction=No reprodution's zone defined
-isisfish.error.unsupported.equation.langage=unsupported langage '%1$s' for equation\: %2$s
+isisfish.error.unsupported.equation.langage=Unsupported language '%1$s' for equation\: %2$s
isisfish.error.wait.simThread=Can't wait SimThread
isisfish.error.warning.title=Warning
isisfish.error.write.simulation=Can't write information %1$s
@@ -417,35 +408,35 @@
isisfish.filter.reset=Reset
isisfish.filter.result=Results
isisfish.filter.result.found=Results (%d/%d)
-isisfish.filter.select=filter.select
-isisfish.filter.select.simulation=select.simulation
-isisfish.filter.simulation=filter.simulation
-isisfish.filter.simulation.analysePlanNumber=analysePlanNumber
-isisfish.filter.simulation.description=description
-isisfish.filter.simulation.local=local
-isisfish.filter.simulation.numberOfYear=numberOfYear
-isisfish.filter.simulation.regionName=regionName
-isisfish.filter.simulation.simulationEnd=simulationEnd
-isisfish.filter.simulation.simulationName=simulationName
-isisfish.filter.simulation.simulationStart=simulationStart
-isisfish.filter.simulation.simulatorName=simulatorName
-isisfish.filter.simulation.tooltip.analysePlanNumber=filter.simulation.tooltip.analysePlanNumber
-isisfish.filter.simulation.tooltip.description=filter.simulation.tooltip.description
-isisfish.filter.simulation.tooltip.local=filter.simulation.tooltip.local
-isisfish.filter.simulation.tooltip.numberOfYear=filter.simulation.tooltip.numberOfYear
-isisfish.filter.simulation.tooltip.regionName=filter.simulation.tooltip.regionName
-isisfish.filter.simulation.tooltip.simulationEnd=filter.simulation.tooltip.simulationEnd
-isisfish.filter.simulation.tooltip.simulationName=filter.simulation.tooltip.simulationName
-isisfish.filter.simulation.tooltip.simulationStart=filter.simulation.tooltip.simulationStart
-isisfish.filter.simulation.tooltip.simulatorName=filter.simulation.tooltip.simulatorName
-isisfish.filter.simulation.tooltip.useAnalysePlan=filter.simulation.tooltip.useAnalysePlan
-isisfish.filter.simulation.tooltip.useOptimization=filter.simulation.tooltip.useOptimization
-isisfish.filter.simulation.tooltip.usePreScript=filter.simulation.tooltip.usePreScript
-isisfish.filter.simulation.tooltip.useStatistic=filter.simulation.tooltip.useStatistic
-isisfish.filter.simulation.useAnalysePlan=filter.simulation.useAnalysePlan
-isisfish.filter.simulation.useOptimization=filter.simulation.useOptimization
-isisfish.filter.simulation.usePreScript=filter.simulation.usePreScript
-isisfish.filter.simulation.useStatistic=filter.simulation.useStatistic
+isisfish.filter.select=Select
+isisfish.filter.select.simulation=Select a simulation
+isisfish.filter.simulation=Filter simulations
+isisfish.filter.simulation.analysePlanNumber=Analyse plan number
+isisfish.filter.simulation.description=Description
+isisfish.filter.simulation.local=Local
+isisfish.filter.simulation.numberOfYear=Number of year
+isisfish.filter.simulation.regionName=Region name
+isisfish.filter.simulation.simulationEnd=Simulation end date (dd/MM/yyyy)
+isisfish.filter.simulation.simulationName=Simulation name
+isisfish.filter.simulation.simulationStart=Simulation start date (dd/MM/yyyy)
+isisfish.filter.simulation.simulatorName=Simulator name
+isisfish.filter.simulation.tooltip.analysePlanNumber=Filter on analyse number
+isisfish.filter.simulation.tooltip.description=Filter on description (regex)
+isisfish.filter.simulation.tooltip.local=Filter only local simulations
+isisfish.filter.simulation.tooltip.numberOfYear=Filter on number of year (exact sequence)
+isisfish.filter.simulation.tooltip.regionName=Filter on region name (regex)
+isisfish.filter.simulation.tooltip.simulationEnd=Filter on region end date (format dd/MM/yyyy)
+isisfish.filter.simulation.tooltip.simulationName=Filter on simulation name
+isisfish.filter.simulation.tooltip.simulationStart=Filter on simulation start date (format dd/MM/yyyy)
+isisfish.filter.simulation.tooltip.simulatorName=Filter on simulator name
+isisfish.filter.simulation.tooltip.useAnalysePlan=Filter on simulations with analyse plan
+isisfish.filter.simulation.tooltip.useOptimization=Filter on simulations with optimization
+isisfish.filter.simulation.tooltip.usePreScript=Filter on simulations with pre-script
+isisfish.filter.simulation.tooltip.useStatistic=Filter on simulations with statistic
+isisfish.filter.simulation.useAnalysePlan=analyse plan
+isisfish.filter.simulation.useOptimization=optimization
+isisfish.filter.simulation.usePreScript=pre-script
+isisfish.filter.simulation.useStatistic=statistic
isisfish.fisheryRegion.addMap=Add map
isisfish.fisheryRegion.area=Fishery area boundaries
isisfish.fisheryRegion.comments=Comments
@@ -579,7 +570,7 @@
isisfish.message.evaluation.finished=evaluation finished
isisfish.message.export.done=export done
isisfish.message.export.zip=Export to zip file %1$s
-isisfish.message.file.already.exists=
+isisfish.message.file.already.exists=File %s already exists, do you want overwrite it ?
isisfish.message.file.overwrite=File exists, do you want overwrite it ?
isisfish.message.import=Import %1$s
isisfish.message.import.equation.convert=Manual equation convertion
@@ -593,11 +584,11 @@
isisfish.message.import.scripts.zipped=Zipped script (*.zip)
isisfish.message.import.xml.v2.file=Import xml v2 file
isisfish.message.import.zip=Import zip file
-isisfish.message.launchui.notlaunch=
-isisfish.message.load.finished=load finished
+isisfish.message.launchui.notlaunch=User interface not started
+isisfish.message.load.finished=Load finished
isisfish.message.load.map=Try to load map file\: %1$s
-isisfish.message.loading.old.simulation=Loading old simulation ...
-isisfish.message.loading.region=Loading region ...
+isisfish.message.loading.old.simulation=Loading old simulation...
+isisfish.message.loading.region=Loading region...
isisfish.message.name.imported.region=Enter name for imported region
isisfish.message.new.filename=Enter the name of the new file. (use only chars and _ and start with uppercase)
isisfish.message.new.formule.category=Select the equation model's category
@@ -787,9 +778,9 @@
isisfish.queue.title=Queue
isisfish.result.abundance=Abondance
isisfish.result.add=Add a result
-isisfish.result.begin.simulation=En debut de Simulation\:
+isisfish.result.begin.simulation=Simulation start \:
isisfish.result.capture=Capture
-isisfish.result.capture.metier=Capture par metier
+isisfish.result.capture.metier=Capture by metier
isisfish.result.choose.simulation=Choose a Simulation
isisfish.result.datas=Datas
isisfish.result.dimension=Dimension
@@ -872,7 +863,7 @@
isisfish.script.paste=Paste
isisfish.script.paste.tooltip=Paste current selection (Ctrl-v)
isisfish.script.save=Save
-isisfish.script.save.tooltip=Sauve le script
+isisfish.script.save.tooltip=Save script
isisfish.script.title=Script Editor
isisfish.season.toString=season %1$s-%2$s
isisfish.selectivity.equation=Equation
@@ -914,10 +905,10 @@
isisfish.setOfVessels.technicalEfficiency=Technical efficiency
isisfish.setOfVessels.title=Caracteristics
isisfish.setOfVessels.vesselType=Vessel type
-isisfish.simpleResult.more.information=Clic a cell for more information...
+isisfish.simpleResult.more.information=Click a cell for more information...
isisfish.simulation.log.console.title=Log console for simulation '%1$s'
-isisfish.simulation.log.showConsole=display log console for simulation %1$s
-isisfish.simulation.menu.import=Restor simulation parameter
+isisfish.simulation.log.showConsole=Display log console for simulation %1$s
+isisfish.simulation.menu.import=Restore simulation parameter
isisfish.simulation.menu.save=Save simulation parameter
isisfish.simulation.menu.simulation=Simulation
isisfish.simulation.name=Simulation name
Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-16 11:51:57 UTC (rev 2846)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-12-16 14:19:25 UTC (rev 2847)
@@ -40,7 +40,6 @@
Process\ template\ error=
Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import=
Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e
-Remote\ IsisFish\ server=
Remote\ control\ file\ doesn't\ exists\ %s=
Remote\ information\ file\ doesn't\ exists\ %s=
Rename\ data\ directory\ to\ %s=
@@ -145,28 +144,23 @@
isisfish.config.category.misc.description=Divers
isisfish.config.category.versioning=VCS
isisfish.config.category.versioning.description=Gestionnaire de version
-isisfish.config.database.lockmode.description=
+isisfish.config.database.lockmode.description=M\u00E9thode de v\u00E9rouillage \u00E0 utiliser pour la base de donn\u00E9es
isisfish.config.main.compileDirectory.description=le r\u00E9pertoire o\u00F9 sont compil\u00E9s les scripts
isisfish.config.main.configFileName.description=le fichier de configuration \u00E0 utiliser
isisfish.config.main.defaultBackupDirectory.description=le r\u00E9pertoire o\u00F9 stocker les backups des donn\u00E9es
-isisfish.config.main.defaultExportDirectory.description=le r\u00E9pertoire o\u00F9 exporter les r\u00E9sultats des simulations
isisfish.config.main.defaultExportNames.description=les noms des exports \u00E0 effectuer apr\u00E8s une simulation
isisfish.config.main.defaultMapFile.description=noms de la carte par d\u00E9faut pour une base sans cartes
-isisfish.config.main.defaultResultNames.description=les noms des r\u00E9sultats \u00E0 traiter apr\u00E8s une simulation
+isisfish.config.main.defaultResultNames.description=les noms des r\u00E9sultats \u00E0 traiter durant une simulation
isisfish.config.main.defaultSimulator.description=le nom du simulateur par d\u00E9faut \u00E0 utiliser lors d'une simulation
isisfish.config.main.defaultTagValue.description=
isisfish.config.main.encoding.description=l'encoding du syst\u00E8me
isisfish.config.main.javadocDirectory.description=dossier de g\u00E9n\u00E9ration de la javadoc des scripts
isisfish.config.main.javadocURL.description=l'url de la javadoc des scripts
-isisfish.config.main.launchUI.description=
-isisfish.config.main.localSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement
+isisfish.config.main.launchUI.description=Affiche l'interface utilisateur
+isisfish.config.main.localSimulator.description=Nom du simulateur local (processus courant)
isisfish.config.main.locale.description=la locale utilisateur
-isisfish.config.main.login.description=le login pour se connecter au serveur de simulations distant
isisfish.config.main.monitoringDirectory.description=Dossier contenant les informations permettant de relancer les simulations
-isisfish.config.main.password.description=le mot de passe pour se connecter au serveur de simulations distant
-isisfish.config.main.regionMap.description=le nom du r\u00E9pertoire contenant les maps d'une r\u00E9gion
-isisfish.config.main.remoteCaparmor.description=lance les simulations sur un serveur distant
-isisfish.config.main.resultExport.description=TODO
+isisfish.config.main.remoteCaparmor.description=Nom du lanceur de simulation distante
isisfish.config.main.simulation.ssh.control.check.interval=V\u00E9rification de la progression (secondes)
isisfish.config.main.simulation.ssh.control.check.interval.description=Temps d'attente en secondes entre deux v\u00E9rifications de progression
isisfish.config.main.simulation.ssh.datapath=Base de donn\u00E9es
@@ -186,17 +180,14 @@
isisfish.config.main.simulation.ssh.userhome.description=R\u00E9pertoire d'accueil de l'utilisateur
isisfish.config.main.simulation.ssh.username=Identifiant
isisfish.config.main.simulation.ssh.username.description=Identifiant SSH pour se connecter au serveur
-isisfish.config.main.simulationServer.description=l'url du serveur de simulations distant
isisfish.config.main.simulationShowOnlyError.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles avec erreur
-isisfish.config.main.simulationShowOnlyQueue.description=pour indiquer si l'on doit conserver dans l'UI des simulations termin\u00E9es uniquement celles effectu\u00E9es localement
isisfish.config.main.smtpServer.description=le nom du serveur smtp \u00E0 utiliser pour envoyer les courriels
-isisfish.config.main.subSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement dans un sous process
+isisfish.config.main.subSimulator.description=Nom du simulateur en sous processus
isisfish.config.main.userMail.description=le courriel de l'utilisateur
isisfish.config.main.userName.description=le nom - pr\u00E9nom de l'utilisateur
isisfish.config.ssh.key.file=Cl\u00E9 SSH
isisfish.config.ssh.key.file.description=Emplacement de la cl\u00E9 priv\u00E9e SSH
isisfish.config.vcs.hostName.description=le nom du serveur vcs \u00E0 utiliser
-isisfish.config.vcs.keyFile.description=le chemin complet du fichier de clef priv\u00E9e ssh2 \u00E0 utiliser lors d'une connexion s\u00E9curis\u00E9e
isisfish.config.vcs.localDatabasePath.description=
isisfish.config.vcs.noPassPhrase.description=pour indiquer si la clef priv\u00E9e ssh2 utilis\u00E9e pour communiquer avec le serveur vcs est prot\u00E9g\u00E9 par une passe-phrase
isisfish.config.vcs.passphrase.description=la passe-phrase utilis\u00E9e pour prot\u00E9ger la clef priv\u00E9e ssh
@@ -432,7 +423,7 @@
isisfish.filter.simulation.tooltip.analysePlanNumber=filter sur le num\u00E9ro d'analyse (uniquement pour les simulations avec plan d'analyse)
isisfish.filter.simulation.tooltip.description=filtrer sur la description (format regex)
isisfish.filter.simulation.tooltip.local=filter uniquement les simulations locales
-isisfish.filter.simulation.tooltip.numberOfYear=filter sur le nombre d'ann\u00E9e(s) (recherche extacte)
+isisfish.filter.simulation.tooltip.numberOfYear=filter sur le nombre d'ann\u00E9e(s) (recherche exacte)
isisfish.filter.simulation.tooltip.regionName=filtrer sur le nom de la r\u00E9gion (format regex)
isisfish.filter.simulation.tooltip.simulationEnd=filtrer sur la date de fin de simulation (format dd/MM/yyyy)
isisfish.filter.simulation.tooltip.simulationName=filtrer sur le nom de simulation (format regex)
@@ -596,7 +587,7 @@
isisfish.message.launchui.notlaunch=Interface utilisateur non lanc\u00E9e
isisfish.message.load.finished=Chargement termin\u00E9
isisfish.message.load.map=Chargement de la carte \: %1$s
-isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ...
+isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation...
isisfish.message.loading.region=Chargement de la r\u00E9gion
isisfish.message.name.imported.region=Entrez le nom de la r\u00E9gion \u00E0 importer
isisfish.message.new.filename=Entrez le nom du nouveau du fichier.\n\t (utiliser uniquemment des caract\u00E8res et _ en commencant avec une majuscule)
@@ -613,7 +604,7 @@
isisfish.message.region.removed=R\u00E9gion supprim\u00E9e
isisfish.message.remove.canceled=Suppression annul\u00E9e
isisfish.message.remove.finished=Suppresison termin\u00E9
-isisfish.message.removing.region=Suppression de la r\u00E9gion %1$s ...
+isisfish.message.removing.region=Suppression de la r\u00E9gion %1$s...
isisfish.message.result.verif.region=R\u00E9sultat de la v\u00E9rification de la r\u00E9gion
isisfish.message.save.finished=Sauvegarde termin\u00E9e
isisfish.message.saveModel.dialog=Entrez le nom du mod\u00E8le d'equation
@@ -787,7 +778,7 @@
isisfish.queue.title=Queue
isisfish.result.abundance=Abondance
isisfish.result.add=Ajouter un r\u00E9sultat
-isisfish.result.begin.simulation=En d\u00E9but de simulation\:
+isisfish.result.begin.simulation=En d\u00E9but de simulation \:
isisfish.result.capture=Capturer
isisfish.result.capture.metier=Capturer par m\u00E9tier
isisfish.result.choose.simulation=Choisir une simulation
@@ -979,7 +970,7 @@
isisfish.tripType.duration=Dur\u00E9e
isisfish.tripType.minTime=Temps minimal entre deux voyages
isisfish.tripType.name=Nom
-isisfish.vcs.ask.passphrase=Entrez votre passe phrase (si votre clef ssh en contient une).
+isisfish.vcs.ask.passphrase=Entrez votre passphrase (si votre clef ssh en contient une).
isisfish.vcs.ask.passphrase.title=Demande de passe phrase
isisfish.vcs.commit=Message de sauvegarde
isisfish.vcs.commit.cancel=annuler
