Author: tchemit Date: 2013-07-10 17:43:14 +0200 (Wed, 10 Jul 2013) New Revision: 1131 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1131 Log: up to jaxx / eugene last stable Modified: trunk/pom.xml trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-10 15:40:58 UTC (rev 1130) +++ trunk/pom.xml 2013-07-10 15:43:14 UTC (rev 1131) @@ -123,10 +123,10 @@ <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> - <eugenePluginVersion>2.6.2</eugenePluginVersion> + <eugenePluginVersion>2.6.3</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.24-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.24</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.15</xworkVersion> @@ -156,7 +156,7 @@ <jdbc.hsqldb.version>1.8.0.10</jdbc.hsqldb.version> <!-- Last JRE version to use --> - <jreVersion>1.7.21</jreVersion> + <jreVersion>1.7.25</jreVersion> <!-- Last tutti db version --> <!--<dbVersion>2013.04.22</dbVersion>--> Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-07-10 15:40:58 UTC (rev 1130) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-07-10 15:43:14 UTC (rev 1131) @@ -139,6 +139,10 @@ tutti.service.operations.computeWeights.species.error.incoherentTotalSorted= tutti.service.operations.computeWeights.species.error.noWeight= tutti.service.operations.exportCatchesReport.error= +tutti.service.operations.exportCatchesReport.specialRows.benthos.code= +tutti.service.operations.exportCatchesReport.specialRows.benthos.name= +tutti.service.operations.exportCatchesReport.specialRows.inertAndLivinngNotItemized.code= +tutti.service.operations.exportCatchesReport.specialRows.inertAndLivinngNotItemized.name= tutti.service.operations.individualObservation.error.lengthStepCaracteristic.required= tutti.service.operations.individualObservation.error.size.required= tutti.service.operations.individualObservation.error.species.required=