This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 65950d7df53c3dddfa5c1510f8db0621d0ccd385 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 16 09:58:55 2015 +0100 rename i18n --- .../fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java | 2 +- .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 3 +++ .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 8 +++++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java index 1a3f53a..0b70ce5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java @@ -65,7 +65,7 @@ public class ExportProtocolAction extends AbstractTuttiAction<SelectCruiseUIMode file = saveFile( "protocol-" + protocol.getName().replaceAll(" ", "_"), "tuttiProtocol", - t("tutti.selectCruise.title.choose.exportFile"), + t("tutti.selectCruise.title.choose.exportProtocolFile"), t("tutti.selectCruise.action.exportProtocol"), "^.+\\.tuttiProtocol$", t("tutti.common.file.protocol") ); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java index c61c8be..5692280 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java @@ -83,7 +83,7 @@ public class ImportProtocolAction extends AbstractChangeScreenAction { if (doAction) { // choose file to import file = chooseFile( - t("tutti.selectCruise.title.choose.importFile"), + t("tutti.selectCruise.title.choose.importProtocolFile"), t("tutti.selectCruise.action.importProtocol"), "^.+\\.tuttiProtocol$", t("tutti.common.file.protocol") ); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index e2fa25e..e37e453 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1422,6 +1422,7 @@ tutti.importDb.step.openDb= tutti.importDb.step.unzipArchive= tutti.importDb.step.will.migrateSchema= tutti.importProgram.action.exportErrors= +tutti.importProgram.action.importErrors= tutti.importProgram.action.success= tutti.importProtocol.action.success= tutti.importPupitri.carrouselFile.extension= @@ -1772,6 +1773,8 @@ tutti.selectCruise.action.exportProgram.tip= tutti.selectCruise.action.exportProtocol= tutti.selectCruise.action.exportProtocol.tip= tutti.selectCruise.action.importGenericformat= +tutti.selectCruise.action.importProgram= +tutti.selectCruise.action.importProgram.tip= tutti.selectCruise.action.importProtocol= tutti.selectCruise.action.importProtocol.tip= tutti.selectCruise.action.newCruise= 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 1b167d0..53853d1 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 @@ -1363,6 +1363,7 @@ tutti.importDb.step.openDb=Ouverture de la base de données <strong>%s</strong> tutti.importDb.step.unzipArchive=Décompression de l'archive tutti.importDb.step.will.migrateSchema=Démarrage de la mise à jour du schéma de la base depuis la version %s vers la version %s tutti.importProgram.action.exportErrors= +tutti.importProgram.action.importErrors= tutti.importProgram.action.success= tutti.importProtocol.action.success=Protocole [%s] lu depuis le fichier. tutti.importPupitri.carrouselFile.extension=car @@ -1671,7 +1672,9 @@ tutti.selectCruise.action.exportProgram=Exporter tutti.selectCruise.action.exportProgram.tip=Exporter la série sélectionnée tutti.selectCruise.action.exportProtocol=Exporter tutti.selectCruise.action.exportProtocol.tip=Exporter le protocole sélectionné -tutti.selectCruise.action.importGenericformat= +tutti.selectCruise.action.importGenericformat=Importer +tutti.selectCruise.action.importProgram=Importer +tutti.selectCruise.action.importProgram.tip=Importer des campagnes au format générique tutti.selectCruise.action.importProtocol=Importer tutti.selectCruise.action.importProtocol.tip=Importer un protocole tutti.selectCruise.action.newCruise=Nouveau @@ -1694,8 +1697,11 @@ tutti.selectCruise.field.protocol.tip=Nom du protocole de saisie tutti.selectCruise.title=Sélection de la campagne tutti.selectCruise.title.choose.exportCruiseFile=Exporter une campagne tutti.selectCruise.title.choose.exportFile=Exporter le protocole +tutti.selectCruise.title.choose.exportProtocolFile=Exporter le protocole tutti.selectCruise.title.choose.exportProgramFile=Exporter une série de campagne tutti.selectCruise.title.choose.importFile=Importer le protocole +tutti.selectCruise.title.choose.importProtocolFile=Importer le protocole +tutti.selectCruise.title.choose.importGenericFormatFile=Importer des campagnes tutti.selectCruise.warn.invalid.selected.data=Les données sélectionnées ne sont pas valides, impossible de saisir ou valider les captures. tutti.selectSpecies.action.cancel=Annuler tutti.selectSpecies.action.cancel.mnemonic=A -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.