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 256ba74cb4bffe00af30a4efb0eb32125b4330d6 Merge: 76255ee 1e88649 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 23 11:41:49 2015 +0100 Fixes #7025 Merge branch 'feature/7025' into develop .../filtered-resources/tutti-help-fr.properties | 22 ++++---- .../EditSampleCategoryModelTableModel.java | 14 ++--- .../catches/benthos/BenthosBatchUIHandler.java | 34 +++++++++++-- .../catches/species/SpeciesBatchUIHandler.java | 34 +++++++++++-- .../EditProtocolCaracteristicsRowModel.java | 7 +++ .../EditProtocolCaracteristicsTableModel.java | 8 +-- .../EditProtocolOperationFieldsRowModel.java | 4 ++ .../EditProtocolOperationFieldsTableModel.java | 2 + .../protocol/EditProtocolSpeciesTableModel.java | 4 +- .../ui/swing/content/protocol/EditProtocolUI.css | 21 ++++++++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 2 + .../content/protocol/EditProtocolUIHandler.java | 35 ++++++++++++- .../content/protocol/EditProtocolUIModel.java | 27 ++++++++++ .../MoveDownCaracteristicMappingAction.java | 58 +++++++++++++++++++++ .../actions/MoveUpCaracteristicMappingAction.java | 59 ++++++++++++++++++++++ .../swing/util/table/AbstractTuttiTableModel.java | 30 +++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +++ 18 files changed, 335 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.