This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 44a217f7b026d3e7a8a7bd403965ed0c7affcc98 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 17:47:56 2015 +0100 On change les intitulés dans les entêtes du plan scléro --- wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 3 ++- wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 3 ++- .../src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties index 3ab18e1..974eb0f 100644 --- a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties +++ b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties @@ -541,7 +541,7 @@ wao.ui.samplingPlan.averageObservationsCount=Number of observations wao.ui.samplingPlan.averageTideTime=Average tide time (d.) wao.ui.samplingPlan.effort=Observation effort wao.ui.samplingPlan.effort.obsVente=Observation effort -wao.ui.samplingPlan.effort.sclerochronology=Observation effort in number of individuals +wao.ui.samplingPlan.effort.sclerochronology=Sampling effort in number of individuals wao.ui.samplingPlan.effort.tip=There is a difference between "0" as effort and leave it empty. O means that no effort is asked to the observers but they can still create contacts for this month. Leaving the field empty makes impossible for the observers to create contacts for this months. wao.ui.samplingPlan.estimated=estimated wao.ui.samplingPlan.expected=expected @@ -556,6 +556,7 @@ wao.ui.samplingPlan.phoneCall.see=View the phone call sampling plan wao.ui.samplingPlan.phoneCall.title=Phone call sampling plan wao.ui.samplingPlan.program=program wao.ui.samplingPlan.sampledProfessions=Sampled professions +wao.ui.samplingPlan.sampledSpecies=Sampled species wao.ui.samplingPlan.showActual=Show realisez observations efforfor validated contacts only wao.ui.samplingPlan.showExpected=Show estimated observations effort for contacts validated by company or not wao.ui.samplingPlan.title=Sampling plan diff --git a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties index 57313fc..274b4ac 100644 --- a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties +++ b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties @@ -542,7 +542,7 @@ wao.ui.samplingPlan.averageObservationsCount=Nombre d'observations wao.ui.samplingPlan.averageTideTime=Durée moyenne d'une marée (J.) wao.ui.samplingPlan.effort=Effort d'observation en nombre de marées wao.ui.samplingPlan.effort.obsVente=Effort d'observation en nombre de sorties -wao.ui.samplingPlan.effort.sclerochronology=Effort d'observation en nombre d'individus +wao.ui.samplingPlan.effort.sclerochronology=Effort d'échantillonnage en nombre d'individus wao.ui.samplingPlan.effort.tip=Il y a une différence entre saisir « 0 » comme effort mensuel et laisser la case vide. Si vous indiquez un effort de 0, aucun effort n'est demandé aux observateurs mais ils pourront tout de même saisir un contact. Si vous laissez la case vide, les observateurs ne pourront pas créer de contacts pour ce mois. wao.ui.samplingPlan.estimated=estimé wao.ui.samplingPlan.expected=planifié @@ -557,6 +557,7 @@ wao.ui.samplingPlan.phoneCall.see=Voir le plan d'échantillonnage téléphonique wao.ui.samplingPlan.phoneCall.title=Plan d'échantillonnage téléphonique wao.ui.samplingPlan.program=Programme ou règlement rattachement wao.ui.samplingPlan.sampledProfessions=Métiers échantillonnés +wao.ui.samplingPlan.sampledSpecies=Espèces échantillonnées wao.ui.samplingPlan.showActual=Afficher l'effort d'observations réalisé pour les contacts validés seulement wao.ui.samplingPlan.showExpected=Afficher l'effort d'observations estimé pour les contacts validés ou non par la société wao.ui.samplingPlan.title=Plan d'échantillonnage diff --git a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp index 57c283c..9a0d60d 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp @@ -198,7 +198,7 @@ <thead> <tr> <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view"> - <s:text name="wao.ui.samplingPlan.sampledProfessions" /> + <s:text name="wao.ui.samplingPlan.sampledSpecies" /> </th> <th colspan="<s:property value="#nbColumnsForProfessionInCompactView" />" class="only-in-compact-view"> <s:text name="wao.ui.samplingPlan.sampledProfessions" /> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.