Author: bleny Date: 2011-01-12 09:33:36 +0000 (Wed, 12 Jan 2011) New Revision: 914 Log: remove use of .properties files used for i18n expect when necessary Added: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration_fr.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_fr.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_fr.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm_fr.properties Removed: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm.properties Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/Index.tml trunk/wao-ui/src/main/webapp/UserProfileForm.tml Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,51 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -fishingZoneCsvFile-label: Fichier CSV des zones de p\u00eache -companies-label: Liste des soci\u00e9t\u00e9s -name-label: Nom* -address1-label: Adresse -address2-label: Compl\u00e9ment d'adresse -postalCode-label: Code postal -city-label: Ville -phoneNumber-label: T\u00e9l\u00e9phone -email-label: E-mail -users-label: Liste des utilisateurs -firstName-label: Pr\u00e9nom* -lastName-label: Nom* -loginAdministration-label: Identifiant de connexion (email)* -active-label: Actif -generatePassword-label: G\u00e9n\u00e9rer le password -userRole-label: R\u00f4le -readOnly-label: Lecture seule -# follow statement doesn't work with BeanEditForm -userForm-errors-banner: L'utilisateur n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : - -errors-banner: Impossible de modifier les changements des param\u00e8tres des inticateurs : - -# UserRole -UserRole.ADMIN: Administrateur -UserRole.OBSERVER: Observateur -UserRole.COORDINATOR: Coordinateur -UserRole.GUEST: Invit\u00e9 Copied: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration_fr.properties (from rev 911, trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties) =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration_fr.properties (rev 0) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration_fr.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -0,0 +1,33 @@ +### +# #%L +# Wao :: Web Interface +# +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + +# Company form +name-label: Nom* +address1-label: Adresse +address2-label: Compl\u00e9ment d'adresse +postalCode-label: Code postal +city-label: Ville +phoneNumber-label: T\u00e9l\u00e9phone +email-label: E-mail Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,62 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -boatsCsvFile-label: Fichier CSV des navires -activityCalendarsCsvFile-label: Fichier CSV des calendriers d'activit\u00e9 - -# FILTERS -sampleRow-label: M\u00e9tier -facadeName-label: Fa\u00e7ade -sectorName-label: Zone -profession-label: M\u00e9tier du plan -boatName-label: Navire -districtCode-label: Quartier -name-label: Nom - -company-label: Soci\u00e9t\u00e9 - -# BOATS LIST -immatriculation-label: Imma. -buildYear-label: Ann\u00e9e -boatLength-label: Long. - -# BOAT INFOS -referenceDate-label: Date -state-label: Etat -createdBy-label: Observateur -sampleRowCode-label: Code plan -contactFirstName-label: Pr\u00e9nom -contactLastName-label: Nom -contactPhoneNumber-label: T\u00e9l\u00e9phone -contactEmail-label: E-mail -contactAddress1-label: Adresse -contactAddress2-label: Compl\u00e9ment d'adresse -contactCity-label: Ville -contactPostalCode-label: Code postal -contactPostalCode-validate: Le code postal doit avoir une valeur num\u00e9rique -contactSiret-label: N\u00b0 SIRET -shipOwner-label: Armateur -fromDate-label: Sollicitations du navire depuis le -dup-label: Capacit\u00e9 d'accueil du navire en personnels sp\u00e9cialis\u00e9s -comment-label: Commentaire Copied: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_fr.properties (from rev 911, trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties) =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_fr.properties (rev 0) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_fr.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -0,0 +1,51 @@ +### +# #%L +# Wao :: Web Interface +# +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + +# GRID +name-label: Nom +immatriculation-label: Imma. +districtCode-label: Quartier +boatLength-label: Long. +buildYear-label: Ann\u00e9e + +# right panel form +company-label: Soci\u00e9t\u00e9 + +# BOAT INFOS +referenceDate-label: Date +state-label: Etat +createdBy-label: Observateur +sampleRowCode-label: Code plan +contactFirstName-label: Pr\u00e9nom +contactLastName-label: Nom +contactPhoneNumber-label: T\u00e9l\u00e9phone +contactEmail-label: E-mail +contactAddress1-label: Adresse +contactAddress2-label: Compl\u00e9ment d'adresse +contactCity-label: Ville +contactPostalCode-label: Code postal +contactPostalCode-validate: Le code postal doit avoir une valeur num\u00e9rique +contactSiret-label: N\u00b0 SIRET +comment-label: Commentaire Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,23 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -login-label: Identifiant (email) -password-label: Mot de passe -userRole-label: R\u00f4le Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,14 +0,0 @@ -# form labels -mainObserver-label: Observateur r\u00e9f\u00e9rant -secondaryObserver-label: Observateur -nbObservants-label: Nombre d'observateurs -contactState-label: \u00c9tat du contact -beginDate-label: D\u00e9but d'observation -endDate-label: Fin d'observation -mammalsObservation-label: Observations de mammif\u00e8res -mammalsCapture-label: Capture accidentelle de mammif\u00e8res -inputDate-label: Date de saisie des donn\u00e9es dans Allegro -observerComment-label: Commentaire observateur -coordinatorComment-label: Commentaire soci\u00e9t\u00e9 -adminComment-label: Commentaire administrateur -dataReliability-label: Qualit\u00e9 de la donn\u00e9e \ No newline at end of file Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,70 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# ContactForm labels -facadeName-label: Facade -sectorName-label: Secteur -observer-label: Observateur r\u00e9f\u00e9rant -contactsCsvFile-label: Fichier des contacts -fromDate-label: Depuis le -reliabilityFilter-label: Qualit\u00e9 -mainObserver-label: Observateur r\u00e9f\u00e9rant - -# Grid labels -createdBy-label: Observateur -company-label: Soci\u00e9t\u00e9 -sampleRow-label: M\u00e9tier -boat-label: Navire -state-label: Etat -topiaCreateDate-label: Cr\u00e9ation -observationBeginDate-label: D\u00e9but de l'observation -observationEndDate-label: Fin de l'observation -nbObservants-label: Nb obs. -lastState-label: Etat -programName-label: Programme -boatName-label: Navire -boatImmatriculation-label: N\u00b0 -boatDistrictCode-label: CQ -mammals-label: Observations et captures accidentelles -dataInputDate-label: Saisie des donn\u00e9es dans Allegro -comment-label: Commentaire observateur -program-label: Programme -professionCode-label: Code m\u00e9tier -professionLibelle-label: Libell\u00e9 m\u00e9tier -professionSpecies-label: Esp\u00e8ces cibles -fishingZoneFacade-label: Fa\u00e7ade -fishingZoneSector-label: Zone -fishingZoneDivision-label: Division -validation-label: Validations -commentAdmin-label: Commentaire programme -commentCoordinator-label: Commentaire soci\u00e9t\u00e9 -dataReliability-label: Qualit\u00e9 de la donn\u00e9e -sortedByBoardingDate-label: Trier par date de d\u00e9but de mar\u00e9e (du plus r\u00e9cent au plus ancien) -expectedSamplingStrategy-label: Strat\u00e9gie d'\u00e9chantillonnage attendue -actualSamplingStrategy-label: Strat\u00e9gie d'\u00e9chantillonnage utilis\u00e9e -completeSampling-label: \u00c9chantillonnage complet - - -# Form labels -contactsForm-errors-banner: Le contact n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,46 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# ContactForm labels -state-label: Etat -boat-label: Navire -tide-label: Mar\u00e9e - -# Grid labels -createdBy-label: Observateur -company-label: Soci\u00e9t\u00e9 -facade-label: Fa\u00e7ade -sector-label: R\u00e9gion -creationDate-label: Cr\u00e9ation -beginTideDate-label: D\u00e9but de la mar\u00e9e -endTideDate-label: Fin de la mar\u00e9e -nbObservants-label: Nb obs. -lastState-label: Etat -programName-label: Programme -boatName-label: Navire -boatImmatriculation-label: N\u00b0 -boatDistrictCode-label: CQ -mammals-label: Mammif\u00e8res -editDate-label: Modification -comment-label: Commentaires Copied: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_fr.properties (from rev 911, trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties) =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_fr.properties (rev 0) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_fr.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -0,0 +1,57 @@ +### +# #%L +# Wao :: Web Interface +# +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + +# Grid labels +company-label: Soci\u00e9t\u00e9 +sampleRow-label: M\u00e9tier +boat-label: Navire +state-label: Etat +topiaCreateDate-label: Cr\u00e9ation +observationBeginDate-label: D\u00e9but de l'observation +observationEndDate-label: Fin de l'observation +nbObservants-label: Nb obs. +lastState-label: Etat +programName-label: Programme +boatName-label: Navire +boatImmatriculation-label: N\u00b0 +boatDistrictCode-label: CQ +mammals-label: Observations et captures accidentelles +dataInputDate-label: Saisie des donn\u00e9es dans Allegro +comment-label: Commentaire observateur +program-label: Programme +professionCode-label: Code m\u00e9tier +professionLibelle-label: Libell\u00e9 m\u00e9tier +professionSpecies-label: Esp\u00e8ces cibles +fishingZoneFacade-label: Fa\u00e7ade +fishingZoneSector-label: Zone +fishingZoneDivision-label: Division +validation-label: Validations +commentAdmin-label: Commentaire programme +commentCoordinator-label: Commentaire soci\u00e9t\u00e9 +dataReliability-label: Qualit\u00e9 de la donn\u00e9e +sortedByBoardingDate-label: Trier par date de d\u00e9but de mar\u00e9e (du plus r\u00e9cent au plus ancien) +expectedSamplingStrategy-label: Strat\u00e9gie d'\u00e9chantillonnage attendue +actualSamplingStrategy-label: Strat\u00e9gie d'\u00e9chantillonnage utilis\u00e9e +completeSampling-label: \u00c9chantillonnage complet Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,26 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -title-label: Titre -content-label: Texte : Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,52 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# FOR PROFESSION PART -professionSelect-label: Code m\u00e9tier -dcf5codes-label: Code DCF Niv. 5* -meshSize-label: Maillage (mm) -size-label: Taille (mm) -other-label: Autre information -libelle-label: Libell\u00e9 -species-label: Esp\u00e8ces cibles - -# FOR FISHING-ZONE PART -fishingZoneSelect-label: Code zone de p\u00eache -fishingZonesInfos-label: Autre information - -# FOR PROGRAM/PERIOD PART -program-label: Programme -programPeriodBegin-label: P\u00e9riode - -# OTHER -code-label: Code de la ligne -company-label: Soci\u00e9t\u00e9 -boats-label: Navires \u00e9ligibles -nbObservants-label: Nombre d'observateurs -averageTideTime-label: Dur\u00e9e moyenne d'une mar\u00e9e -comment-label: Commentaire sur la ligne -samplingStrategy-label: Stat\u00e9gie d'\u00e9chantillonnage - -# FORM -errors-banner: La ligne n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Copied: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties (from rev 911, trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties) =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties (rev 0) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -0,0 +1,52 @@ +### +# #%L +# Wao :: Web Interface +# +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +# FOR PROFESSION PART +professionSelect-label: Code m\u00e9tier +dcf5codes-label: Code DCF Niv. 5* +meshSize-label: Maillage (mm) +size-label: Taille (mm) +other-label: Autre information +libelle-label: Libell\u00e9 +species-label: Esp\u00e8ces cibles + +# FOR FISHING-ZONE PART +fishingZoneSelect-label: Code zone de p\u00eache +fishingZonesInfos-label: Autre information + +# FOR PROGRAM/PERIOD PART +program-label: Programme +programPeriodBegin-label: P\u00e9riode + +# OTHER +code-label: Code de la ligne +company-label: Soci\u00e9t\u00e9 +boats-label: Navires \u00e9ligibles +nbObservants-label: Nombre d'observateurs +averageTideTime-label: Dur\u00e9e moyenne d'une mar\u00e9e +comment-label: Commentaire sur la ligne +samplingStrategy-label: Stat\u00e9gie d'\u00e9chantillonnage + +# FORM +errors-banner: La ligne n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,38 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -samplingPlanCsvFile-label: Fichier CSV du plan d'\u00e9chantillonnage -periodBegin-label: P\u00e9riode du -periodEnd-label: Jusqu'au -company-label: Soci\u00e9t\u00e9 -programName-label: Programme -codeDCF5-label: M\u00e9tier code DCF5 -facadeName-label: Fa\u00e7ade -sectorName-label: Zone -selectedSampleRow-label: Code ligne -fishingGearDCF-label: Engins code DCF -targetSpeciesDCF-label: Ensembles d\'esp\u00e8ces-cible code DCF -samplingStrategy-label: Strat\u00e9gie d'\u00e9chantillonnage - -sampleRow-delete-confirmMessage: \u00cates-vous s\u00fbr de vouloir supprimer d\u00e9finitivement la ligne %1$s du plan d\'\u00e9chantillonnage ? Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,53 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -periodBegin-label: D\u00e9but -periodEnd-label: Fin -boatName-label: Nom -boatImmatriculation-label: N\u00b0 -boatDistrictCode-label: Quartier -facadeName-label: Fa\u00e7ade -sectorName-label: Zone -sampleRowId-label: Code ligne -company-label: Soci\u00e9t\u00e9 -programName-label: Programme -estimatedTides-label: Voir l'effort d'observations estim\u00e9 -fishingGearDCF-label: Engins code DCF -targetSpeciesDCF-label: Ensembles d\'esp\u00e8ces-cible code DCF - -companyForBoarding-label: Soci\u00e9t\u00e9 - -periodBeginForContactStates-label: du -periodEndForContactStates-label: au - -periodBeginForAllegroReactivity-label: du -periodEndForAllegroReactivity-label: au - -# Validation messages -filtersForm-periodBegin-required-message: La date de d\u00e9but est obligatoire -filtersForm-periodEnd-required-message: La date de fin est obligatoire -filterPeriodForContactStates-periodBeginForContactStates-required-message: La date de d\u00e9but est obligatoire -filterPeriodForContactStates-periodEndForContactStates-required-message: La date de fin est obligatoire -#filterPeriodForAllegroReactivity-periodBeginForAllegroReactivity-required-message: La date de d\u00e9but est obligatoire -#filterPeriodForAllegroReactivity-periodEndForAllegroReactivity-required-message: La date de fin est obligatoire Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -1,32 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -firstName-label: Pr\u00e9nom -lastName-label: Nom -login-label: Id. connexion (email) -name-label: Pr\u00e9nom et nom -phoneNumber-label: T\u00e9l\u00e9phone -password-label: Nouveau mot de passe -password2-label: V\u00e9rification mot de passe -active-label: Actif Copied: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm_fr.properties (from rev 911, trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm.properties) =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm_fr.properties (rev 0) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm_fr.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -0,0 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +firstName-label: Pr\u00e9nom +lastName-label: Nom +login-label: Id. connexion (email) +name-label: Pr\u00e9nom et nom +phoneNumber-label: T\u00e9l\u00e9phone +active-label: Actif Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfileForm_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -209,6 +209,8 @@ wao.ui.misc.validated= wao.ui.misc.yes= wao.ui.nContactsFound= +wao.ui.news.content= +wao.ui.news.title= wao.ui.page.Administration.title= wao.ui.page.Boats.title= wao.ui.page.Cartography.title= Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-12 09:33:36 UTC (rev 914) @@ -181,6 +181,8 @@ wao.ui.misc.validated=Valid\u00E9 wao.ui.misc.yes=Oui wao.ui.nContactsFound=%s contacts trouv\u00E9s +wao.ui.news.content=Texte +wao.ui.news.title=Titre wao.ui.page.Administration.title=Administration wao.ui.page.Boats.title=Navires wao.ui.page.Cartography.title=Cartography Modified: trunk/wao-ui/src/main/webapp/Index.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Index.tml 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/webapp/Index.tml 2011-01-12 09:33:36 UTC (rev 914) @@ -54,7 +54,7 @@ </p> <h2 class="${headerStyle}"> <t:if t:test="editionMode"> - <t:label t:for="title" /> : <input t:type="textfield" t:id="title" value="news.title" class="width200" t:validate="required"/> + <label for="title">${message:wao.ui.news.title}</label> : <input t:type="textfield" t:id="title" value="news.title" class="width200" t:validate="required"/> <p:else> ${news.title} </p:else> @@ -82,7 +82,7 @@ </t:if> <div class="news-content"> <t:if t:test="editionMode"> - <t:label t:for="content" /><br /> + <label for="content">${message:wao.ui.news.content} :</label><br /> <!--<input t:type="textarea" t:id="content" value="news.content" t:validate="required" />--> <textarea t:type="easyfck/fckeditor" t:id="content" width="800px" height="200px" value="news.content" t:configuration="fckconf" t:validate="required" /> <p:else> Modified: trunk/wao-ui/src/main/webapp/UserProfileForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/UserProfileForm.tml 2011-01-11 22:16:25 UTC (rev 913) +++ trunk/wao-ui/src/main/webapp/UserProfileForm.tml 2011-01-12 09:33:36 UTC (rev 914) @@ -41,10 +41,6 @@ <label t:for="password2" />${message:wao.ui.form.repeatPassword}</label> <input t:type="passwordfield" t:id="password2" value="password2"/> </p:password2> -<!-- <p:login> - <label>${message:login}</label> - ${user.login} - </p:login>--> </form> </fieldset>