This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5b83788e25542798afd0b8f4fd2f40c1750b54af Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Wed Aug 31 18:40:09 2016 +0200 Corrige les chaines i18n manquantes pour la gestion avancée des referentiels --- .../application/swing/ui/admin/AdminUIModel.java | 2 +- .../referential/ReferentialSynchronizeMode.java | 14 +++++++------- .../referential/ng/ReferentialSynchroConfigUI.jaxx | 2 +- .../referential/ng/ReferentialSynchroModel.java | 14 +++++++------- .../ng/ReferentialSynchroUIHandler.java | 6 +++--- .../referential/ng/action/ApplyAction.java | 10 +++++----- .../ReferentialSynchronizeTreeModelsBuilder.java | 12 ++++++------ .../i18n/application-swing_en_GB.properties | 22 ++++++++++++++-------- .../i18n/application-swing_es_ES.properties | 8 +++++++- .../i18n/application-swing_fr_FR.properties | 6 ++++++ 10 files changed, 57 insertions(+), 39 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java index 1cfa9f3..8fac8f1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java @@ -32,6 +32,7 @@ import fr.ird.observe.application.swing.ui.admin.export.ExportModel; import fr.ird.observe.application.swing.ui.admin.report.ReportModel; import fr.ird.observe.application.swing.ui.admin.save.SaveLocalModel; import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroModel; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.SynchronizeModel; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroModel; import fr.ird.observe.application.swing.ui.admin.validate.ValidateModel; @@ -51,7 +52,6 @@ import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseDestroyNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; import fr.ird.observe.services.service.actions.validate.ValidateService; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.services.service.seine.TripSeineService; diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ReferentialSynchronizeMode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ReferentialSynchronizeMode.java similarity index 79% rename from services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ReferentialSynchronizeMode.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ReferentialSynchronizeMode.java index 26ace48..f10c724 100644 --- a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ReferentialSynchronizeMode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ReferentialSynchronizeMode.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.service.actions.synchro.referential; +package fr.ird.observe.application.swing.ui.admin.synchronize.referential; /*- * #%L @@ -39,19 +39,19 @@ public enum ReferentialSynchronizeMode { * La base de gauche est en lecture, la base de droite est en écriture. */ FROM_LEFT_TO_RIGHT(false, true, - n("observe.synchro.referential.mode.fromLeftToRight"), - n("observe.synchro.referential.mode.fromLeftToRight.description")), + n("observe.actions.synchro.referential.mode.fromLeftToRight"), + n("observe.actions.synchro.referential.mode.fromLeftToRight.description")), /** * La base de gauche est en écriture, la base de droite est en lecture. */ - FROM_RIGHT_TO_LEFT(true, false,n("observe.synchro.referential.mode.fromRightToLeft"), - n("observe.synchro.referential.mode.fromRightToLeft.description")), + FROM_RIGHT_TO_LEFT(true, false,n("observe.actions.synchro.referential.mode.fromRightToLeft"), + n("observe.actions.synchro.referential.mode.fromRightToLeft.description")), /** * La base de gauche est en écriture, la base de droite est en écriture. */ BOTH(true, true, - n("observe.synchro.referential.mode.both"), - n("observe.synchro.referential.mode.both.description")),; + n("observe.actions.synchro.referential.mode.both"), + n("observe.actions.synchro.referential.mode.both.description")),; /** * Est ce que la source de gauche est en écriture ? diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx index c4c9d52..7a664ce 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx @@ -27,7 +27,7 @@ <import> fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig - fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode + fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode fr.ird.observe.application.swing.ui.admin.AdminUIModel fr.ird.observe.application.swing.validation.ValidationModelMode diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java index 595caf5..2c34e99 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java @@ -23,20 +23,20 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng; */ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; -import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; -import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; -import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; -import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine; import fr.ird.observe.application.swing.ui.admin.AdminActionModel; import fr.ird.observe.application.swing.ui.admin.AdminStep; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.AddReferentialSynchronizeTask; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.DeleteReferentialSynchronizeTask; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.DesactivateReferentialSynchronizeTask; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.ReferentialSynchronizeTaskSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java index f4656e0..89717a1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java @@ -23,16 +23,16 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng; */ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; -import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; -import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModelsBuilder; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; +import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.lang3.tuple.Pair; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java index e98a2b1..969c2d9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java @@ -22,18 +22,18 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; -import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine; -import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest; -import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsResult; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractObserveAction; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroModel; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUIHandler; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeTaskListModel; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.ReferentialSynchronizeTaskSupport; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest; +import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsResult; import jaxx.runtime.swing.wizard.ext.WizardState; import java.awt.event.ActionEvent; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java index b6e202b..aa6ad7b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java @@ -24,19 +24,19 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.AddedReferenceReferentialSynchroNode; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.RootReferentialSynchroNode; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode; +import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.UpdatedReferenceReferentialSynchroNode; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; -import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiff; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffState; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffs; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.AddedReferenceReferentialSynchroNode; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.RootReferentialSynchroNode; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode; -import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.UpdatedReferenceReferentialSynchroNode; import org.apache.commons.lang3.tuple.Pair; import java.util.Objects; diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 7e5458b..b87171e 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -209,13 +209,13 @@ observe.actions.showResume.step=Summary observe.actions.showResume.step.description=Summary of operations observe.actions.synchro.cancel.tip=Cancel observe.actions.synchro.copy.tip=Copy result of report in clipboard -observe.actions.synchro.data=Avanced data management +observe.actions.synchro.data=Advanced data management observe.actions.synchro.data.actionsToPerform=Operations to perform observe.actions.synchro.data.copyToLeft.tip=Copy selected trip(s) to left database observe.actions.synchro.data.copyToRight.tip=Copy selected trip(s) to right database observe.actions.synchro.data.deleteFromLeft.tip=Delete selected trip(s) from left database observe.actions.synchro.data.deleteFromRight.tip=Delete selected trip(s) from right database -observe.actions.synchro.data.description=Avanced data management +observe.actions.synchro.data.description=Advanced data management observe.actions.synchro.data.launch.operation=Get data fro databases observe.actions.synchro.data.prepare.copyToLeftTask=Register operation copy to left database\: %s - %s observe.actions.synchro.data.prepare.copyToRightTask=Register operation copy to right database\: %s - %s @@ -227,17 +227,17 @@ observe.actions.synchro.data.result.export.left.trip=Trip %s - %s was exported f observe.actions.synchro.data.result.export.right.trip=Trip %s - %s was exported from right database. observe.actions.synchro.data.result.import.left.trip=Trip %s - %s was imported into left database. observe.actions.synchro.data.result.import.right.trip=Trip %s - %s was imported into right database. -observe.actions.synchro.data.step=Avanced data management -observe.actions.synchro.data.step.description=Avanced data management +observe.actions.synchro.data.step=Advanced data management +observe.actions.synchro.data.step.description=Advanced data management observe.actions.synchro.data.task.copyToLeft=Copy to left database\: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.data.task.copyToRight=Copy to right database\: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.data.task.deleteFromLeft=Delete from left database\: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.data.task.deleteFromRight=Delete from right database\: <i>%s</i> - «<b>%s</b>» -observe.actions.synchro.data.title=Avanced data management -observe.actions.synchro.data.title.tip=Avanced data management +observe.actions.synchro.data.title=Advanced data management +observe.actions.synchro.data.title.tip=Advanced data management observe.actions.synchro.launch.operation=Launch operation < %1$S > observe.actions.synchro.prepare.operation=Prepare operation < %1$s > -observe.actions.synchro.referential=Avanced referential management +observe.actions.synchro.referential=Advanced referential management observe.actions.synchro.referential.action.copyToLeft.tip=Copy selected referential(s) to left database observe.actions.synchro.referential.action.copyToRight.tip=Copy selected referential(s) to right database observe.actions.synchro.referential.action.deleteFromLeft.tip=Delete selected referential(s) from left database @@ -249,7 +249,7 @@ observe.actions.synchro.referential.action.revertFromRight.tip=Revert selected r observe.actions.synchro.referential.action.skipFromLeft.tip=Do nothing for selected referential(s) from left database observe.actions.synchro.referential.action.skipFromRight.tip=Do nothing for selected referential(s) from right database observe.actions.synchro.referential.config.mode=Synchronisation mode -observe.actions.synchro.referential.description=Avanced referential management +observe.actions.synchro.referential.description=Advanced referential management observe.actions.synchro.referential.launch.operation=Compute differentials of referentials observe.actions.synchro.referential.legacy=Update referential observe.actions.synchro.referential.legacy.description=Update referential @@ -273,6 +273,12 @@ observe.actions.synchro.referential.message.referentiel.was.removed=Referential observe.actions.synchro.referential.message.referentiel.was.replaced=Referential (type %1$s) were replaced to remote (%2$d object(s)) observe.actions.synchro.referential.message.saveLocal.skip=Save operation is not required. observe.actions.synchro.referential.message.synchro.local.modification=Some referential were modified, local database save is required. +observe.actions.synchro.referential.mode.both=Both ways +observe.actions.synchro.referential.mode.both.description=Synchronise referentials in both ways +observe.actions.synchro.referential.mode.fromLeftToRight=From left source to right source +observe.actions.synchro.referential.mode.fromLeftToRight.description=Synchronise referentials from left source to right source +observe.actions.synchro.referential.mode.fromRightToLeft=From right source to left source +observe.actions.synchro.referential.mode.fromRightToLeft.description=Synchronise referentials from right source to left source observe.actions.synchro.referential.obsolete.entities.list=Disabled referential list observe.actions.synchro.referential.obsolete.entity.fix=Change references of selected referential observe.actions.synchro.referential.replaceBefore.message=<html><body>Choose replace referential for <i>%s</i> \: <b>%s</b>.<br/><br/> diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 9b1254b..ad28495 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -234,7 +234,7 @@ observe.actions.synchro.data.task.copyToRight=Copiar en la base de la derecha \: observe.actions.synchro.data.task.deleteFromLeft=Eliminar en la base de la izquierda \: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.data.task.deleteFromRight=Eliminar en la base de la derecha \: <i>%s</i> - «<b>%s</b>» observe.actions.synchro.data.title=Gestión avanzada de los datos -observe.actions.synchro.data.title.tip=Synchronisación bi-directionnal de los datos de los usaurios +observe.actions.synchro.data.title.tip=Sincronización bi-directionnal de los datos de los usaurios observe.actions.synchro.launch.operation=Comenzar la operación < %1$s > observe.actions.synchro.prepare.operation=Preparar la operación <%1$s> observe.actions.synchro.referential=Gestión avanzada del referencial @@ -273,6 +273,12 @@ observe.actions.synchro.referential.message.referentiel.was.removed=Se han elimi observe.actions.synchro.referential.message.referentiel.was.replaced=Se han remplazado datos (type %1$s) en el referencial local (%2$d objet(s)) observe.actions.synchro.referential.message.saveLocal.skip=No es necesario realizar copia de seguidad de la base local observe.actions.synchro.referential.message.synchro.local.modification=Se han modificados datos, la base local debe ser guardada. +observe.actions.synchro.referential.mode.both=Bidiriccional +observe.actions.synchro.referential.mode.both.description=Sincronización bidiriccional de los referenciales +observe.actions.synchro.referential.mode.fromLeftToRight=De la izquierda a la derecha +observe.actions.synchro.referential.mode.fromLeftToRight.description=Sincronización de los referenciales desde la fuente de la izquierda hacia la fuente de la derecha +observe.actions.synchro.referential.mode.fromRightToLeft=De la derecha a la izquierda +observe.actions.synchro.referential.mode.fromRightToLeft.description=Sincronización de los referenciales desde la fuente de la derecha hacia la fuente de la izquierda observe.actions.synchro.referential.obsolete.entities.list=Lista de los entidades del referencial que son obsoletas observe.actions.synchro.referential.obsolete.entity.fix=Cambiar las referencias del objeto seleccionado observe.actions.synchro.referential.replaceBefore.message=<html><body>Elegir un referencial de reemplazo de <i>%s</i> \: <b>%s</b>.<br/><br/> diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 5f5a700..9375499 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -273,6 +273,12 @@ observe.actions.synchro.referential.message.referentiel.was.removed=Des données observe.actions.synchro.referential.message.referentiel.was.replaced=Des données (type %1$s) ont été remplacées dans le référentiel local (%2$d objet(s)) observe.actions.synchro.referential.message.saveLocal.skip=L'opération de sauvegarde de la base locale n'est pas requise. observe.actions.synchro.referential.message.synchro.local.modification=Des données ont été modifiées et la base locale doit être sauvée. +observe.actions.synchro.referential.mode.both=Bi-directionnelle +observe.actions.synchro.referential.mode.both.description=Synchronisation bi-directionnelle des référentiels +observe.actions.synchro.referential.mode.fromLeftToRight=Depuis la source de gauche vers celle de droite +observe.actions.synchro.referential.mode.fromLeftToRight.description=Synchronisation Référentiel depuis la source de gauche vers celle de droite +observe.actions.synchro.referential.mode.fromRightToLeft=Depuis la source de droite à la source de gauche +observe.actions.synchro.referential.mode.fromRightToLeft.description=Synchronisation Référentiel depuis la source de droite vers celle de gauche observe.actions.synchro.referential.obsolete.entities.list=Liste des entités du référentiel obsolètes observe.actions.synchro.referential.obsolete.entity.fix=Changer les références sur l'objet sélectionné observe.actions.synchro.referential.replaceBefore.message=<html><body>Choisir un référentiel de remplacement de <i>%s</i> \: <b>%s</b>.<br/><br/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.