Author: chatellier Date: 2009-05-18 15:23:12 +0000 (Mon, 18 May 2009) New Revision: 2236 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 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: Add caparmor configuration frame Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-18 14:37:36 UTC (rev 2235) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-18 15:23:12 UTC (rev 2236) @@ -191,13 +191,13 @@ File result = getOptionAsFile(Option.DATABASE_DIRECTORY.key); return result; } - + /** * Retourne le lock a utiliser pour la base h2. * * Par defaut la base utilise 'file'. * - * Les valeur acceptées sont : + * Les valeurs acceptées sont : * - file * - socket * - no Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 14:37:36 UTC (rev 2235) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 15:23:12 UTC (rev 2236) @@ -17,38 +17,28 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/** - * WelcomeUI. - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> <JFrame id='isisfishFrame' title="isisfish.welcome.title" width='874' height='736' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> <script><![CDATA[ import static org.codelutin.i18n.I18n._; + import javax.swing.JFrame; + + import fr.ifremer.isisfish.IsisFish; + import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.input.InputUI; import fr.ifremer.isisfish.ui.input.InputAction; + import fr.ifremer.isisfish.ui.input.InputSaveVerifier; import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; import fr.ifremer.isisfish.ui.result.ResultAction; import fr.ifremer.isisfish.ui.result.ResultView; import fr.ifremer.isisfish.ui.script.ScriptUI; import fr.ifremer.isisfish.ui.simulator.SimulUI; import fr.ifremer.isisfish.ui.simulator.QueueUI; - import jaxx.runtime.DefaultJAXXContext; - import fr.ifremer.isisfish.IsisFish; - import fr.ifremer.isisfish.IsisConfig; - import javax.swing.JFrame; + import fr.ifremer.isisfish.ui.simulator.launcher.SSHLauncherConfigUI; import org.codelutin.widget.AboutFrame; import jaxx.runtime.JAXXInitialContext; - import fr.ifremer.isisfish.ui.input.InputSaveVerifier; + import jaxx.runtime.DefaultJAXXContext; Map<JFrame, WelcomePanelUI> allFrameOpened; WelcomeSaveVerifier verifier = new WelcomeSaveVerifier(); @@ -127,6 +117,15 @@ // FIXME a reimplanter // fr.ifremer.isisfish.versionning.ui.VCSConfigUI.doLaunch() } + + protected void configurationSSHLauncher() { + SSHLauncherConfigUI configUI = new SSHLauncherConfigUI(); + configUI.pack(); + configUI.setSize(600, configUI.getHeight()); + org.codelutin.widget.SwingUtil.center(configUI); + configUI.setVisible(true); + } + protected void help(String urlAlias) { Help.showURL(urlAlias); } @@ -143,8 +142,7 @@ // center frame Dimension dim = getToolkit().getScreenSize(); about.setSize(640, 520); - about.setLocation((dim.width - about.getSize().width) / 2, - (dim.height - about.getSize().height) / 2); + org.codelutin.widget.SwingUtil.center(about); about.setVisible(true); } ]]> @@ -166,7 +164,8 @@ <JSeparator/> <JMenu text="isisfish.welcome.menu.configuration"> <JMenuItem text="isisfish.welcome.menu.configuration" enabled='false' onActionPerformed='config()'/> - <JMenuItem text="isisfish.welcome.menu.vcs.configuration" enabled='false' onActionPerformed='configVCS()'/> + <JMenuItem text="isisfish.welcome.menu.configuration.vcs" enabled='false' onActionPerformed='configVCS()'/> + <JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='configurationSSHLauncher()'/> </JMenu> </JMenu> <JMenu text="isisfish.welcome.menu.help"> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-18 15:23:12 UTC (rev 2236) @@ -0,0 +1,278 @@ +<!-- ##% +Copyright (C) 2009 Ifremer, Code Lutin + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +##% --> +<JDialog resizable="false" title="isisfish.simulator.ssh.configuration.title" layout="{new BoxLayout(this.getContentPane(), BoxLayout.PAGE_AXIS)}"> + <script><![CDATA[ + + import fr.ifremer.isisfish.IsisFish; + + protected String currentSSHserver; + protected String currentSSHUsername; + protected String currentSSHKey; + protected String currentSSHDatapath; + protected String currentSSHIsisHome; + protected String currentSSHTempPath; + protected String currentSSHScriptCommand; + protected String currentSSHControlInterval; + protected String currentSSHSimultaneousSimulation; + + // fill default values + resetSSHConfiguration(); + + /** + * Reset values with default configuration values. + */ + protected void resetSSHConfiguration() { + // server config + sshServerField.setText(IsisFish.config.getSimulatorSshServer()); + usernameField.setText(IsisFish.config.getSimulatorSshUsername()); + sshKeyField.setText(IsisFish.config.getSSHPrivateKeyFilePath().getAbsolutePath()); + + // caparmor config + sshDatapathField.setText(IsisFish.config.getSimulatorSshDataPath()); + sshIsisHomeField.setText(IsisFish.config.getSimulatorSshIsisHome()); + sshTemppathField.setText(IsisFish.config.getSimulatorSshTmpPath()); + sshScriptQueueCommandField.setText(IsisFish.config.getSimulatorSshAddToQueueCommand()); + sshControlIntervalField.setText(String.valueOf(IsisFish.config.getSimulatorSshControlCheckInterval())); + sshSimultaneousSimulationField.setText(String.valueOf(IsisFish.config.getSimulatorSshMaxSimultaneousSimulation())); + + doCheck(); + } + + protected void doCheck() { + + boolean configurationValid = true; + + // copy values + currentSSHserver = sshServerField.getText().trim(); + if (currentSSHserver.isEmpty()) { + configurationValid = false; + setColor(true, sshServerField); + } + else { + setColor(false, sshServerField); + } + + currentSSHUsername = usernameField.getText().trim(); + if (!currentSSHUsername.matches("\\w+")) { + configurationValid = false; + setColor(true, usernameField); + } + else { + setColor(false, usernameField); + } + + //currentSSHKey + + currentSSHDatapath = sshDatapathField.getText().trim(); + if (currentSSHDatapath.isEmpty()) { + configurationValid = false; + setColor(true, sshDatapathField); + } + else { + setColor(false, sshDatapathField); + } + + currentSSHIsisHome = sshIsisHomeField.getText().trim(); + if (currentSSHIsisHome.isEmpty()) { + configurationValid = false; + setColor(true, sshIsisHomeField); + } + else { + setColor(false, sshIsisHomeField); + } + + currentSSHTempPath = sshTemppathField.getText().trim(); + if (!currentSSHTempPath.startsWith("/")) { + configurationValid = false; + setColor(true, sshTemppathField); + } + else { + setColor(false, sshTemppathField); + } + + currentSSHScriptCommand = sshScriptQueueCommandField.getText().trim(); + if (currentSSHScriptCommand.isEmpty()) { + configurationValid = false; + setColor(true, sshScriptQueueCommandField); + } + else { + setColor(false, sshScriptQueueCommandField); + } + + currentSSHControlInterval = sshControlIntervalField.getText().trim(); + if (!currentSSHControlInterval.matches("\\d+")) { + configurationValid = false; + setColor(true, sshControlIntervalField); + } + else { + setColor(false, sshControlIntervalField); + } + + currentSSHSimultaneousSimulation = sshSimultaneousSimulationField.getText().trim(); + if (!currentSSHSimultaneousSimulation.matches("\\d+")) { + configurationValid = false; + setColor(true, sshSimultaneousSimulationField); + } + else { + setColor(false, sshSimultaneousSimulationField); + } + + okButton.setEnabled(configurationValid); + } + + /** + * Set values in config and force configuration save. + */ + protected void saveSSHConfiguration() { + IsisFish.config.setSimulatorSshServer(currentSSHserver); + IsisFish.config.setSimulatorSshUsername(currentSSHUsername); + + IsisFish.config.setSimulatorSshDataPath(currentSSHDatapath); + IsisFish.config.setSimuatorShhIsisHome(currentSSHIsisHome); + IsisFish.config.setSimulatorSshTmpPath(currentSSHTempPath); + IsisFish.config.setSimulatorSshAddToQueueCommand(currentSSHScriptCommand); + IsisFish.config.setSimulatorSshControlCheckInterval(Long.parseLong(currentSSHControlInterval)); + IsisFish.config.setSimulatorSshMaxSimultaneousSimulation(Integer.parseInt(currentSSHSimultaneousSimulation)); + + IsisFish.config.saveForUser(); + dispose(); + } + + /** + * Close frame. + */ + protected void cancelSSHConfiguration() { + dispose(); + } + + protected void setColor(boolean invalid, JComponent component) { + component.setForeground(invalid ? Color.RED: Color.BLACK); + } + ]]></script> + + <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.connection"))}' + fill='horizontal'> + <row> + <cell> + <JLabel id='sshServerLabel' text='isisfish.config.main.simulation.ssh.server' + toolTipText='isisfish.config.main.simulation.ssh.login.description' /> + </cell> + <cell fill='horizontal' weightx="2.0"> + <JTextField id='sshServerField' toolTipText='isisfish.config.main.simulation.ssh.login.description' + onKeyReleased="doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='usernameLabel' text='isisfish.config.main.simulation.ssh.login' + toolTipText='isisfish.config.main.simulation.ssh.login.description' /> + </cell> + <cell> + <JTextField id='usernameField' toolTipText='isisfish.config.main.simulation.ssh.login.description' + onKeyReleased="doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='sshKeyLabel' text='isisfish.config.ssh.key.file' toolTipText='isisfish.config.ssh.key.file.description' /> + </cell> + <cell> + <JTextField id='sshKeyField' enabled='false' toolTipText='isisfish.config.ssh.key.file.description' + onKeyReleased="doCheck()" /> + </cell> + </row> + </Table> + <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.environment"))}'> + <row fill='horizontal'> + <cell> + <JLabel id='sshDatapathLabel' text='isisfish.config.main.simulation.ssh.datapath' + toolTipText='isisfish.config.main.simulation.ssh.datapath.description' /> + </cell> + <cell weightx="1.0"> + <JTextField id='sshDatapathField' toolTipText='isisfish.config.main.simulation.ssh.datapath.description' + onKeyReleased="doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='sshIsisHomeLabel' text='isisfish.config.main.simulation.ssh.isis.home' + toolTipText='isisfish.config.main.simulation.ssh.isis.home.description' /> + </cell> + <cell> + <JTextField id='sshIsisHomeField' toolTipText='isisfish.config.main.simulation.ssh.isis.home.description' + onKeyReleased="doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='sshTemppathLabel' text='isisfish.config.main.simulation.ssh.tmppath' + toolTipText='isisfish.config.main.simulation.ssh.tmppath.description' /> + </cell> + <cell> + <JTextField id='sshTemppathField' toolTipText='isisfish.config.main.simulation.ssh.tmppath.description' + onKeyReleased="doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='sshScriptQueueCommandLabel' text='isisfish.config.main.simulation.ssh.addscripttoqueuecommand' + toolTipText='isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description' /> + </cell> + <cell> + <JTextField id='sshScriptQueueCommandField' + toolTipText='isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description' + onKeyReleased="doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='sshControlIntervalLabel' text='isisfish.config.main.simulation.ssh.control.check.interval' + toolTipText='isisfish.config.main.simulation.ssh.control.check.interval.description' /> + </cell> + <cell> + <JTextField id='sshControlIntervalField' + toolTipText='isisfish.config.main.simulation.ssh.control.check.interval.description' + onKeyReleased="doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='sshSimultaneousSimulationLabel' text='isisfish.config.main.simulation.max.simultaneous.simulation' + toolTipText='isisfish.config.main.simulation.max.simultaneous.simulation.description' /> + </cell> + <cell> + <JTextField id='sshSimultaneousSimulationField' + toolTipText='isisfish.config.main.simulation.max.simultaneous.simulation.description' + onKeyReleased="doCheck()" /> + </cell> + </row> + </Table> + <Table> + <row fill='horizontal'> + <cell fill='horizontal'> + <JButton id='okButton' text='isisfish.common.ok' onActionPerformed="saveSSHConfiguration()" /> + </cell> + <cell fill='horizontal'> + <JButton id='resetButton' text='isisfish.common.reset' onActionPerformed="resetSSHConfiguration()" /> + </cell> + <cell fill='horizontal'> + <JButton id='cancelButton' text='isisfish.common.cancel' onActionPerformed="cancelSSHConfiguration()" /> + </cell> + </row> + </Table> +</JDialog> 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-05-18 14:37:36 UTC (rev 2235) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-18 15:23:12 UTC (rev 2236) @@ -29,7 +29,6 @@ Create\ a\ new\ script= Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= -Error\ while\ downloading\ file\ \:\ %s= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= @@ -170,14 +169,22 @@ isisfish.config.main.regionMap.description= isisfish.config.main.remoteCaparmor.description= isisfish.config.main.resultExport.description= -isisfish.config.main.simulation.max.simultaneous.simulation.description= -isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description= -isisfish.config.main.simulation.ssh.control.check.interval.description= -isisfish.config.main.simulation.ssh.datapath.description= -isisfish.config.main.simulation.ssh.isis.home.description= -isisfish.config.main.simulation.ssh.login.description= -isisfish.config.main.simulation.ssh.server.description= -isisfish.config.main.simulation.ssh.tmppath.description= +isisfish.config.main.simulation.max.simultaneous.simulation=Simultaneous simulation +isisfish.config.main.simulation.max.simultaneous.simulation.description=Simultaneous simulation to do on Caparmor +isisfish.config.main.simulation.ssh.addscripttoqueuecommand=Qsub command +isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description=Qsub command path +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 +isisfish.config.main.simulation.ssh.datapath.description=Isis-Fish database path +isisfish.config.main.simulation.ssh.isis.home=Isis-Fish home +isisfish.config.main.simulation.ssh.isis.home.description=Isis-Fish installation directory +isisfish.config.main.simulation.ssh.login=SSH identifier +isisfish.config.main.simulation.ssh.login.description=SSH identifier +isisfish.config.main.simulation.ssh.server=Server address +isisfish.config.main.simulation.ssh.server.description=Server adress +isisfish.config.main.simulation.ssh.tmppath=Server temp directory +isisfish.config.main.simulation.ssh.tmppath.description=Server temp directory (must start with /) isisfish.config.main.simulationServer.description= isisfish.config.main.simulationShowOnlyError.description= isisfish.config.main.simulationShowOnlyQueue.description= @@ -185,6 +192,8 @@ isisfish.config.main.subSimulator.description= isisfish.config.main.userMail.description= isisfish.config.main.userName.description= +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= @@ -235,8 +244,6 @@ isisfish.error.delete.database=Can't delete database isisfish.error.delete.file=could not delete file %1$s isisfish.error.delete.vcs.files=Can't delete vcs files -isisfish.error.dialog.message=Some errors have been detected -isisfish.error.dialog.title=Error isisfish.error.during.simulation=Error during simulation isisfish.error.emigration.negative=emigration negative isisfish.error.empty.code.rubbin=rubbin's code is empty @@ -911,6 +918,9 @@ isisfish.simulator.launcher.remote=on Caparmor server isisfish.simulator.launcher.subprocess=in subprocess isisfish.simulator.simulaction.badid=Can't start simulation, bad id\: %s +isisfish.simulator.ssh.configuration.connection=Connection information +isisfish.simulator.ssh.configuration.environment=Caparmor configuration +isisfish.simulator.ssh.configuration.title=Caparmor launcher configuration isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=Age isisfish.species.cee=CEE @@ -1022,6 +1032,8 @@ isisfish.welcome.menu.about=About isisfish.welcome.menu.close=Close isisfish.welcome.menu.configuration=Configuration +isisfish.welcome.menu.configuration.sshlauncher= +isisfish.welcome.menu.configuration.vcs= isisfish.welcome.menu.file=File isisfish.welcome.menu.frame=Frame isisfish.welcome.menu.help=Help @@ -1037,7 +1049,6 @@ isisfish.welcome.menu.script=Script isisfish.welcome.menu.simulation=Simulation Launcher isisfish.welcome.menu.synchro=Server Synchronisation -isisfish.welcome.menu.vcs.configuration=Configuration vcs isisfish.welcome.title=Ifremer Simulation isisfish.wizardGroupCreation.allGroupsSameSize=All groups have the same size isisfish.wizardGroupCreation.allValues=Input all the values 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-05-18 14:37:36 UTC (rev 2235) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-18 15:23:12 UTC (rev 2236) @@ -29,7 +29,6 @@ Create\ a\ new\ script= Cut\ current\ selection\ (Ctrl-x)= Error\ during\ vcs\ initialisation= -Error\ while\ downloading\ file\ \:\ %s= Error\ while\ uploading\ public\ key\ to\ remote\ serveur\ authorized_keys= Export\ selected\ script(s)\ to\ zip\ archive= Generate\ next\ simulation= @@ -131,7 +130,7 @@ isisfish.common.prev=Pr\u00E9c\u00E9dent isisfish.common.region=R\u00E9gion isisfish.common.remove=Supprimer -isisfish.common.reset=reset +isisfish.common.reset=R\u00E9initialiser isisfish.common.rules=R\u00E8gles isisfish.common.save=Sauver isisfish.common.saveModel=Sauver comme mod\u00E8le @@ -170,14 +169,22 @@ 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.simulation.max.simultaneous.simulation.description= -isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description= -isisfish.config.main.simulation.ssh.control.check.interval.description= -isisfish.config.main.simulation.ssh.datapath.description= -isisfish.config.main.simulation.ssh.isis.home.description= -isisfish.config.main.simulation.ssh.login.description= -isisfish.config.main.simulation.ssh.server.description= -isisfish.config.main.simulation.ssh.tmppath.description= +isisfish.config.main.simulation.max.simultaneous.simulation=Nombre de simulations simultan\u00E9es +isisfish.config.main.simulation.max.simultaneous.simulation.description=Nombre maximum de simulations pouvant \u00EAtre envoy\u00E9es au serveur +isisfish.config.main.simulation.ssh.addscripttoqueuecommand=Commande 'qsub' +isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description=Emplacemement de la commande 'qsub' +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 +isisfish.config.main.simulation.ssh.datapath.description=Emplacement de la base de donn\u00E9es (isis-database) +isisfish.config.main.simulation.ssh.isis.home=Installation d'Isis-Fish +isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'Isis-Fish sur le serveur +isisfish.config.main.simulation.ssh.login=Identifiant +isisfish.config.main.simulation.ssh.login.description=Identifiant SSH pour se connecter au serveur +isisfish.config.main.simulation.ssh.server=Adresse du serveur +isisfish.config.main.simulation.ssh.server.description=Adresse du serveur +isisfish.config.main.simulation.ssh.tmppath=Dossier temporaire +isisfish.config.main.simulation.ssh.tmppath.description=Emplacement du dossier temporaire (le chemin doit commencer par /) 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 @@ -185,6 +192,8 @@ isisfish.config.main.subSimulator.description=pour indiquer si les simulations sont \u00E0 effectuer localement dans un sous process 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= @@ -235,8 +244,6 @@ isisfish.error.delete.database=Can't delete database isisfish.error.delete.file=could not delete file %1$s isisfish.error.delete.vcs.files=Can't delete vcs files -isisfish.error.dialog.message=Une erreur a \u00E9t\u00E9 d\u00E9tect\u00E9e -isisfish.error.dialog.title=Erreur isisfish.error.during.simulation=Error during simulation isisfish.error.emigration.negative=emigration negative isisfish.error.empty.code.rubbin=le code rubbin est vide @@ -911,6 +918,9 @@ isisfish.simulator.launcher.remote=sur le serveur Caparmor isisfish.simulator.launcher.subprocess=dans un sous processus isisfish.simulator.simulaction.badid=Impossible de lancer la simulation '%s' \: l'identifiant existe d\u00E9j\u00E0 \! +isisfish.simulator.ssh.configuration.connection=Information de connexion +isisfish.simulator.ssh.configuration.environment=Configuration sur Caparmor +isisfish.simulator.ssh.configuration.title=Configuration du lanceur Caparmor isisfish.simulator.subprocess.readoutput.error= isisfish.species.age=Age isisfish.species.cee=CEE @@ -1022,6 +1032,8 @@ isisfish.welcome.menu.about=\u00C0 propos isisfish.welcome.menu.close=Fermer isisfish.welcome.menu.configuration=Configuration +isisfish.welcome.menu.configuration.sshlauncher=Configuration Caparmor +isisfish.welcome.menu.configuration.vcs=Configuration vcs isisfish.welcome.menu.file=Fichier isisfish.welcome.menu.frame=Fen\u00EAtre isisfish.welcome.menu.help=Aide @@ -1037,7 +1049,6 @@ isisfish.welcome.menu.script=Script isisfish.welcome.menu.simulation=Lanceur de simulations isisfish.welcome.menu.synchro=Synchronisation Serveur -isisfish.welcome.menu.vcs.configuration=Configuration vcs isisfish.welcome.title=Simulation Ifremer isisfish.wizardGroupCreation.allGroupsSameSize=Tous les groupes ont la m\u00EAme taille isisfish.wizardGroupCreation.allValues=Input all the values