This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 903b37ddc7140f00ffeae4fb9946f61a9ab513f8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 11:49:23 2015 +0100 fix i18n --- .../ui/swing/action/ImportGenericFormatProgramCruisesAction.java | 2 +- .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java index 4a2a2d0..2608764 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportGenericFormatProgramCruisesAction.java @@ -42,7 +42,7 @@ public class ImportGenericFormatProgramCruisesAction extends AbstractTuttiAction file = chooseFile( t("tutti.selectCruise.title.choose.importGenericFormatFile"), t("tutti.selectCruise.action.importGenericformat"), - "^.+\\.zip$", t("tutti.common.file.genericFormat") + "^.+\\.zip$", t("tutti.common.file.zip") ); doAction = file != null; diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 7824bb7..144bca3 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -81,7 +81,7 @@ tutti.common.askBeforeUpdate.help=Que voulez-vous faire ?<ul><li><strong>Annuler tutti.common.cancel=Annuler tutti.common.cancel.mnemonic=A tutti.common.file.csv=Extension d'un fichier csv -tutti.common.file.genericFormat= +tutti.common.file.genericFormat=Extension d'une archive zip tutti.common.file.iwa=Fichier d'import Psion tutti.common.file.pdf=Extension d'un fichier pdf tutti.common.file.protocol=Extension d'un fichier de protocole Allegro Campagne @@ -91,7 +91,7 @@ tutti.common.file.tuttiCatch=Fichier d'import/export des poids de capture tutti.common.file.tuttiIndividualObservation=Fichier d'import/export des lots d'observations individuelles tutti.common.file.tuttiMarineLitter=Fichier d'import/export des lots de déchets tutti.common.file.tuttiSpecies=Fichier d'import/export des lots d'espèces -tutti.common.file.zip=Extension d'une archive zip +tutti.common.file.zip= tutti.common.referential.gear=Engin tutti.common.referential.person=utilisateur tutti.common.referential.species=Espèce -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.