Author: fdesbois Date: 2012-09-27 11:27:56 +0200 (Thu, 27 Sep 2012) New Revision: 605 Url: http://forge.codelutin.com/repositories/revision/sammoa/605 Log: clean site and conf Removed: trunk/sammoa-application/src/site/ trunk/sammoa-persistence/src/site/ trunk/sammoa-ui-swing/src/site/ Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-09-27 09:27:35 UTC (rev 604) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-09-27 09:27:56 UTC (rev 605) @@ -361,11 +361,6 @@ false, true ), - ADMIN_EMAIL("admin.email", - n_("sammoa.config.admin.email"), - "fdesbois@codelutin.com", - String.class - ), /** The id/name of the current system/computer */ SYSTEM_ID("system.id", n_("sammoa.config.system.id"), Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-09-27 09:27:35 UTC (rev 604) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-09-27 09:27:56 UTC (rev 605) @@ -1,5 +1,4 @@ sammoa.application.config= -sammoa.config.admin.email=Administrator's email sammoa.config.application.site.url=Website URL of the application sammoa.config.application.version=Version of the application sammoa.config.audio.compression=Audio compression (possible values \: ULAW) @@ -13,7 +12,6 @@ sammoa.config.campaign.id=Id of the default campaign to use sammoa.config.csv.separator=Csv separator caracter to use sammoa.config.data.directory=Main directory where all data are stored. You can use ${data.directory} in other property values (ex\: ${data.directory}/audio). -sammoa.config.db.directory= sammoa.config.flight.number=Number of the default flight to use sammoa.config.fly.mode=Default fly mode sammoa.config.gps.check.period=Time in seconds between each GPS capture Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-27 09:27:35 UTC (rev 604) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-27 09:27:56 UTC (rev 605) @@ -1,6 +1,6 @@ SAMMOA=Sammoa sammoa.about.bottomText=Copyright %s - %s - version %s -sammoa.about.message=About Sammoa +sammoa.about.message=SAMMOA est un système permettant l’acquisition des données d’observations de faune marine lors de campagnes d’observations aériennes pour l'UMS 3462 Pélagis, anciennement baptisé CRMM et situé à l'université de La Rochelle. sammoa.action.about=About sammoa.action.about.tip=About sammoa.action.add=Add