Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7fb3d456 by Tony Chemit at 2020-07-06T11:13:53+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 - - - - - 4 changed files: - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java ===================================== @@ -48,8 +48,8 @@ public class ActivityLonglinePairingTreeTableModel extends DefaultTreeTableModel public ActivityLonglinePairingTreeTableModel(ActivityLonglinePairingModel uiModel, ActivityLonglinePairingRootNode rootNode) { super(Objects.requireNonNull(rootNode), Arrays.asList( - I18n.t("observe.common.data"), - I18n.t("observe.data.ll.logbook.Activity.relatedObservedActivity"), + I18n.t("observe.actions.longline.pairing.table.logbook.activity"), + I18n.t("observe.actions.longline.pairing.table.observation.activity"), I18n.t("observe.actions.longline.pairing.table.selected"))); this.uiModel = Objects.requireNonNull(uiModel); } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -224,7 +224,9 @@ observe.actions.longline.pairing=Longline activities pairing observe.actions.longline.pairing.config=Pairing configuration observe.actions.longline.pairing.description=Longline activities pairing observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. -observe.actions.longline.pairing.table.selected=To be processed +observe.actions.longline.pairing.table.logbook.activity=Observation activities +observe.actions.longline.pairing.table.observation.activity=Logbook activities +observe.actions.longline.pairing.table.selected=To be saved observe.actions.longline.pairing.tip=Longline activities pairing observe.actions.longline.pairing.title=Longline activities pairing observe.actions.longline.pairing.title.tip=Longline activities pairing ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -224,7 +224,9 @@ observe.actions.longline.pairing=Longline activities pairing \#TODO observe.actions.longline.pairing.config=Pairing configuration \#TODO observe.actions.longline.pairing.description=Longline activities pairing \#TODO observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. \#TODO -observe.actions.longline.pairing.table.selected=Debe tratarse +observe.actions.longline.pairing.table.logbook.activity=Observation activities #TODO +observe.actions.longline.pairing.table.observation.activity=Logbook activities #TODO +observe.actions.longline.pairing.table.selected=Debe grabar #TODO observe.actions.longline.pairing.tip=Longline activities pairing \#TODO observe.actions.longline.pairing.title=Longline activities pairing \#TODO observe.actions.longline.pairing.title.tip=Longline activities pairing \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -224,7 +224,9 @@ observe.actions.longline.pairing=Appairement des activités palangre observe.actions.longline.pairing.config=Configuration de l'appairement observe.actions.longline.pairing.description=Appairement des activités palangre observe.actions.longline.pairing.message.operation.done=Opération terminées en %1$s. -observe.actions.longline.pairing.table.selected=À traiter +observe.actions.longline.pairing.table.logbook.activity=Activités Observation +observe.actions.longline.pairing.table.observation.activity=Activités Livre de Bord +observe.actions.longline.pairing.table.selected=À enregistrer observe.actions.longline.pairing.tip=Appairement des activités palangre observe.actions.longline.pairing.title=Appairement des activités palangre observe.actions.longline.pairing.title.tip=Appairement des activités palangre View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7fb3d456ec3de07fbc2302d854... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7fb3d456ec3de07fbc2302d854... You're receiving this email because of your account on gitlab.com.