[Coser-commits] r946 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/selection/replay resources/i18n

6 Jan 2012

Author: echatellier
Date: 2012-01-06 17:39:43 +0100 (Fri, 06 Jan 2012)
New Revision: 946

Url: http://forge.codelutin.com/repositories/revision/coser/946

Log:
Fix labels in selection replay

Modified:
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.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-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx
===================================================================

--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx	2012-01-04 17:26:28 UTC (rev 945)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx	2012-01-06 16:39:43 UTC (rev 946)
@@ -22,7 +22,7 @@
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<JDialog title="coser.ui.selection.replay.replayTitle" width="500" height="450">
+<JDialog title="coser.ui.selection.replay.replayTitle" width="600" height="500">
 
   <import>
   fr.ifremer.coser.ui.selection.model.SpeciesListModel
@@ -68,7 +68,8 @@
             </row>
             <row>
               <cell weightx="1" fill="horizontal" columns="3">
-                <JTextArea id="messageArea1" rows="3" editable="false" />
+                <JTextArea id="messageArea1" rows="3" editable="false"
+                    text='{_("coser.ui.selection.replay.noerrordetected")}' />
               </cell>
             </row>
             <row>
@@ -77,12 +78,12 @@
                     onActionPerformed="dispose()" />
               </cell>
               <cell weightx="1" anchor="east">
-                <JButton id="validSelectionButton" text="coser.ui.common.next"
+                <JButton id="validSelectionButton" text="coser.ui.selection.replay.nextstep"
                     enabled="false"
                     onActionPerformed="getHandler().validSelectionChoice(this)" />
               </cell>
               <cell>
-                <JButton text="coser.ui.common.finish"
+                <JButton text="coser.ui.selection.replay.finishselection"
                     enabled="{validSelectionButton.isEnabled()}"
                     onActionPerformed="getHandler().finishSelection1toFinal(this)" />
               </cell>
@@ -108,7 +109,8 @@
             </row>
             <row>
               <cell weightx="1" fill="horizontal" columns="3">
-                <JTextArea id="messageArea2" rows="3" editable="false" />
+                <JTextArea id="messageArea2" rows="3" editable="false"
+                    text='{_("coser.ui.selection.replay.noerrordetected")}' />
               </cell>
             </row>
             <row>
@@ -117,12 +119,12 @@
                     onActionPerformed="dispose()" />
               </cell>
               <cell weightx="1" anchor="east">
-                <JButton id="validYearsButton" text="coser.ui.common.next"
+                <JButton id="validYearsButton" text="coser.ui.selection.replay.nextstep"
                     enabled="false"
                     onActionPerformed="getHandler().validSelectionYears(this)" />
               </cell>
               <cell>
-                <JButton text="coser.ui.common.finish"
+                <JButton text="coser.ui.selection.replay.finishselection"
                     enabled="{validYearsButton.isEnabled()}"
                     onActionPerformed="getHandler().finishSelection2toFinal(this)" />
               </cell>
@@ -148,7 +150,8 @@
             </row>
             <row>
               <cell weightx="1" fill="horizontal" columns="3">
-                <JTextArea id="messageArea3" rows="3" editable="false" />
+                <JTextArea id="messageArea3" rows="3" editable="false"
+                    text='{_("coser.ui.selection.replay.noerrordetected")}' />
               </cell>
             </row>
             <row>
@@ -157,12 +160,12 @@
                     onActionPerformed="dispose()" />
               </cell>
               <cell weightx="1" anchor="east">
-                <JButton id="validStrataButton" text="coser.ui.common.next"
+                <JButton id="validStrataButton" text="coser.ui.selection.replay.nextstep"
                     enabled="false"
                     onActionPerformed="getHandler().validSelectionStrata(this)" />
               </cell>
               <cell>
-                <JButton text="coser.ui.common.finish"
+                <JButton text="coser.ui.selection.replay.finishselection"
                     enabled="{validStrataButton.isEnabled()}"
                     onActionPerformed="getHandler().finishSelection3toFinal(this)" />
               </cell>
@@ -187,7 +190,8 @@
             </row>
             <row>
               <cell weightx="1" fill="horizontal" columns="3">
-                <JTextArea id="messageArea4" rows="3" editable="false" />
+                <JTextArea id="messageArea4" rows="3" editable="false"
+                    text='{_("coser.ui.selection.replay.noerrordetected")}' />
               </cell>
             </row>
             <row>
@@ -196,11 +200,11 @@
                     onActionPerformed="dispose()" />
               </cell>
               <cell weightx="1" anchor="east">
-                <JButton id="validCommandButton" text="coser.ui.common.next"
+                <JButton id="validCommandButton" text="coser.ui.selection.replay.nextstep"
                     onActionPerformed="getHandler().validSelectionCommand(this)" />
               </cell>
               <cell>
-                <JButton text="coser.ui.common.finish"
+                <JButton text="coser.ui.selection.replay.finishselection"
                     enabled="{validCommandButton.isEnabled()}"
                     onActionPerformed="getHandler().finishSelection4toFinal(this)" />
               </cell>
@@ -226,7 +230,8 @@
             </row>
             <row>
               <cell weightx="1" fill="horizontal" columns="3">
-                <JTextArea id="messageArea5" rows="3" editable="false" />
+                <JTextArea id="messageArea5" rows="3" editable="false"
+                    text='{_("coser.ui.selection.replay.noerrordetected")}' />
               </cell>
             </row>
             <row>
@@ -235,12 +240,12 @@
                     onActionPerformed="dispose()" />
               </cell>
               <cell weightx="1" anchor="east">
-                <JButton id="validSpeciesButton" text="coser.ui.common.next"
+                <JButton id="validSpeciesButton" text="coser.ui.selection.replay.nextstep"
                     enabled="false"
                     onActionPerformed="getHandler().validSelectionSpecies(this)" />
               </cell>
               <cell>
-                <JButton text="coser.ui.common.finish"
+                <JButton text="coser.ui.selection.replay.finishselection"
                     enabled="{validSpeciesButton.isEnabled()}"
                     onActionPerformed="getHandler().finishSelection5toFinal(this)" />
               </cell>

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	2012-01-04 17:26:28 UTC (rev 945)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties	2012-01-06 16:39:43 UTC (rev 946)
@@ -7,8 +7,6 @@
 coser.ui.about.about=<html><b>Coser</b><br /><br />Version %s<br /><br />Usefull links \:<ul><li><a href\="http\://maven-site.forge.codelutin.com/coser/">Documentation</a></li><li><a href\="http\://forge.codelutin.com/projects/coser/issues">Bug report</a></li></ul><br /><br />Copyright 2010 - 2012 <a href\="http\://www.ifremer.fr">Ifremer</a>, <a href\="http\://www.codelutin.com">Code Lutin</a><html>
 coser.ui.about.title=About Coser
 coser.ui.common.cancel=Cancel
-coser.ui.common.finish=Finish
-coser.ui.common.next=Next
 coser.ui.common.no=No
 coser.ui.common.selectAll=Select all
 coser.ui.common.selectAll.short=All
@@ -223,9 +221,12 @@
 coser.ui.selection.replay.choosestrata=Choose strata to keep \:
 coser.ui.selection.replay.chooseyears=Choose years to keep \:
 coser.ui.selection.replay.commands=Command list to replay \:
+coser.ui.selection.replay.finishselection=Finish
 coser.ui.selection.replay.missingspecies=Some species are missing in current selection \: %s
 coser.ui.selection.replay.missingstrata=Some strata are missing in current selection \: %s
 coser.ui.selection.replay.missingyears=Some years are missing in current selection \: %s
+coser.ui.selection.replay.nextstep=Next step
+coser.ui.selection.replay.noerrordetected=No errors detected.
 coser.ui.selection.replay.replayTitle=Replay selection
 coser.ui.selection.replay.selectioninfos=Selection information \:
 coser.ui.selection.rsufidataextracted=RSufi data extracted.

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	2012-01-04 17:26:28 UTC (rev 945)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties	2012-01-06 16:39:43 UTC (rev 946)
@@ -7,8 +7,6 @@
 coser.ui.about.about=<html><b>Coser</b><br /><br />Version %s<br /><br />Liens utiles \:<ul><li><a href\="http\://maven-site.forge.codelutin.com/coser/">Documentation</a></li><li><a href\="http\://forge.codelutin.com/projects/coser/issues">Rapport de bug</a></li></ul><br /><br />Copyright 2010 - 2012 <a href\="http\://www.ifremer.fr">Ifremer</a>, <a href\="http\://www.codelutin.com">Code Lutin</a><html>
 coser.ui.about.title=À propos de Coser
 coser.ui.common.cancel=Annuler
-coser.ui.common.finish=Terminer
-coser.ui.common.next=Suivant
 coser.ui.common.no=Non
 coser.ui.common.selectAll=Sélectionner tout
 coser.ui.common.selectAll.short=Tout
@@ -223,9 +221,12 @@
 coser.ui.selection.replay.choosestrata=Choisissez les strates à conserver \:
 coser.ui.selection.replay.chooseyears=Choisissez les années à conserver \:
 coser.ui.selection.replay.commands=Liste de toutes les commandes à rejouer \:
+coser.ui.selection.replay.finishselection=Terminer
 coser.ui.selection.replay.missingspecies=Certaines espèces de la séléction à rejouer sont manquantes \: %s
 coser.ui.selection.replay.missingstrata=Certaines strates de la séléction à rejouer sont manquantes \: %s
 coser.ui.selection.replay.missingyears=Certaines années de la séléction à rejouer sont manquantes \: %s
+coser.ui.selection.replay.nextstep=Étape suivante
+coser.ui.selection.replay.noerrordetected=Aucune erreur détéctée.
 coser.ui.selection.replay.replayTitle=Rejouer une sélection
 coser.ui.selection.replay.selectioninfos=Information sur la sélection \:
 coser.ui.selection.rsufidataextracted=Données RSufi extraites.

    

[Coser-commits] r946 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/selection/replay resources/i18n

echatellier＠users.forge.codelutin.com