Author: chatellier Date: 2008-12-09 17:50:47 +0000 (Tue, 09 Dec 2008) New Revision: 1656 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 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: Modification i18n Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2008-12-09 17:44:02 UTC (rev 1655) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2008-12-09 17:50:47 UTC (rev 1656) @@ -358,7 +358,7 @@ log.info("Ask user for manual equation conversion"); // EquationEditorFrame frame = new EquationEditorFrame(true, true); EquationEditorPaneUI frame = new EquationEditorPaneUI(); - frame.setTitle("Conversion manuel de l'equation"); + frame.setTitle(_("isisfish.message.import.equation.convert")); for (String id : equationId) { context = storage.getStorage().beginTransaction(); Equation eq = (Equation)context.findByTopiaId(id); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2008-12-09 17:44:02 UTC (rev 1655) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2008-12-09 17:50:47 UTC (rev 1656) @@ -100,7 +100,6 @@ import static org.codelutin.i18n.I18n._; import static javax.swing.JOptionPane.showInputDialog; import static fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.selectSimulation; -import static javax.swing.JOptionPane.showMessageDialog; /** * @@ -405,7 +404,7 @@ String msg = regionStorage.getCommentForNextCommit(); JTextArea text = new JTextArea(msg); int resp = JOptionPane.showOptionDialog(null, - new JScrollPane(text), "Enter commit message", + new JScrollPane(text), _("isisfish.commit.message"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, // icon null, null); 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 2008-12-09 17:44:02 UTC (rev 1655) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-12-09 17:50:47 UTC (rev 1656) @@ -94,6 +94,7 @@ isisfish.cell.longitude=longitude isisfish.cell.name=name isisfish.change.equation=Can't change equation +isisfish.commit.message=Enter commit message isisfish.common.add=add isisfish.common.add.short=add short isisfish.common.alert=alert @@ -547,13 +548,14 @@ isisfish.message.export.zip=Export to zip file %1$s 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 isisfish.message.import.finished=Import finished isisfish.message.import.region.name=Enter name for imported region isisfish.message.import.region.xml=XMLed Region isisfish.message.import.region.zipped=Zipped Region isisfish.message.import.scripts.file.cancelled=Import scripts cancelled -isisfish.message.import.xml.v2.file= -isisfish.message.import.xml.v2.file\ =Import xml v2 file +isisfish.message.import.xml.v2.file=Import xml v2 file +isisfish.message.import.xml.v2.file\ = isisfish.message.import.zip=Import zip file isisfish.message.load.finished=load finished isisfish.message.load.map=Try to load map file\: %1$s (%2$s, %3$s) 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 2008-12-09 17:44:02 UTC (rev 1655) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-12-09 17:50:47 UTC (rev 1656) @@ -94,6 +94,7 @@ isisfish.cell.longitude=Longitude isisfish.cell.name=Nom isisfish.change.equation=Ne peut pas changer l'\u00E9quation +isisfish.commit.message=Entrer un message de commit isisfish.common.add=Ajouter isisfish.common.add.short=isisfish.common.add.short isisfish.common.alert=alerte @@ -540,20 +541,21 @@ isisfish.message.delete.entities=Supprimer les entit\u00E9s isisfish.message.delete.entity=Supprimer l'entit\u00E9 isisfish.message.delete.finished=Suppression termin\u00E9e -isisfish.message.delete.object=Pour supprimer l'objet %1$s, tous les objets suivant seront aussi supprim\u00E9s \\n\\n +isisfish.message.delete.object=Pour supprimer l'objet %1$s, tous les objets suivants seront aussi supprim\u00E9s \n\n isisfish.message.diff.finished=fichier dans l'\u00E9tat %1$s isisfish.message.evaluation.finished=\u00E9valuation termin\u00E9e isisfish.message.export.done=Export termin\u00E9 isisfish.message.export.zip=Exporter dans le fichier zip %1$s isisfish.message.file.overwrite=Le fichier existe, Voulez-vous l'\u00E9craser ? isisfish.message.import=Importer %1$s +isisfish.message.import.equation.convert=Conversion manuelle de l'\u00E9quation isisfish.message.import.finished=Import termin\u00E9 isisfish.message.import.region.name=Entre le nom de la r\u00E9egion \u00E0 importer -isisfish.message.import.region.xml=Region XML (Isis-Fish V2.x) +isisfish.message.import.region.xml=R\u00E9gion XML (Isis-Fish V2.x) isisfish.message.import.region.zipped=Zipped Region isisfish.message.import.scripts.file.cancelled=Importation des scripts annul\u00E9 -isisfish.message.import.xml.v2.file= -isisfish.message.import.xml.v2.file\ =Import xml v2 file +isisfish.message.import.xml.v2.file=Import xml v2 file +isisfish.message.import.xml.v2.file\ = isisfish.message.import.zip=Import zip file isisfish.message.load.finished=Chargement termin\u00E9 isisfish.message.load.map=Chargement de la carte \: %1$s (%2$s, %3$s) @@ -620,18 +622,18 @@ isisfish.params.description=Description isisfish.params.filter=Filtrer isisfish.params.lblLauncher=Lanceur de simulation -isisfish.params.loadOldSimulation=Charger un ancienne simulation +isisfish.params.loadOldSimulation=Charger une ancienne simulation isisfish.params.numberYear=Nombre d'ann\u00E9es isisfish.params.onlyExportSimulation=Exporter uniquement des simulations isisfish.params.populationNumbers=Donn\u00E9es de population isisfish.params.ruleParameters=Param\u00E8tres des r\u00E8gles isisfish.params.simulationName=Nom de la simulation isisfish.params.title=Param\u00E8tres -isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\\n\\n +isisfish.params.toString.fishery=P\u00EAcherie\: %1$s\n\n isisfish.params.toString.lib.logger.level=niveau du logger de librairies %1$s -isisfish.params.toString.number.years=Nombre d'ann\u00E9\u00E9s \: %1$s\\n\\n +isisfish.params.toString.number.years=Nombre d'ann\u00E9\u00E9s \: %1$s\n\n isisfish.params.toString.plan=Plan\: %1$s -isisfish.params.toString.plan.number=Analyse plan sequence number\: %1$s\\n\\n +isisfish.params.toString.plan.number=Analyse plan sequence number\: %1$s\n\n isisfish.params.toString.populations=Populations\: isisfish.params.toString.rule=Rule\: %1$s isisfish.params.toString.script.logger.level=niveau du logger de scripts %1$s @@ -863,8 +865,8 @@ isisfish.simpleResult.table=defaultToolTip-fr.ifremer.isisfish.map.SimpleResultatMapBean.table12 isisfish.simulation.log.console.title=Console de log simulation '%1$s' isisfish.simulation.log.showConsole=affichage de la console de log pour la simulation %1$s -isisfish.simulation.menu.import=Import simulation -isisfish.simulation.menu.save=Save simulation +isisfish.simulation.menu.import=Importer une simulation +isisfish.simulation.menu.save=Sauver la simulation isisfish.simulation.menu.simulation=Simulation isisfish.simulation.name=Nom de la simulation isisfish.simulation.title=Lanceur de simulation