This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit a036248f1ec327b7e12541f737824da847c703a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 9 10:22:28 2015 +0200 refs #6921: Mauvais libéllé lors de la création d'une base distante --- .../src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties | 2 ++ observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css index 3255b68..cfa946c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/tabs/ConfigDataUI.css @@ -42,13 +42,13 @@ #importDataFromBackup { value:{CreationMode.IMPORT_EXTERNAL_DUMP}; - text:{CreationMode.IMPORT_EXTERNAL_DUMP.getLabel()}; + text:"observe.synchro.import.data.fromBackup"; selected:{model.getDataImportMode() == CreationMode.IMPORT_EXTERNAL_DUMP}; } #importDataFromRemote { value:{CreationMode.IMPORT_REMOTE_STORAGE}; - text:{CreationMode.IMPORT_REMOTE_STORAGE.getLabel()}; + text:"observe.synchro.import.data.fromRemoteStorage"; selected:{model.getDataImportMode() == CreationMode.IMPORT_REMOTE_STORAGE}; } diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index 9e6ca24..b8481be 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -1654,6 +1654,8 @@ observe.synchro.config.validate= observe.synchro.config.validation.report= observe.synchro.configuration= observe.synchro.continue.with.no.save.report= +observe.synchro.import.data.fromBackup= +observe.synchro.import.data.fromRemoteStorage= observe.synchro.importGPS.invalidIntervals.list= observe.synchro.message.all.obsolete.entities.fixed= observe.synchro.message.need.save.for.synchro.operation= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index b990dfe..5798666 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1654,6 +1654,8 @@ observe.synchro.config.validate=Configuración de la validación observe.synchro.config.validation.report=Informe de validación observe.synchro.configuration=Configuración de las operaciones observe.synchro.continue.with.no.save.report=Continuar sin guardar el informe +observe.synchro.import.data.fromBackup= +observe.synchro.import.data.fromRemoteStorage= observe.synchro.importGPS.invalidIntervals.list=Lista de los intervalos de puntos gps no usables observe.synchro.message.all.obsolete.entities.fixed=No hay mas referencias a los objetos obsoletos. observe.synchro.message.need.save.for.synchro.operation=La operación de sincronización de referenciales ha generado cambios diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 900636e..5f540dc 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1652,6 +1652,8 @@ observe.synchro.config.validate=Configuration de la validation observe.synchro.config.validation.report=Rapport de validation observe.synchro.configuration=Configuration des opérations observe.synchro.continue.with.no.save.report=Continuer sans sauver de rapport +observe.synchro.import.data.fromBackup=Importer les données depuis une sauvegarde de base locale (*.sql.gz) +observe.synchro.import.data.fromRemoteStorage=Importer les données depuis une base distante observe.synchro.importGPS.invalidIntervals.list=Liste des intervalles de points gps non utilisables observe.synchro.message.all.obsolete.entities.fixed=Il n'y a plus de références sur des objets obsolètes. observe.synchro.message.need.save.for.synchro.operation=L'opération de synchronisation du référentiel a engendrée des modifications. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.