diff --git a/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_fr.properties b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_fr.properties new file mode 100644 index 000000000..c591adb6b --- /dev/null +++ b/libreplan-webapp/src/main/jasper/projectStatus_Bundle/projectStatus_fr.properties @@ -0,0 +1,11 @@ +# Locale for projectStatusReport.jrxml +title = Rapport d'état du projet +project = Projet\: +project_estimated_hours = Heures estimées\: +project_planned_hours = Heures planifiées\: +project_imputed_hours = Heures imputées\: +code = Code +name = Nom +estimated_hours = Estimée +planned_hours = Planifiée +imputed_hours = Imputée diff --git a/libreplan-webapp/src/main/resources/i18n/fr.po b/libreplan-webapp/src/main/resources/i18n/fr.po index 698a3cb60..e9295f404 100644 --- a/libreplan-webapp/src/main/resources/i18n/fr.po +++ b/libreplan-webapp/src/main/resources/i18n/fr.po @@ -7,22 +7,23 @@ # Translators: # Stephane Ayache , 2011. # Guillaume Postaire , 2011. +# Éric Courteau , 2012. # Philippe Poumaroux , 2012. msgid "" msgstr "" -"Project-Id-Version: libreplan-1.3.0\n" +"Project-Id-Version: libreplan-1.3.1\n" "Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" -"POT-Creation-Date: 2012-07-05 08:07+0200\n" -"PO-Revision-Date: 2012-07-07 20:30+0000\n" +"POT-Creation-Date: 2012-10-02 12:44+0200\n" +"PO-Revision-Date: 2012-10-06 09:27+0000\n" "Last-Translator: Philippe Poumaroux \n" "Language-Team: Français\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:436 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:449 msgid "currency code not specified" msgstr "le code monĂ©taire n'est pas indiquĂ©" @@ -34,7 +35,7 @@ msgstr "Vous n'avez pas les droits pour crĂ©er de nouveaux utilisateurs" msgid "Availability ratio" msgstr "Ratio de disponibilitĂ©" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:358 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 msgid "Group path" msgstr "Chemin du groupe" @@ -73,13 +74,13 @@ msgstr "SĂ©lectionner un rapport de donnĂ©es" msgid "Create Virtual Worker" msgstr "CrĂ©er un travailleur virtuel" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:825 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 #: libreplan-webapp/src/main/webapp/materials/materials.zul:63 #: libreplan-webapp/src/main/webapp/materials/materials.zul:88 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:58 @@ -115,11 +116,11 @@ msgstr "CrĂ©er un travailleur virtuel" #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:40 -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:37 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:37 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:42 #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:59 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:60 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:58 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:57 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:52 #: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:29 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:258 @@ -145,7 +146,7 @@ msgstr "CrĂ©er un travailleur virtuel" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:143 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:246 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:255 msgid "Operations" msgstr "OpĂ©rations" @@ -158,12 +159,16 @@ msgstr "DonnĂ©es de base" msgid "Select" msgstr "SĂ©lectionner" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:498 +msgid "Project Status" +msgstr "État du projet" + #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:345 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:180 msgid "Start date cannot be empty" msgstr "La date de dĂ©but ne peut pas ĂȘtre vide" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 #: libreplan-webapp/src/main/webapp/materials/materials.zul:35 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:48 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 @@ -187,7 +192,7 @@ msgstr "RĂ©affecter" msgid "Not bound" msgstr "Non liĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:46 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:62 msgid "By critical path hours" msgstr "Par heures de chemin critique" @@ -196,7 +201,7 @@ msgstr "Par heures de chemin critique" msgid "MonteCarlo Method" msgstr "MĂ©thode MonteCarlo" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:180 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:183 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:34 msgid "No deadline" msgstr "Pas de date d'Ă©chĂ©ance" @@ -234,7 +239,7 @@ msgid "Predefined" msgstr "PrĂ©dĂ©fini" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:352 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:49 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:59 @@ -245,7 +250,7 @@ msgstr "Formulaires qualitĂ©" msgid "A stretch has lower or equal values than the previous stretch" msgstr "Une prolongation possĂšde des valeurs infĂ©rieures ou Ă©gales Ă  la prolongation prĂ©cĂ©dente" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:495 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:502 msgid "Reports" msgstr "Rapports" @@ -257,7 +262,7 @@ msgstr "Les affectations ne peuvent pas ĂȘtre terminĂ©es" msgid "Create task" msgstr "CrĂ©er une tĂąche" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:118 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:122 msgid "username not specified" msgstr "nom d'utilisateur non indiquĂ©" @@ -269,8 +274,8 @@ msgstr "LibrePlan: Allocation avancĂ©e" msgid "Criterion requirements" msgstr "CritĂšres requis" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1569 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1575 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1570 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1576 msgid "please, select a timesheet template type" msgstr "merci de choisir un type de canevas de feuille de suivi de temps" @@ -314,16 +319,16 @@ msgstr "Travail effectuĂ©" msgid "Unassign" msgstr "Non affectĂ©" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:37 msgid "Filter timesheet lines by" msgstr "Filtrer les lignes de la feuille de temps par" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:505 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:506 msgid "Manual assignment" msgstr "Affectation manuelle" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:412 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:419 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:68 msgid "Companies" msgstr "SociĂ©tĂ©s" @@ -338,11 +343,11 @@ msgstr "Liste d'Ă©lĂ©ments du formulaire qualitĂ©" msgid "Create {0}: {1}" msgstr "CrĂ©er {0}: {1}" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:193 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:192 msgid "entity name not specified" msgstr "nom d'entitĂ© non indiquĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:414 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:424 msgid "You do not have permissions to go to worker edition window" msgstr "Vous n'avez pas les permissions nĂ©cessaires pour accĂ©der Ă  la fenĂȘtre de modification des travailleurs" @@ -351,7 +356,7 @@ msgid "generic workers allocation" msgstr "Allocation gĂ©nĂ©rique des travailleurs" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:315 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:895 msgid "The project has no scheduled elements" msgstr "Ce projet n'a pas d'Ă©lĂ©ments planifiĂ©s" @@ -365,7 +370,7 @@ msgstr "DĂ©but" msgid "cost assignment's category not specified" msgstr "CatĂ©gorie d'affectation du coĂ»t non spĂ©cifiĂ©e" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:112 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:121 msgid "Check for updates" msgstr "VĂ©rifier les mises Ă  jour" @@ -426,8 +431,14 @@ msgstr "Calendrier par dĂ©faut" msgid "criterion not specified" msgstr "critĂšre non indiquĂ©" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:473 +msgid "" +"only one timesheet line per day and task is allowed in personal timesheets" +msgstr "une seule feuille de temps par jour et par tĂąche est autorisĂ©e dans les feuilles de temps personnelles" + #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:87 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 @@ -447,6 +458,10 @@ msgstr "calendrier de projet non indiquĂ©" msgid "Project Name" msgstr "Nom du projet" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:146 +msgid "type of work hours for personal timesheets cannot be disabled" +msgstr "le type d'heures de travail pour les feuilles de temps personnelles ne peut pas ĂȘtre dĂ©sactivĂ©" + #: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:166 msgid "Company ID already used. It must be unique" msgstr "ID d'organisme dĂ©jĂ  utilisĂ©. Il doit ĂȘtre unique" @@ -455,7 +470,13 @@ msgstr "ID d'organisme dĂ©jĂ  utilisĂ©. Il doit ĂȘtre unique" msgid "Cannot be higher than Ending Date" msgstr "Ne peut pas ĂȘtre supĂ©rieur Ă  la date de fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1172 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +msgid "" +"Roles of LDAP users cannot be managed because LDAP is enabled and LDAP roles" +" are being used." +msgstr "Le rĂŽle des utilisateurs LDAP ne peut pas ĂȘtre gĂ©rĂ© car LDAP est activĂ© et ce sont les rĂŽles LDAP qui sont utilisĂ©s" + +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1176 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 msgid "Indent" msgstr "DĂ©caler" @@ -464,7 +485,7 @@ msgstr "DĂ©caler" msgid "Reassignation" msgstr "RĂ©-affectation" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:331 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:340 msgid "Save passwords in database" msgstr "Sauvegarder les mots de passe en base de donnĂ©e" @@ -518,11 +539,15 @@ msgstr "Nouvel Ă©lĂ©ment du formulaire qualitĂ©" msgid "LibrePlan: Labels" msgstr "LibrePlan: LibellĂ©s" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:253 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:348 +msgid "You have exceeded the maximum limit of users" +msgstr "Vous avez dĂ©passĂ© la limite du nombre maximum d'utilisateurs" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:254 msgid "LDAP connection was successful" msgstr "La connexion au LDAP a rĂ©ussi" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:349 msgid "" "This resource allocation type is incompatible. The task has an associated " "order element which has a progress that is of type subcontractor. " @@ -532,7 +557,7 @@ msgstr "Ce type d'affectation de ressource est incompatible. La tĂąche possĂšde msgid "position not specified" msgstr "position non indiquĂ©e" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:56 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:57 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43 msgid "Current" msgstr "Actuel" @@ -602,23 +627,23 @@ msgstr "ContrĂŽlĂ©" msgid "a disabled resource has enabled subresources" msgstr "une ressource dĂ©sactivĂ©e a autorisĂ© des sous-ressources" -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53 msgid "Client" msgstr "Client" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:661 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:660 msgid "" "there are no resources for required criteria: {0}. So the generic allocation" " can't be added" msgstr "il n'y a pas de ressources pour les critĂšres requis: {0}. C'est pourquoi l'allocation gĂ©nĂ©rique ne peut pas ĂȘtre ajoutĂ©e" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1503 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1504 msgid "must be later than start date" msgstr "doit ĂȘtre postĂ©rieur Ă  la date de dĂ©part" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:351 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:360 msgid "Role search strategy" msgstr "stratĂ©gie de recherche du rĂŽle" @@ -626,7 +651,7 @@ msgstr "stratĂ©gie de recherche du rĂŽle" msgid "fields should match with timesheet data if are shared by lines" msgstr "les champs doivent correspondre avec les donnĂ©es de la feuille de temps s'ils sont communs aux lignes" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:154 msgid "It already exists a deliver date with the same date. " msgstr "Il existe dĂ©jĂ  une date de livraison avec cette mĂȘme date." @@ -638,7 +663,7 @@ msgstr "le nom de catĂ©gorie de matĂ©riel doit ĂȘtre unique. Il est dĂ©jĂ  utili msgid "Imputed hours" msgstr "Heures imputĂ©es" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java:74 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java:73 msgid "progress should be greater than 0% and less than 100%" msgstr "l'avancement doit ĂȘtre supĂ©rieur Ă  0% et infĂ©rieur Ă  100%" @@ -655,7 +680,7 @@ msgstr "Etes-vous sĂ»r de vouloir supprimer ce coĂ»t horaire ?" msgid "Delete Milestone" msgstr "DĂ©truire le jalon" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:247 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:248 msgid "external company should be subcontractor" msgstr "un organisme externe doit ĂȘtre sous-traitant" @@ -667,15 +692,15 @@ msgstr "Emplacements non affectĂ©s" msgid "Application URI" msgstr "URI de l'application" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 msgid "Group strategy" msgstr "StratĂ©gie de groupe" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1071 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1085 msgid "Budget: {0}, Consumed: {1} ({2}%)" msgstr "Budget: {0}, ConsommĂ©: {1} ({2}%)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1552 msgid "Configure" msgstr "Configurer" @@ -697,10 +722,10 @@ msgstr "LibrePlan: Envoyer aux sous-traitants" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:211 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:211 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1220 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1221 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:829 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:826 msgid "Confirm deleting {0}. Are you sure?" msgstr "Suppression de {0}. Êtes-vous sĂ»r ?" @@ -712,15 +737,20 @@ msgstr "Modifier la tĂąche sĂ©lectionnĂ©e" msgid "External code" msgstr "Code externe" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:193 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:644 +msgid "Personal timesheet saved" +msgstr "Feuille de temps personnelle enregistrĂ©e" + #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:51 msgid "View" msgstr "Vue" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:225 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:226 msgid "subcontratation date not specified" msgstr "Date de sous-traitance non indiquĂ©e" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:164 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:177 msgid "base not specified" msgstr "base non indiquĂ©e" @@ -732,7 +762,7 @@ msgstr "Nouvelle date de livraison" msgid "Required materials" msgstr "MatĂ©riels requis" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312 msgid "Backwards" msgstr "Retour" @@ -762,30 +792,25 @@ msgstr "Haut" msgid "EAC" msgstr "FEP" -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 -msgid "Predecessor" -msgstr "PrĂ©dĂ©cesseur" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:602 -msgid "Not workable day" -msgstr "Jour non ouvrĂ©" - #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:539 msgid "it already exists another expense sheet with the same code." msgstr "il existe dĂ©jĂ  une autre feuille de dĂ©pense avec le mĂȘme code." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55 -msgid "Please select a task" -msgstr "Veuillez sĂ©lectionner une tĂąche " +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 +msgid "Predecessor" +msgstr "PrĂ©dĂ©cesseur" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:601 +msgid "Not workable day" +msgstr "Jour non ouvrĂ©" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:172 msgid "Some stretch has higher or equal values than the previous stretch" msgstr "Certaines dĂ©rives ont des valeurs supĂ©rieures ou Ă©gales Ă  la dĂ©rive prĂ©cĂ©dente" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:473 -msgid "" -"only one timesheet line per day and task is allowed in monthly timesheets" -msgstr "seulement une ligne de feuille de temps par jour et par tĂąche est autorisĂ© dans les feuilles de temps mensuelles" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55 +msgid "Please select a task" +msgstr "Veuillez sĂ©lectionner une tĂąche " #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 msgid "" @@ -844,12 +869,12 @@ msgid "This project has already been added." msgstr "Ce projet a dĂ©jĂ  Ă©tĂ© ajoutĂ©" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:558 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:619 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:621 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:134 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:143 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:54 msgid "Criteria" msgstr "CritĂšre " @@ -884,7 +909,7 @@ msgstr "La valeur doit ĂȘtre un multiple de la valeur de prĂ©cision du type d'av msgid "Set Filter Options" msgstr "Configurer les options de filtre" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:370 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:377 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:22 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:62 msgid "Expenses" @@ -927,23 +952,27 @@ msgstr "Veuillez sĂ©lectionner un critĂšre. " msgid "{0} annotation required on {1}" msgstr "{0} annotation requise sur {1}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:234 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:239 msgid "Some sequences to be removed do not exist" msgstr "Certaines sĂ©quences Ă  supprimer n'existent pas" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1297 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1301 msgid "Modified" msgstr "ModifiĂ©" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:956 +msgid "cannot be negative" +msgstr "ne peut pas ĂȘtre nĂ©gatif" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215 msgid "Add Criterion" msgstr "Ajouter un critĂšre" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:664 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:665 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "prĂ©fixe de format incorrect. Il ne peut pas ĂȘtre vide ou contenir des espaces" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1228 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1227 msgid "inherited exception can not be removed" msgstr "une exception hĂ©ritĂ©e ne peut pas ĂȘtre supprimĂ©e" @@ -990,7 +1019,7 @@ msgstr "Liste des modĂšles" msgid "Criteria: {0}" msgstr "CritĂšre: {0}" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:253 msgid "Last value" msgstr "DerniĂšre valeur" @@ -1023,12 +1052,17 @@ msgstr "Ă©lĂ©ment" msgid "Profile" msgstr "Profil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:491 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:511 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:32 +msgid "Personal timesheet" +msgstr "Feuille de temps personnelle" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:493 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 msgid "Materials Needs At Date" msgstr "Besoins matĂ©riels Ă  une date donnĂ©e" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:296 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 msgid "UserDn" msgstr "UserDn" @@ -1071,6 +1105,10 @@ msgstr "Il existe dĂ©jĂ  un autre canevas de feuille de temps avec le mĂȘme code msgid "Overload due to other assignments" msgstr "Surcharge due Ă  d'autres affectations" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:123 +msgid "Project progress percentage" +msgstr "Pourcentage d'avancement du projet" + #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:104 msgid "Expense properties" msgstr "PropriĂ©tĂ©s des dĂ©penses" @@ -1093,17 +1131,11 @@ msgstr "Êtes-vous sĂ»r de modifier ce type de ressource ? Vous perdrez tous les msgid "This Criterion has already been added." msgstr "Ce critĂšre existe dĂ©jĂ ." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:226 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:235 msgid "add" msgstr "ajouter" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:952 -#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 -msgid "Budget value cannot be negative" -msgstr "La valeur budgĂ©tĂ©e ne peut pas ĂȘtre nĂ©gative" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:395 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:405 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1128 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:243 msgid "Unsaved changes will be lost. Would you like to continue?" @@ -1118,7 +1150,7 @@ msgstr "merci de choisir Ă  utilisateur Ă  lier" msgid "Workers" msgstr "Participants" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 msgid "" "You can not remove the project \"{0}\" because it has time tracked at some " "of its tasks" @@ -1144,7 +1176,7 @@ msgstr "AnnĂ©e" msgid "{0} \"{1}\" could not be deleted, it was already removed" msgstr "{0} \"{1}\" ne peut pas ĂȘtre supprimĂ©, il a dĂ©jĂ  Ă©tĂ© supprimĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:422 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:429 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:70 msgid "Received From Subcontractors" msgstr "Reçu des sous-traitants" @@ -1165,7 +1197,7 @@ msgstr "Date de dĂ©but" msgid "LibrePlan: Hours Types" msgstr "LibrePlan: Types d'heures" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:44 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:61 msgid "By all tasks hours" msgstr "Par toutes les heures des tĂąches" @@ -1197,8 +1229,8 @@ msgstr "il n'y a pas de pĂ©riodes valides pour ce calendrier" msgid "Add role" msgstr "Ajouter un rĂŽle" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:643 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1279 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1278 msgid "Exception end date should be greater or equals than start date" msgstr "Les dates de fin exceptionnelles doivent ĂȘtre postĂ©rieures ou Ă©gales Ă  la date de dĂ©but" @@ -1220,7 +1252,8 @@ msgstr "La date d'extension ne doit pas ĂȘtre antĂ©rieure Ă  la date de dĂ©but:" msgid "Progress Types List" msgstr "Liste des types d'avancement" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:415 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:398 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" @@ -1239,25 +1272,21 @@ msgid "The code cannot be empty and it must be unique." msgstr "Le code ne peut pas ĂȘtre vide et il doit ĂȘtre unique." #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:124 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:401 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:408 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:67 msgid "Profiles" msgstr "Profils" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:60 -msgid "Monthly timesheet \"{0}\" saved" -msgstr "Feuille de temps mensuelle \"{0}\" sauvegardĂ©e" - #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:46 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:35 msgid "First expense" msgstr "PremiĂšre dĂ©pense" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 msgid "Host" msgstr "HĂŽte" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:198 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:207 msgid "Perspectives" msgstr "Perspectives" @@ -1294,6 +1323,10 @@ msgstr "Diviser une nouvelle affectation" msgid "maxixum value of percentage progress type must be 100" msgstr "valeur maximum du pourcentage de type d'avancement doit ĂȘtre 100" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:84 +msgid "Total personal timesheet" +msgstr "Total de la feuille de temps personnelle" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:275 msgid "Expiry date" msgstr "Date d'expiration" @@ -1348,11 +1381,11 @@ msgstr "TĂąche: {0}" msgid "Percentage" msgstr "Pourcentage" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:52 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:55 msgid "Remaining time" msgstr "Temps restant" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:88 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:97 msgid "Company logo URL" msgstr "URL du logo de la sociĂ©tĂ©" @@ -1360,16 +1393,16 @@ msgstr "URL du logo de la sociĂ©tĂ©" msgid "No worker selected" msgstr "Aucun travailleur sĂ©lectionnĂ©" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:224 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:233 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:251 msgid "Number of digits" msgstr "Nombre de chiffres" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:294 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:290 msgid "Task not found" msgstr "TĂąche non trouvĂ©e" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:136 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:149 msgid "company code cannot contain whitespaces" msgstr "Le code d'organisme ne peut pas contenir d'espaces" @@ -1382,7 +1415,7 @@ msgstr "CapacitĂ© totale" msgid "Problems connecting with client web service" msgstr "ProblĂšme de connection avec le web service client" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:718 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:720 msgid "" "You cannot remove the task \"{0}\" because it has work reported on it or any" " of its children" @@ -1406,21 +1439,21 @@ msgstr "Liste de profils" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "Les deux {0} des catĂ©gories {1} et {2} de la catĂ©gorie {3} ont le mĂȘme code" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1082 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1096 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:226 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:703 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:606 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:709 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:608 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:76 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:46 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:138 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:147 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:56 msgid "Labels" msgstr "LibellĂ©s" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:438 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:441 msgid "Queue-based resource assignation" msgstr "Affectation de ressources en mode file" @@ -1433,11 +1466,7 @@ msgstr "Date d'Ă©chĂ©ance communiquĂ©e par le sous-traitant." msgid "New timesheet" msgstr "Nouvelle feuille de temps" -#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:39 -msgid "Data" -msgstr "DonnĂ©es" - -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:152 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:374 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:195 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" @@ -1447,20 +1476,20 @@ msgstr "Total des heures" msgid "Reassigning {0} projects" msgstr "RĂ©affecter {0} projets" +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:39 +msgid "Data" +msgstr "DonnĂ©es" + #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:57 msgid "Filter by task status" msgstr "Filtrer par Ă©tat de tĂąche" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:75 -msgid "BAC (Budget At Completion)" -msgstr "BAA (Budget A l'AchĂšvement)" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:490 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:491 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:418 msgid "Select date" msgstr "Choisissez la date" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:264 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:265 msgid "state not specified" msgstr "Ă©tat non indiquĂ©" @@ -1524,13 +1553,13 @@ msgstr "PĂ©riodes d'activation" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:76 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:138 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:168 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:177 msgid "Calendar" msgstr "Calendrier" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:355 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:357 #: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:76 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:148 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:157 msgid "Resources" msgstr "Ressources" @@ -1562,7 +1591,7 @@ msgid "scenario" msgstr "scĂ©nario" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:52 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:59 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:58 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:42 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:29 @@ -1573,11 +1602,11 @@ msgstr "Ă " msgid "worker's first name not specified" msgstr "le prĂ©nom du travailleur n'est pas indiquĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1412 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1411 msgid "End date can only be deleted in the the last activation" msgstr "La date d'Ă©chĂ©ance ne peut pas ĂȘtre supprimĂ©e dans la derniĂšre activation" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:354 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:363 msgid "Property strategy" msgstr "StratĂ©gie de la propriĂ©tĂ©" @@ -1630,7 +1659,7 @@ msgid "Last name" msgstr "Nom" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:382 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:575 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:580 msgid "Remove" msgstr "Supprimer" @@ -1654,7 +1683,7 @@ msgstr "Type d'avancement" msgid "name not specified or empty" msgstr "nom non indiquĂ© ou vide" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1301 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "La tĂąche contient un avancement consolidĂ©. Impossible d'appliquer la fonction sigmoĂŻde." @@ -1666,7 +1695,7 @@ msgstr "La date ne peut pas inclure l'intĂ©gralitĂ© de la prochaine semaine de t msgid "LibrePlan: Virtual Worker Groups" msgstr "LibrePlan: Groupes de travailleurs virtuels" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:333 msgid "UserId" msgstr "UserId" @@ -1685,11 +1714,11 @@ msgstr "La date de dĂ©but est incorrecte, la nouvelle date de dĂ©but doit ĂȘtre msgid "Create New Project" msgstr "CrĂ©er un nouveau projet" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1439 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1436 msgid "Stretches list" msgstr "Liste des dĂ©rives" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:313 msgid "to {0}" msgstr "Ă  {0}" @@ -1713,11 +1742,11 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:185 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:183 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:125 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:136 #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:89 #: libreplan-webapp/src/main/webapp/myaccount/settings.zul:127 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:133 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:70 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:41 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 @@ -1730,11 +1759,11 @@ msgstr "Zoom" #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:77 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:399 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:408 msgid "Save" msgstr "Enregistrer" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:147 msgid "" "It will only be possible to add a Deliver Date if all the deliver date " "exiting in the table have a CommunicationDate not empty. " @@ -1745,13 +1774,13 @@ msgstr "Il ne sera possible d'ajouter une date de livraison si toutes les dates msgid "Standard Effort" msgstr "Effort standard" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:158 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:167 msgid "Material categories" msgstr "CatĂ©gories de matĂ©riel" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:284 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:587 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:685 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:285 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:588 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:686 msgid "number of digits must be between {0} and {1}" msgstr "le nombre de chiffre doit ĂȘtre entre {0} et {1}" @@ -1778,7 +1807,7 @@ msgid "" "progress assignment from root task" msgstr "L'avancement Ă©tendu ne peut ĂȘtre modifiĂ© s'il y a une consolidation dans l'une des affectations d'avancement de la tĂąche racine" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 msgid "Schedule from deadline to start" msgstr "PrĂ©vision de la date d'Ă©chĂ©ance au dĂ©but" @@ -1791,10 +1820,6 @@ msgstr "Droits des utilisateurs" msgid "Problems connecting with subcontractor web service" msgstr "ProblĂšmes lors de la connection avec le web service sous-traitant" -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:22 -msgid "Monthly timesheets" -msgstr "Feuilles de temps mensuelles" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:377 msgid "Delete template. Are you sure?" msgstr "Supprimer le canevas. Êtes-vous sĂ»r ?" @@ -1803,12 +1828,12 @@ msgstr "Supprimer le canevas. Êtes-vous sĂ»r ?" msgid "Expense date" msgstr "Date de la dĂ©pense" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:236 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:245 msgid "Entity type" msgstr "Type d'entitĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1069 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1071 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:234 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Les modifications non enregistrĂ©es seront perdues. Êtes-vous sĂ»r ?" @@ -1856,15 +1881,16 @@ msgstr "DĂ©plier/Replier tout" msgid "Overload due to current project" msgstr "Surcharge due au projet actuel" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1054 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1068 msgid "Name: {0}" msgstr "Nom: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1108 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1112 msgid "Move down" msgstr "Descendre" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/ProjectStatusReportController.java:83 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 msgid "Please, select a project" @@ -1882,9 +1908,13 @@ msgstr "Feuille de dĂ©penses" msgid "Report structure" msgstr "Structure du rapport" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:100 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:362 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:523 +msgid "resource has to be bound to a user in personal timesheets" +msgstr "une ressource doit ĂȘtre liĂ©e Ă  un utilisateur dans les feuilles de temps personnelles" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:101 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:372 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "Yes" msgstr "Oui" @@ -1893,7 +1923,7 @@ msgstr "Oui" msgid "Go to user edition window" msgstr "Aller Ă  la fenĂȘtre de modification utilisateur" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:385 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:392 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 @@ -1926,7 +1956,7 @@ msgstr "Calculer le nombre d'heures" msgid "Assign" msgstr "Affecter" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1283 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1276 msgid "Create Template" msgstr "CrĂ©er un modĂšle" @@ -1944,7 +1974,7 @@ msgid "last expense sheet line sequence code not specified" msgstr "code de derniĂšre sĂ©quence de ligne de feuille de dĂ©pense non indiquĂ©" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:149 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:837 msgid "Not enough permissions to edit this project" msgstr "Permissions insuffisantes pour modifier ce projet" @@ -1961,12 +1991,17 @@ msgstr "Recherche avancĂ©e" msgid "Filter by labels" msgstr "Filtrer par libellĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:639 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:642 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" msgstr "IMPORTANT: N'oubliez pas de signaler au sous-traitant que son contrat a Ă©tĂ© annulĂ©" +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:36 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:82 +msgid "Project Status Report" +msgstr "Rapport d'Ă©tat du projet" + #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36 msgid "MonteCarlo chart" msgstr "Graphique MonteCarlo" @@ -1975,7 +2010,7 @@ msgstr "Graphique MonteCarlo" msgid "Schedule Variance" msgstr "Variance prĂ©visionnelle" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:676 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:675 msgid "resources per day cannot be empty or less than zero" msgstr "les ressources par jour ne peuvent pas ĂȘtre vides ou infĂ©rieures Ă  zĂ©ro" @@ -1983,7 +2018,7 @@ msgstr "les ressources par jour ne peuvent pas ĂȘtre vides ou infĂ©rieures Ă  z msgid "Criterion cannot be empty" msgstr "Le critĂšre ne peut pas ĂȘtre vide" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:131 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:144 msgid "company code not specified" msgstr "code d'organisme non indiquĂ©" @@ -2004,9 +2039,9 @@ msgstr "les index des champs et des Ă©tiquettes doivent ĂȘtre uniques et consĂ©c #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:571 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:609 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:640 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:612 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:643 #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:155 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:150 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:472 @@ -2067,7 +2102,7 @@ msgstr "Type d'affectation" msgid "Duration (days)" msgstr "DurĂ©e (jours)" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:424 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:69 msgid "Send To Subcontractors" msgstr "Envoyer aux sous-traitants" @@ -2088,7 +2123,7 @@ msgstr "Type d'Ă©tiquette dĂ©jĂ  affectĂ©" msgid "Timesheets Template" msgstr "Canevas de feuilles de temps" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:144 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:157 msgid "host not specified" msgstr "hĂŽte non indiquĂ©" @@ -2096,7 +2131,7 @@ msgstr "hĂŽte non indiquĂ©" msgid "percentages in quality form items must be unique" msgstr "les pourcentages dans les Ă©lĂ©ments du formulaire qualitĂ© doivent ĂȘtre unique" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:443 msgid "Edit queue-based resource element" msgstr "Modifier l'Ă©lĂ©ment de ressource en queue" @@ -2115,7 +2150,7 @@ msgstr "La valeur n'est pas correcte.\nLe code ne peut pas contenir de caractĂšr msgid "Node without children" msgstr "Noeud sans enfant" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:152 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:141 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:56 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 msgid "Company" @@ -2151,7 +2186,7 @@ msgstr "Surnom" msgid "calendars with zero hours are not allowed" msgstr "les calendriers avec zĂ©ro heures ne sont pas autorisĂ©s" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:744 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:745 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:392 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:170 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118 @@ -2163,8 +2198,8 @@ msgstr "les calendriers avec zĂ©ro heures ne sont pas autorisĂ©s" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:43 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:43 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:43 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:50 -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:28 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:28 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:50 #: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 @@ -2187,8 +2222,8 @@ msgstr "Ajouter depuis le modĂšle" msgid "Expense Sheets List" msgstr "Liste des feuilles de dĂ©pense" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:570 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:608 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:573 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:611 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Les ressources affectĂ©es Ă  cette tĂąche vont ĂȘtre supprimĂ©es. Êtes-vous sĂ»r ?" @@ -2196,11 +2231,11 @@ msgstr "Les ressources affectĂ©es Ă  cette tĂąche vont ĂȘtre supprimĂ©es. Êtes- msgid "Filter by month" msgstr "Filtrer par mois" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:153 msgid "The code is not valid. There is another unit type with the same code" msgstr "Le code est incorrect. Il existe un autre type d'unitĂ© avec ce mĂȘme code" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 msgid "Enable LDAP authentication" msgstr "Activer l'authentification LDAP" @@ -2226,7 +2261,7 @@ msgid "Cannot calculate charts for current data" msgstr "Impossible de calculer les graphiques avec les donnĂ©es actuelles" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:172 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1512 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1505 msgid "project name already being used" msgstr "nom de projet dĂ©jĂ  existant" @@ -2249,6 +2284,7 @@ msgstr "le pourcentage doit ĂȘtre unique" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:89 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:212 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:90 @@ -2279,6 +2315,10 @@ msgstr "LibellĂ©" msgid "price cost not specified" msgstr "coĂ»t de prix non indiquĂ©" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:218 +msgid "Task Completation Lead/Lag" +msgstr "Avance/retard d'achĂšvement de la tĂąche" + #: libreplan-webapp/src/main/webapp/users/_editUser.zul:126 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:51 msgid "Association with roles" @@ -2315,7 +2355,7 @@ msgstr "Jours depuis le dĂ©marrage jusqu'Ă  l'Ă©chĂ©ance" msgid "Estimate At Completion" msgstr "Fin EstimĂ©e PlanifiĂ©e" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:266 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:262 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78 msgid "Indirect" msgstr "Indirect" @@ -2328,14 +2368,18 @@ msgstr "La date de dĂ©but de l'affectation de coĂ»t non indiquĂ©e" msgid "No tasks available yet" msgstr "Aucune tĂąche disponible maintenant" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1200 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:76 +msgid "Output format:" +msgstr "Format de sortie:" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1199 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:77 msgid "Direct" msgstr "Direct" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:822 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:823 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86 @@ -2362,12 +2406,12 @@ msgstr "Semaine de travail" msgid "Please select a source scenario" msgstr "Merci de sĂ©lection un scĂ©nario source" -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47 msgid "Company ID" msgstr "ID de la compagnie" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1589 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582 msgid "" "It will only be possible to add an end date if all the exiting ones in the " "table have already been sent to the customer." @@ -2383,8 +2427,8 @@ msgstr "SĂ©quences d'entitĂ©" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:768 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:679 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 msgid "must be after start date" msgstr "doit ĂȘtre postĂ©rieure Ă  la date de dĂ©part" @@ -2403,7 +2447,7 @@ msgstr "Retard depuis le dĂ©but (en jours)" msgid "Total Hours" msgstr "Total des heures" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:389 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:398 msgid "LibrePlan Role" msgstr "RĂŽle de LibrePlan" @@ -2411,24 +2455,20 @@ msgstr "RĂŽle de LibrePlan" msgid "Must start after (days since project start)" msgstr "Doit dĂ©marrer aprĂšs (jours depuis le dĂ©marrage du projet)" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 -msgid "Create Progress Type" -msgstr "CrĂ©er le type d'avancement" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:129 msgid "Confirm cancel" msgstr "Confirmer l'annulation" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:468 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:470 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:39 msgid "Work And Progress Per Task" msgstr "Travail et avancement par tĂąche" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1536 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1529 msgid "project code already being used" msgstr "le code projet est dĂ©jĂ  utilisĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:186 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:191 msgid "The {0} sequence prefixes cannot be repeated" msgstr "Les prĂ©fixes de sĂ©quence {0} ne peuvent pas ĂȘtre rĂ©pĂ©tĂ©s" @@ -2440,15 +2480,15 @@ msgstr "type non indiquĂ©" msgid "WBS (tasks)" msgstr "WBS (tĂąches)" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:712 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:713 msgid "Deleting sequence" msgstr "SĂ©quence de suppression" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:104 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:104 msgid "Total extra" msgstr "Total des extra" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:432 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:439 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:72 msgid "Received From Customers" msgstr "Reçu des clients" @@ -2465,7 +2505,7 @@ msgstr "LibrePlan: Canevas" msgid "Edit Virtual Workers Group: {0}" msgstr "Modifier le groupe virtuel des participants: {0}" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:88 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:88 msgid "Total other" msgstr "Total autre" @@ -2481,12 +2521,12 @@ msgstr "LibrePlan: DĂ©penses" msgid "Maximum/minimum of worked hours in finished applications" msgstr "Maximum/minimum d'heures travaillĂ©es dans les applications finies" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:331 msgid "Scheduling saved" msgstr "PrĂ©vision enregistrĂ©e" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:708 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:854 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:710 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851 msgid "" "You can not remove the project \"{0}\" because this one has imputed expense " "sheets." @@ -2548,7 +2588,7 @@ msgstr "LibrePlan: compagnies" msgid "Queue-based" msgstr "En file" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:303 msgid "Derived of calendar {0}" msgstr "DĂ©rivĂ© du calendrier {0}" @@ -2557,7 +2597,7 @@ msgstr "DĂ©rivĂ© du calendrier {0}" msgid "Deliver date" msgstr "Date de livraison" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:232 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:235 msgid "" "Days Interval (Calculated as task completion end date minus estimated end " "date)" @@ -2587,11 +2627,11 @@ msgstr "Compagnie externe" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:68 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:32 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:34 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:140 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:162 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:160 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:61 -#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:27 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:28 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 #: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:30 @@ -2606,7 +2646,7 @@ msgstr "Exceptions" msgid "User settings" msgstr "RĂ©glages utilisateur" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:800 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:801 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:110 msgid "Start hour" msgstr "Heure de dĂ©but" @@ -2630,7 +2670,7 @@ msgstr "les filtres de format ne sont pas corrects" msgid "LibrePlan: Project Costs" msgstr "LibrePlan: CoĂ»ts des projets" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:294 msgid "Set Code as autogenerated to create a new project from templates" msgstr "RĂ©gler le code comme auto gĂ©nĂ©rĂ© pour crĂ©er un nouveau projet Ă  partir des canevas" @@ -2647,11 +2687,11 @@ msgstr "Utilisateur liĂ©" msgid "Unallocated name" msgstr "Nom non allouĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1129 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1133 msgid "Move up" msgstr "Monter" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:281 msgid "Password cannot be empty" msgstr "Le mot de passe ne peut pas ĂȘtre vide" @@ -2673,7 +2713,7 @@ msgstr "CrĂ©er {0}" msgid "Already exists another template with the same name" msgstr "Il existe dĂ©jĂ  un autre canevas possĂ©dant le mĂȘme nom" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:220 msgid "Unlimited" msgstr "IllimitĂ©" @@ -2693,15 +2733,15 @@ msgstr "Page prĂ©cĂ©dente" msgid "Create new project" msgstr "CrĂ©er un nouveau projet" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:766 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:767 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:362 msgid "date in the future" msgstr "date dans le futur" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1063 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1077 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:57 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:56 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:104 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 @@ -2716,7 +2756,7 @@ msgstr "Doit dĂ©buter aprĂšs" msgid "Fully, Partially or Unscheduled. (Drag and drop to move tasks)" msgstr "Totalement, partiellement ou non programmĂ©. (Drap'n'drop pour dĂ©placer les tĂąches)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1315 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1312 msgid "Confirm change" msgstr "Confirmer la modification" @@ -2735,19 +2775,19 @@ msgstr "Code dĂ©jĂ  inclus dans les codes de groupe d'heures" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:303 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:524 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:531 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:47 msgid "Planning" msgstr "Calendrier" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:367 msgid "" "The task has got progress consolidations. To change resource allocation type" " all consolidations must be removed before" msgstr "La tĂąche possĂšde des consolidations d'avancement. Pour modifier le type d'allocation de ressources, toutes les consolidations doivent ĂȘtre supprimĂ©es au prĂ©alable" #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:199 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:207 msgid "Send" msgstr "EnvoyĂ©" @@ -2764,7 +2804,7 @@ msgstr "LibrePlan: MatĂ©riel" msgid "New task" msgstr "Nouvelle tĂąche" -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:31 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 msgid "Associated user" msgstr "Utilisateur associĂ©" @@ -2772,7 +2812,7 @@ msgstr "Utilisateur associĂ©" msgid "Type name" msgstr "Nom de type" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:250 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:728 @@ -2788,7 +2828,7 @@ msgstr "Tous" msgid "Progress assignment" msgstr "Affectation d'avancement" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:461 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77 msgid "Manual" msgstr "Manuel" @@ -2797,7 +2837,7 @@ msgstr "Manuel" msgid "You cannot remove the default scenario \"{0}\"" msgstr "Vous ne pouvez pas supprimer le scĂ©nario par dĂ©faut \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:176 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:179 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:36 msgid "On schedule" msgstr "Conforme Ă  la prĂ©vision" @@ -2818,14 +2858,14 @@ msgstr "DĂ©tails personnels" msgid "Workers List" msgstr "Liste des participants" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1198 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1197 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229 msgid "Inherited" msgstr "HĂ©ritĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:519 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:597 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" @@ -2851,7 +2891,7 @@ msgstr "Utilisateur dĂ©jĂ  liĂ© Ă  un autre travailleur" msgid "criterion name not specified" msgstr "le nom du critĂšre n'est pas indiquĂ©" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:154 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:167 msgid "port not specified" msgstr "port non indiquĂ©" @@ -2863,18 +2903,25 @@ msgstr "calendrier non indiquĂ©" msgid "Start hour cannot be greater than finish hour" msgstr "L'heure de dĂ©but ne peut pas ĂȘtre postĂ©rieure Ă  l'heure de fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:504 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:511 msgid "Preferences" msgstr "PrĂ©fĂ©rences" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 -msgid "Role property" -msgstr "PropriĂ©tĂ© du rĂŽle" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:680 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:689 +msgid "" +"There are unsaved changes in the current personal timesheet, please save " +"before moving" +msgstr "Il y a des modifications non enregistrĂ©es dans la feuille de temps personnelle actuelle, merci de les enregistrer avant de poursuivre" #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25 msgid "Manual allocation" msgstr "Affectation manuelle" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 +msgid "Role property" +msgstr "PropriĂ©tĂ© du rĂŽle" + #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java:75 msgid "progress type not specified" msgstr "type d'avancement non indiquĂ©" @@ -2904,7 +2951,7 @@ msgstr "La mĂ©trique d'avancement ne peut pas ĂȘtre supprimĂ©e. La mĂ©trique d'a msgid "Recommended allocation" msgstr "Affectation recommandĂ©e" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:267 msgid "Activation" msgstr "Activation" @@ -2916,7 +2963,7 @@ msgstr "L'avancement calculĂ© ne peut pas ĂȘtre supprimĂ©" msgid "Materials saved" msgstr "MatĂ©riel enregistrĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:456 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:458 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:39 msgid "Total Worked Hours By Resource In A Month" msgstr "Total des heures travaillĂ©es par ressource et par mois" @@ -2925,7 +2972,7 @@ msgstr "Total des heures travaillĂ©es par ressource et par mois" msgid "LibrePlan: Access Forbidden" msgstr "LibrePlan: accĂšs interdit" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:684 msgid "Other projects" msgstr "Autres projets" @@ -2945,11 +2992,11 @@ msgstr "Le code ne peut pas ĂȘtre vide" msgid "Template cannot be removed because it has applications" msgstr "Le canevas ne peut pas ĂȘtre supprimĂ© car il possĂšde des applications" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:182 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:187 msgid "At least one {0} sequence must be active" msgstr "Au moins une sĂ©quence {0} doit ĂȘtre active" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:161 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:159 #: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2964,12 +3011,12 @@ msgstr "satisfaction de critĂšre avec une date de fin antĂ©rieure Ă  la date de msgid "Disable Delete" msgstr "DĂ©sactiver la suppression" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:474 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:476 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:39 msgid "Estimated/Planned Hours Per Task" msgstr "Heures estimĂ©es/planifiĂ©es par tĂąche" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:177 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:182 msgid "At least one {0} sequence is needed" msgstr "Au moins une sĂ©quence {0} est nĂ©cessaire" @@ -2981,11 +3028,11 @@ msgstr "LibrePlan: CatĂ©gories de coĂ»t" msgid "Assigned" msgstr "AffectĂ©" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:96 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:96 msgid "Total capacity" msgstr "CapacitĂ© totale" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 msgid "Use LDAP roles" msgstr "Utiliser les rĂŽles LDAP" @@ -3004,6 +3051,10 @@ msgstr "Erreur: {0}" msgid "More options" msgstr "Plus d'options" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:21 +msgid "LibrePlan: Personal timesheet" +msgstr "LibrePlan: feuille de temps personnelle" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:244 msgid "Confirm create template" msgstr "Confirmer la crĂ©ation du modĂšle" @@ -3016,17 +3067,11 @@ msgstr "Volume de travail" msgid "Parent" msgstr "Parent" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36 -msgid "" -"Password cannot be managed for LDAP users because LDAP authentication is " -"being used" -msgstr "Le mot de passe ne peut pas ĂȘtre gĂ©rĂ© pour les utilisateurs LDAP car l'authentification LDAP est actuellement utilisĂ©e" - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:91 msgid "Earliest date" msgstr "Date au plus tĂŽt" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:506 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:513 msgid "Change Password" msgstr "Modifier le mot de passe" @@ -3039,8 +3084,8 @@ msgstr "LibrePlan: Travail et avancement par tĂąche" msgid "Projects" msgstr "Projets" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1070 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:238 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1072 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:235 msgid "Confirm exit dialog" msgstr "Confirmer la fenĂȘtre de sortie" @@ -3062,14 +3107,14 @@ msgstr "Code de sous-traitance" msgid "Material assignments" msgstr "Affectation de matĂ©riel" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:102 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:101 msgid "last value not specified" msgstr "derniĂšre valeur non indiquĂ©e" #: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:110 #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:176 #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:72 -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:120 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:121 msgid "task not specified" msgstr "tĂąche non indiquĂ©e" @@ -3077,6 +3122,12 @@ msgstr "tĂąche non indiquĂ©e" msgid "Change password" msgstr "Modifier le mot de passe" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:38 +msgid "" +"Password cannot be managed for LDAP users because LDAP authentication is " +"enabled." +msgstr "Le mot de passe ne peut pas ĂȘtre gĂ©rĂ© pour les utilisateurs LDAP car l'authentification LDAP est activĂ©e." + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1306 msgid "" "Progress measurement cannot be canged to {0}, because it is consolidated" @@ -3090,7 +3141,7 @@ msgstr "Champ texte" msgid "Question" msgstr "Question" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:135 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:133 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" @@ -3143,7 +3194,7 @@ msgstr "le type de ressource n'autorise pas le critĂšre activĂ©" msgid "Please, select a destination scenario" msgstr "Merci de choisir un scĂ©nario de destination" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1061 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1063 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:126 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 @@ -3161,9 +3212,9 @@ msgstr "Merci de choisir un scĂ©nario de destination" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: libreplan-webapp/src/main/webapp/planner/order.zul:131 #: libreplan-webapp/src/main/webapp/planner/order.zul:166 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:189 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:187 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:129 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:142 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:139 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:74 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 @@ -3177,11 +3228,11 @@ msgstr "Merci de choisir un scĂ©nario de destination" #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:81 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:402 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:411 msgid "Cancel" msgstr "Annuler" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:39 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36 msgid "General user data" msgstr "DonnĂ©es gĂ©nĂ©rales utilisateur" @@ -3189,7 +3240,7 @@ msgstr "DonnĂ©es gĂ©nĂ©rales utilisateur" msgid "Unschedule" msgstr "DĂ©programmĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:227 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:216 msgid "Subcontracted task sent successfully" msgstr "TĂąche sous-traitĂ©e envoyĂ©e correctement" @@ -3197,17 +3248,13 @@ msgstr "TĂąche sous-traitĂ©e envoyĂ©e correctement" msgid "Accumulated hours chart" msgstr "Graphique cumulatif des heures" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:70 -msgid "EAC (Estimate At Completion)" -msgstr "EAA (Estimation Ă  l'achĂšvement)" - #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:22 msgid "Machines List" msgstr "Liste des machines" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:325 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:694 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:691 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:904 msgid "You don't have read access to this project" msgstr "Vous n'avez pas les droits en consultation pour ce projet" @@ -3258,7 +3305,7 @@ msgstr "valeur de description: il manque certains champs de description sur la f msgid "Create new Workweek" msgstr "CrĂ©er une nouvelle semaine de travail" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:103 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:112 msgid "Autocomplete login form" msgstr "AutocomplĂ©tion du formulaire de connexion" @@ -3294,11 +3341,11 @@ msgstr "{0} (max: {1})" msgid "Cost Category" msgstr "CatĂ©gorie de coĂ»t" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:490 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:492 msgid "end" msgstr "fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:373 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:382 msgid "Role search query" msgstr "RequĂȘte de recherche de rĂŽle" @@ -3331,7 +3378,7 @@ msgstr "Modifier la tĂąche {0}" msgid "LibrePlan: Timesheets" msgstr "LibrePlan: feuille de temps" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:216 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:231 msgid "username is already being used by another user" msgstr "ce nom d'utilisateur est dĂ©jĂ  utilisĂ© par un autre utilisateur" @@ -3339,8 +3386,8 @@ msgstr "ce nom d'utilisateur est dĂ©jĂ  utilisĂ© par un autre utilisateur" msgid "references" msgstr "rĂ©fĂ©rences" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:149 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1575 msgid "You must select a valid date. " msgstr "Vous devez choisir une date valide." @@ -3376,7 +3423,7 @@ msgstr "Ajouter une exigence de critĂšre" msgid "Percentage of estimated budget hours / hours consumed" msgstr "Pourcentage des heures estimĂ©es du budget / heures consommĂ©es" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:500 msgid "Automatic" msgstr "Automatique" @@ -3384,14 +3431,13 @@ msgstr "Automatique" msgid "Criterion Name" msgstr "Nom du critĂšre" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:768 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:561 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:769 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:563 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:127 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:167 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:146 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 @@ -3411,11 +3457,11 @@ msgstr "LibrePlan: modifier le mot de passe" msgid "please, select a label" msgstr "Merci de choisir un libellĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:57 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:58 msgid "Expected" msgstr "Attendu" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 msgid "Add profile" msgstr "Ajouter un profil" @@ -3449,7 +3495,7 @@ msgstr "valeurs incorrectes, les valeurs ne peuvent pas ĂȘtre nulles" msgid "Apply changes and go back to scheduling" msgstr "Appliquer les modifications et revenir Ă  la prĂ©vision" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:42 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:60 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36 msgid "Spreading progress" msgstr "Avancement Ă©tendu" @@ -3466,9 +3512,11 @@ msgid "cost assignment's resource not specified" msgstr "La ressource d'affectation de coĂ»t n'est pas indiquĂ©e" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1091 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:557 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:559 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:66 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:40 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:51 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:47 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:31 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 @@ -3476,7 +3524,7 @@ msgstr "La ressource d'affectation de coĂ»t n'est pas indiquĂ©e" msgid "Project" msgstr "Projet" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:374 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:371 msgid "" "Starting date cannot be empty because there is a task with constraint \"as " "soon as possible\"" @@ -3492,7 +3540,7 @@ msgid "" "already been reported to the customer" msgstr "L'affectation d'avancement ne peut pas ĂȘtre supprimĂ©e car elle possĂšde des mesures d'avancement qui ont dĂ©jĂ  Ă©tĂ© rapportĂ©es au client" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:376 msgid "Extra" msgstr "Extra" @@ -3500,7 +3548,7 @@ msgstr "Extra" msgid "Unassigned" msgstr "Non affectĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1594 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1587 msgid "It already exists a end date with the same date. " msgstr "il existe dĂ©jĂ  une date de fin Ă  cette date lĂ ." @@ -3524,17 +3572,13 @@ msgstr "modifier le mot de passe" msgid "label code is already being used" msgstr "le code d'Ă©tiquette a dĂ©jĂ  Ă©tĂ© utilisĂ©" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 -msgid "Hours type for monthly timesheets" -msgstr "Le type d'heures pour les feuilles de temps mensuelles" - #: libreplan-webapp/src/main/webapp/materials/materials.zul:87 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:78 msgid "Disabled" msgstr "DĂ©sactivĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:707 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:708 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324 msgid "Earned value" msgstr "Valeur gagnĂ©e" @@ -3548,7 +3592,7 @@ msgstr "Effort en heures supplĂ©mentaires" msgid "Inherited from parent calendar" msgstr "HĂ©ritĂ© du calendrier parent" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:338 msgid "You do not have permissions to edit this timesheet" msgstr "Vous n'avez pas les permissions pour modifier cette feuille de temps" @@ -3569,15 +3613,15 @@ msgid "" msgstr "Les modĂšles ne peuvent ĂȘtre créés qu'Ă  partir de tĂąches existantes. Vous essayez de crĂ©er un modĂšle Ă  partir d'une nouvelle tĂąche.\nMerci d'enregistrer votre projet avant de continuer." #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:33 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:33 msgid "Total work" msgstr "Travail total" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1432 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1445 msgid "a quality form cannot be assigned twice to the same task" msgstr "un formulaire qualitĂ© ne peut ĂȘtre affectĂ© deux fois Ă  la mĂȘme tĂąche" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:146 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:145 msgid "number of digits out of range" msgstr "nombre de chiffres hors limites" @@ -3591,7 +3635,7 @@ msgstr "Ces codes de lignes de feuille de temps doivent ĂȘtre uniques" msgid "Calendar Exception Days" msgstr "Jours exceptionnels du calendrier" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:115 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:114 msgid "Time tracking" msgstr "Suivi du temps" @@ -3601,19 +3645,11 @@ msgid "" " review it or click in the following link in order to go to initial page: " msgstr "si vous avez entrĂ© l'URL directement dans la barre de navigation du navigateur, merci de la vĂ©rifier ou cliquez sur le lien suivant de façon Ă  aller Ă  la page initiale:" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1267 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1282 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1296 msgid "{0} not supported yet" msgstr "{0} pas gĂ©rĂ© actuellement" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:151 -msgid "Total tasks" -msgstr "Total des tĂąches" - -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:84 -msgid "Total monthly timesheet" -msgstr "Total de la feuille de temps mensuelle" - #: libreplan-webapp/src/main/webapp/common/layout/login.zul:144 msgid "is not supported for its use with LibrePlan." msgstr "n'est pas gĂ©rĂ© pour cette utilisation avec LibrePlan." @@ -3630,11 +3666,11 @@ msgstr "Nouvelle entrĂ©e" msgid "Resources Load" msgstr "Chargement des ressources" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:174 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:187 msgid "userId not specified" msgstr "identifiant utilisateur non indiquĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:226 msgid "Changes have been canceled" msgstr "Les modifications ont Ă©tĂ© annulĂ©es" @@ -3642,11 +3678,11 @@ msgstr "Les modifications ont Ă©tĂ© annulĂ©es" msgid "LibrePlan: Planning" msgstr "LibrePlan: Calendrier" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:188 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:197 msgid "Expense sheets" msgstr "Feuilles de dĂ©penses" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:316 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:325 msgid "Authentication" msgstr "Authentification" @@ -3684,9 +3720,9 @@ msgstr "Filtrer par critĂšre" msgid "Max value" msgstr "Valeur max" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:100 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:101 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:374 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "No" msgstr "Non" @@ -3720,11 +3756,11 @@ msgstr "PĂ©riode" msgid "Spread" msgstr "Diffuser" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:974 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:978 msgid "Disabled because of it contains more than one hours group" msgstr "DĂ©sactivĂ© car il contient plus d'un groupe d'heures" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:312 msgid "Confirm remove user" msgstr "Confirmer la suppression de l'utilisateur" @@ -3732,7 +3768,7 @@ msgstr "Confirmer la suppression de l'utilisateur" msgid "Select start date" msgstr "Choisir une date de dĂ©but" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882 msgid "Removed {0}" msgstr "{0} supprimĂ©" @@ -3776,7 +3812,7 @@ msgstr "La mĂȘme ressource est affectĂ©e deux fois Ă  l'intĂ©rieur d'un interval msgid "Value is not valid, the precision value must not be empty" msgstr "La valeur n'est pas correcte," -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:831 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:472 msgid "h" msgstr "h" @@ -3817,7 +3853,7 @@ msgstr "initialisation" msgid "Add new progress measurement" msgstr "Ajouter une nouvelle mesure d'avancement" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:532 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:530 msgid "Select for automatic queuing" msgstr "SĂ©lectionner la mise en queue automatique" @@ -3833,7 +3869,7 @@ msgstr "CrĂ©er et affecter" msgid "Calculated progress measurements cannot be removed" msgstr "Les mesures d'avancement calculĂ©es ne peuvent pas ĂȘtre supprimĂ©es" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1558 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 msgid "Not configurable" msgstr "Non configurable" @@ -3845,17 +3881,17 @@ msgstr "feuille de temps non indiquĂ©e" msgid "The length must be greater than 0 and not empty" msgstr "La longueur doit ĂȘtre supĂ©rieure Ă  0 et non vide" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:280 msgid "Task Status" msgstr "Etat de la tĂąche" -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:31 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:33 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:97 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 msgid "Bound resource" msgstr "Ressource liĂ©e" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:178 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 msgid "Calendar exception days" msgstr "Jours exceptionnels du calendrier" @@ -3863,7 +3899,7 @@ msgstr "Jours exceptionnels du calendrier" msgid "Advanced allocation" msgstr "Allocation avancĂ©e" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:243 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:246 msgid "Estimation deviation on completed tasks" msgstr "DĂ©viation d'estimation sur les tĂąches complĂ©tĂ©es" @@ -3873,7 +3909,7 @@ msgstr "DĂ©viation d'estimation sur les tĂąches complĂ©tĂ©es" msgid "Consolidated" msgstr "ConsolidĂ©" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:200 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 msgid "MonteCarlo method" msgstr "MĂ©thode MonteCarlo" @@ -3899,9 +3935,8 @@ msgstr "LibrePlan: accĂšs utilisateur" msgid "Customer" msgstr "Client" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:814 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:815 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:116 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:149 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 msgid "Hours type" msgstr "Type d'heures" @@ -3920,11 +3955,11 @@ msgid "" "the Main Settings window before." msgstr "Le calendrier par dĂ©faut ne peut pas ĂȘtre supprimĂ©. Merci de modifier avant le calendrier par dĂ©faut dans la fenĂȘtre des rĂ©glages principaux." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:257 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:258 msgid "Cannot connect to LDAP server" msgstr "Impossible de se connecter au serveur LDAP" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1520 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1521 msgid "must be before end date" msgstr "doit ĂȘtre antĂ©rieure Ă  la date de fin" @@ -3932,9 +3967,11 @@ msgstr "doit ĂȘtre antĂ©rieure Ă  la date de fin" msgid "Add Exception" msgstr "Ajouter une exception" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:128 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:148 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:310 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:193 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:197 @@ -3951,6 +3988,7 @@ msgstr "Ajouter une exception" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:413 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:438 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:952 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:144 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:148 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:205 @@ -3960,9 +3998,9 @@ msgstr "Ajouter une exception" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:999 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1189 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1446 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:998 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1188 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1445 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:236 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:348 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:357 @@ -3980,10 +4018,10 @@ msgstr "Ajouter une exception" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:126 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:394 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1505 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1529 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1498 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1522 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:749 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:750 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89 @@ -4027,7 +4065,7 @@ msgid "Effort must be greater than zero" msgstr "L'effort doit ĂȘtre supĂ©rieur Ă  zĂ©ro" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:50 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:55 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27 msgid "from" @@ -4080,8 +4118,8 @@ msgstr "Enregistrer le projet" msgid "Day is not valid" msgstr "Le jour n'est pas valide" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:628 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1263 msgid "You should select a start date for the exception" msgstr "Vous pouvez choisir une date de dĂ©but pour l'exception" @@ -4109,7 +4147,7 @@ msgstr "LibrePlan: UnitĂ©s de matĂ©riel" msgid "Virtual resources cannot be bound to any user" msgstr "Les ressources virtuelles ne peuvent pas ĂȘtre liĂ©es Ă  un quelconque utilisateur" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:497 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:498 msgid "Code sequence is already in use and cannot be updated" msgstr "SĂ©quence de code dĂ©jĂ  utilisĂ©e et impossible Ă  mettre Ă  jour" @@ -4126,7 +4164,7 @@ msgid "effort not specified" msgstr "effort non indiquĂ©" #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:927 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:374 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46 @@ -4141,7 +4179,7 @@ msgstr "effort non indiquĂ©" #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 @@ -4223,7 +4261,7 @@ msgstr "Secondes" msgid "please, select an item" msgstr "Merci de sĂ©lectionner un Ă©lĂ©ment" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1146 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1159 msgid "a label can not be assigned twice in the same branch" msgstr "une Ă©tiquette ne peut pas ĂȘtre affectĂ©e deux fois dans la mĂȘme branche" @@ -4235,11 +4273,11 @@ msgstr "Jour de la semaine" msgid "Companies List" msgstr "Liste des compagnies" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:437 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:440 msgid "Normal resource assignment" msgstr "Affectation normale de ressource" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:119 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:132 msgid "default calendar not specified" msgstr "calendrier par dĂ©faut non indiquĂ©" @@ -4247,11 +4285,11 @@ msgstr "calendrier par dĂ©faut non indiquĂ©" msgid "indirect progress assignments should have different types" msgstr "Les affectations d'avancement indirectes doivent avoir diffĂ©rents types" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1462 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1459 msgid "Stretches with Interpolation" msgstr "Extensions avec interpolation" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:449 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:451 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:39 msgid "Hours Worked Per Resource" msgstr "Heures travaillĂ©es par ressource" @@ -4260,21 +4298,16 @@ msgstr "Heures travaillĂ©es par ressource" msgid "material not specified" msgstr "matĂ©riel non indiquĂ©" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:149 -msgid "" -"Profiles of LDAP users cannot be managed because LDAP roles are being used." -msgstr "Le profil des utilisateurs LDAP ne peut pas ĂȘtre gĂ©rĂ© car les rĂŽles LDAP sont actuellement utilisĂ©s." - #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 msgid "Category name" msgstr "Nom de catĂ©gorie" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:754 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:755 msgid "Date must be inside visualization area" msgstr "La date doit ĂȘtre comprise dans la zone de visualisation" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:124 msgid "Show a notification when new LibrePlan versions are released" msgstr "Afficher une notification quand une nouvelle version de LibrePlan est disponible" @@ -4290,7 +4323,7 @@ msgstr "MonteCarlo" msgid "Duration" msgstr "DurĂ©e" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:594 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593 msgid "Exception: {0}" msgstr "Exception: {0}" @@ -4330,11 +4363,6 @@ msgstr "Connecter" msgid "Concept" msgstr "Concept" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 -msgid "" -"Roles of LDAP users cannot be managed because LDAP roles are being used." -msgstr "Le rĂŽle des utilisateurs LDAP ne peut pas ĂȘtre gĂ©rĂ© car les rĂŽles LDAP sont actuellement utilisĂ©s." - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223 msgid "Allocation: [{0},{1}]" msgstr "Allocation: [{0},{1}]" @@ -4343,11 +4371,11 @@ msgstr "Allocation: [{0},{1}]" msgid "Virtual Workers Group" msgstr "Groupe de participants virtuels" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:209 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:210 msgid "Changes saved" msgstr "Modifications enregistrĂ©es" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1268 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1261 msgid "See scheduling" msgstr "Voir la prĂ©vision" @@ -4372,7 +4400,7 @@ msgid "Relationship" msgstr "Relation" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:439 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:442 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:69 msgid "Subcontract" msgstr "Sous-contrat" @@ -4383,26 +4411,22 @@ msgstr "Sous-contrat" msgid "End" msgstr "Fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:480 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:482 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:39 msgid "Project Costs" msgstr "CoĂ»ts du projet" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:531 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:382 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:63 msgid "Cost Categories" msgstr "CatĂ©gories de coĂ»t" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:313 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:582 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:586 msgid "Other" msgstr "Autre" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:37 -msgid "CV (Cost Variance)" -msgstr "VC (Variance de CoĂ»t)" - #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313 msgid "criterion type not specified" msgstr "type de critĂšre non indiquĂ©" @@ -4415,10 +4439,6 @@ msgstr "prix par dĂ©faut non indiquĂ©" msgid "timesheet template not specified" msgstr "canevas de feuille de temps non indiquĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:352 -msgid "LDAP" -msgstr "LDAP" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:216 msgid "Timesheet removed successfully" msgstr "Feuille de temps supprimĂ©e avec succĂšs" @@ -4427,10 +4447,6 @@ msgstr "Feuille de temps supprimĂ©e avec succĂšs" msgid "Users List" msgstr "Liste des utilisateurs" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:47 -msgid "CPI (Cost Performance Index)" -msgstr "ICP (Index CoĂ»t Performance)" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 @@ -4467,7 +4483,7 @@ msgid "Progress Types" msgstr "Types d'avancement" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:184 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:193 msgid "Cost category" msgstr "CatĂ©gorie de coĂ»t" @@ -4475,7 +4491,7 @@ msgstr "CatĂ©gorie de coĂ»t" msgid "Quality form cannot be removed as it is spreading progress" msgstr "Le formulaire de qualitĂ© ne peut pas ĂȘtre supprimĂ© car il propage l'avancement" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:711 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:712 msgid "It can not be deleted. At least one sequence is necessary." msgstr "Il ne peut pas ĂȘtre supprimĂ©. Au moins une sĂ©quence est nĂ©cessaire." @@ -4521,7 +4537,7 @@ msgstr "Code de rĂ©fĂ©rence du client" msgid "Constraint" msgstr "Contrainte" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:393 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:390 msgid "" "Deadline cannot be empty because there is a task with constraint \"as late " "as possible\"" @@ -4542,21 +4558,21 @@ msgid "Customer reference" msgstr "RĂ©fĂ©rence du client" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:366 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:369 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:709 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:160 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:316 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:692 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:838 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:896 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:905 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:932 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:331 msgid "Information" msgstr "Information" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931 msgid "Sorry, you do not have permissions to access this project" msgstr "DĂ©solĂ©, vous n'avez pas les droits pour accĂ©der Ă  ce projet" @@ -4576,7 +4592,7 @@ msgstr "Communications aux sous-traitants" msgid "New hours group " msgstr "Nouveau groupe d'heures" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:462 msgid "Assign element to queue manually" msgstr "Assigner l'Ă©lĂ©ment Ă  la file manuellement" @@ -4677,7 +4693,7 @@ msgstr "Les Ă©lĂ©ments ne peuvent pas ĂȘtre vĂ©rifiĂ©s tant que les Ă©lĂ©ments p msgid "Code " msgstr "Code " -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:595 msgid "Exception: {0} (Inh)" msgstr "Exception: {0} (HĂ©r)" @@ -4696,7 +4712,7 @@ msgid "Regular" msgstr "RĂ©gulier" #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:79 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:88 msgid "Show progress" msgstr "Afficher l'avancement" @@ -4714,16 +4730,17 @@ msgstr "Erreur lors de l'enregistrement du projet\n{0}" msgid "LibrePlan: Machines" msgstr "LibrePlan: Machines" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:86 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:87 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:117 msgid "{0} h" msgstr "{0} h" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:343 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:350 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1302 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:628 msgid "Error" msgstr "Erreur" @@ -4785,7 +4802,7 @@ msgstr "Il existe un autre canevas de feuille de temps possĂ©dant le mĂȘme nom" msgid "SPREAD" msgstr "ETENDU" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:709 msgid "Changes applied" msgstr "Modifications appliquĂ©es" @@ -4797,13 +4814,13 @@ msgstr "PrĂ©vision BudgĂ©tĂ©e de CoĂ»t Travail" msgid "criterion type does not allow hierarchy" msgstr "le type de critĂšre ne permet pas la hiĂ©rarchisation" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:62 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:66 msgid "Project closing previsions" msgstr "PrĂ©visions de fermeture du projet" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:164 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:186 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:173 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:58 msgid "Material Units" msgstr "UnitĂ©s de matĂ©riel" @@ -4826,7 +4843,7 @@ msgstr "Configuration LDAP" msgid "progress type should must be defined if quality form reports progress" msgstr "le type d'avancement doit ĂȘtre dĂ©fini si le formulaire qualitĂ© signale un avancement" -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35 msgid "Superuser" msgstr "Super utilisateur" @@ -4856,18 +4873,18 @@ msgid "Cost Variance" msgstr "Variance de coĂ»t" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:253 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:590 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:594 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:92 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:33 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:92 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:182 msgid "Total" msgstr "Total" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:396 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:403 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:66 msgid "User Accounts" msgstr "Comptes utilisateurs" @@ -4877,7 +4894,7 @@ msgstr "Comptes utilisateurs" msgid "Invalidate" msgstr "Invalider" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:285 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:310 msgid "" "User is bound to resource \"{0}\" and it will be unbound. Do you want to " "continue with user removal?" @@ -4887,10 +4904,6 @@ msgstr "L'utilisateur est liĂ© Ă  la ressource \"{0}\" et il va ĂȘtre dĂ©liĂ©. V msgid "Budget hours" msgstr "BudgĂ©tiser les heures" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 -msgid "Go to monthly timesheet" -msgstr "Aller Ă  la feuille de temps mensuelle" - #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:78 msgid "percentage not specified" msgstr "pourcentage non indiquĂ©" @@ -4899,7 +4912,7 @@ msgstr "pourcentage non indiquĂ©" msgid "Edit task: {0}" msgstr "Modifier la tĂąche: {0}" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:120 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 msgid "" "Check this option if you would like to send feedback to LibrePlan developers" " about program usage" @@ -4926,8 +4939,8 @@ msgstr "ne peut pas ĂȘtre vide ou infĂ©rieur Ă  zĂ©ro" msgid "Check consolidated progresses" msgstr "ContrĂŽler les avancements consolidĂ©s" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:308 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:290 msgid "Update task end" msgstr "Mise Ă  jour de la fin de la tĂąche" @@ -4953,7 +4966,7 @@ msgid "Apply tab changes" msgstr "Appliquer les changements d'onglet" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:235 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:260 msgid "passwords don't match" msgstr "les mots de passe ne correspondent pas" @@ -4961,7 +4974,7 @@ msgstr "les mots de passe ne correspondent pas" msgid "Day properties" msgstr "PropriĂ©tĂ©s des jours" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:267 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:271 msgid " (%d tasks)" msgstr "(%d tĂąches)" @@ -4972,16 +4985,20 @@ msgstr "(%d tĂąches)" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:785 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:253 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:695 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1338 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 msgid "must be lower than end date" msgstr "doit ĂȘtre antĂ©rieure Ă  la date de fin" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:120 +msgid "Week {0}" +msgstr "Semaine {0}" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:82 msgid "Hours groups" msgstr "Groupes d'heures" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:107 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:116 msgid "" "Enable/Disable autocomplete property in login form, if the admin password is" " still the default one" @@ -5009,7 +5026,7 @@ msgid "" "progress assignment" msgstr "L'avancement Ă©tendu ne peut ĂȘtre modifiĂ© s'il existe une consolidation dans l'une des affectations d'avancement" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:48 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:63 msgid "By critical path duration" msgstr "DurĂ©e par chemin critique" @@ -5033,7 +5050,7 @@ msgstr "Feuille de temps" msgid "Show dependencies" msgstr "Montrer les dĂ©pendances" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 msgid "Schedule from start to deadline" msgstr "PrĂ©vision du dĂ©but Ă  l'Ă©chĂ©ance" @@ -5081,7 +5098,7 @@ msgid "" "subcontractor company." msgstr "Les valeurs des sous-traitants sont en lecture seule car elles ont Ă©tĂ© rapportĂ©es Ă  l'organisme sous-traitant." -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:162 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:165 msgid "" "There is a margin of %d days with the project global deadline (%.2f %%)." msgstr "Il y a une marge de %d jours avec l'Ă©chĂ©ance globale du projet (%.2f%%)." @@ -5090,7 +5107,7 @@ msgstr "Il y a une marge de %d jours avec l'Ă©chĂ©ance globale du projet (%.2f%% msgid "CV" msgstr "CV" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:513 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:509 #: libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul:35 msgid "My dashboard" msgstr "Mon tableau de bord" @@ -5181,11 +5198,11 @@ msgstr "Enregistrer les modifications" msgid "Application settings" msgstr "RĂ©glages de l'application" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:289 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:298 msgid "Base" msgstr "Base" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:321 msgid "Total dedication" msgstr "Investissement total" @@ -5197,7 +5214,7 @@ msgstr "Choisir la source" msgid "Worker deleted" msgstr "Participant supprimĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:744 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:745 msgid "Select entity, please" msgstr "Merci de choisir une entitĂ©" @@ -5205,7 +5222,7 @@ msgstr "Merci de choisir une entitĂ©" msgid "LibrePlan: Profiles" msgstr "LibrePlan: Profils" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:804 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:805 msgid "Finish Hour" msgstr "Heure de finalisation" @@ -5218,12 +5235,16 @@ msgstr "total non indiquĂ©" msgid "Last expense" msgstr "DerniĂšre dĂ©pense" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 +msgid "Go to personal timesheet" +msgstr "Aller Ă  la feuille de temps personnelle" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:108 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:197 msgid "Day" msgstr "Jour" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:76 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:76 msgid "Timesheet summary" msgstr "RĂ©sumĂ© de la feuille de temps" @@ -5231,41 +5252,40 @@ msgstr "RĂ©sumĂ© de la feuille de temps" msgid "Current password" msgstr "Mot de passe actuel" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:202 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:201 msgid "Only one sequence per entity can be active at the same time." msgstr "Seulement une sĂ©quence par entitĂ© peut ĂȘtre active en mĂȘme temps." -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:915 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1175 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:916 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1176 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:274 msgid "Please, select an item" msgstr " Merci de choisir un Ă©lĂ©ment" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1090 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1091 msgid "Cannot be higher than finish hour" msgstr "Ne peut pas ĂȘtre plus grand que l'heure de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:240 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:230 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:249 msgid "Prefix" msgstr "PrĂ©fixe" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:123 +msgid "{0} 1st fortnight" +msgstr "{0} 1iĂšre quinzaine" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:64 msgid "New Template element" msgstr "Nouvel Ă©lĂ©ment de modĂšle" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:515 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:32 -msgid "Monthly timesheet" -msgstr "Feuille de temps mensuelle" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 msgid "Project: {0}" msgstr "Projet: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:361 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:363 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:144 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:153 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:60 msgid "Timesheets" msgstr "Feuille de temps" @@ -5295,7 +5315,7 @@ msgstr "RĂ©affectation du type" msgid "There are repeated description values in the timesheet " msgstr "Il y a des valeurs de description rĂ©pĂ©tĂ©es dans la feuille de temps" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:190 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:179 msgid "{0} \"{1}\" can not be deleted because of it is being used" msgstr "{0} \"{1}\" ne peut pas ĂȘtre supprimĂ© car il est en cours d'utilisation" @@ -5324,7 +5344,7 @@ msgstr "Authentification incorrecte" msgid "Edit task" msgstr "Modifier la tĂąche" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:95 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:104 msgid "Currency" msgstr "Devise" @@ -5332,8 +5352,9 @@ msgstr "Devise" msgid "End date is not valid, the new end date must be after the start date" msgstr "Date de fin non valide, la nouvelle date de fin doit ĂȘtre postĂ©rieure Ă  la date de dĂ©but" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:444 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:373 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:31 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:73 msgid "Timesheet Lines List" msgstr "Liste des lignes de la feuille de temps" @@ -5383,13 +5404,13 @@ msgstr "DonnĂ©es de profil" msgid "The name of the label is empty." msgstr "Le nom du libellĂ© est vide" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:369 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:366 msgid "Starting date cannot be empty in forward mode" msgstr "La date de dĂ©but ne peut pas ĂȘtre vide en mode prĂ©visionnel" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:413 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:267 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:276 msgid "Configuration" msgstr "Configuration" @@ -5397,7 +5418,7 @@ msgstr "Configuration" msgid "cost category not specified" msgstr "catĂ©gorie de coĂ»t non indiquĂ©e" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:178 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:181 msgid "Violated deadline" msgstr "EchĂ©ance violĂ©e" @@ -5405,7 +5426,7 @@ msgstr "EchĂ©ance violĂ©e" msgid "Delivery dates requested by customer. " msgstr "Dates de livraison demandĂ©es par le client." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:128 msgid "" "Help the project developers to collect information about which LibrePlan " "version you are using" @@ -5415,11 +5436,15 @@ msgstr "Aide les dĂ©veloppeurs du projet pour collecter de l'information sur la msgid "LibrePlan: Workers" msgstr "LibrePlan: Participants" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:64 +msgid "Personal timesheet \"{0}\" saved" +msgstr "Feuille de temps personnelle \"{0}\" enregistrĂ©e" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:719 msgid "Create Virtual Workers Group" msgstr "CrĂ©er un groupe de participants virtuels" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:116 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 msgid "Enable/Disable warning about new LibrePlan versions available" msgstr "Activer/DĂ©sactiver l'avertissement relatif aux nouvelles versions de LibrePlan disponibles" @@ -5429,13 +5454,13 @@ msgid "" "applications" msgstr "les champs d'interaction sont vides et l'organisme est marquĂ© comme interagissant avec des applications" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:174 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:183 msgid "Timesheet templates" msgstr "Canevas de feuille de temps" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1058 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:692 -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1072 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:698 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:42 msgid "Hours invested" msgstr "Heures investies" @@ -5445,7 +5470,7 @@ msgstr "Heures investies" msgid "Templates" msgstr "Canevas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:352 msgid "Authorization" msgstr "Permissions" @@ -5458,7 +5483,7 @@ msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "Le nom est incorrect, il existe un autre type d'avancement possĂ©dant le mĂȘme nom." -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49 msgid "task" msgstr "tĂąche" @@ -5470,6 +5495,12 @@ msgstr "Toutes les modifications seront perdues. Êtes-vous sĂ»r ?" msgid "Sorry for the inconvenience." msgstr "DĂ©solĂ© pour le dĂ©sagrĂ©ment." +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:149 +msgid "" +"Profiles of LDAP users cannot be managed because LDAP is enabled and LDAP " +"roles are being used." +msgstr "Les profils des utilisateurs LDAP ne peuvent pas ĂȘtre gĂ©rĂ©s car LDAP est activĂ© et les rĂŽles LDAP sont utilisĂ©s." + #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:81 msgid "quality form item position not specified" msgstr "position de l'Ă©lĂ©ment du formulaire de qualitĂ© non indiquĂ©" @@ -5479,7 +5510,7 @@ msgstr "position de l'Ă©lĂ©ment du formulaire de qualitĂ© non indiquĂ©" msgid "Machines" msgstr "Machines" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:511 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:507 msgid "My account" msgstr "Mon compte" @@ -5492,7 +5523,7 @@ msgstr "ScĂ©nario destination" msgid "Company view" msgstr "Vue de la compagnie" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:445 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:458 msgid "currency symbol not specified" msgstr "symbole de monnaie non indiquĂ©" @@ -5541,7 +5572,7 @@ msgstr "DonnĂ©e de catĂ©gorie" msgid "Search" msgstr "Chercher" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:107 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:106 msgid "Prefix cannot contain whitespaces" msgstr "Le prĂ©fixe ne peut pas contenir d'espaces blancs" @@ -5595,7 +5626,7 @@ msgstr "Somme des dĂ©penses directes" msgid "Communications From Customers" msgstr "Communications pour les clients" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:760 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:761 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnumByResourceAndCriterion.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 @@ -5606,16 +5637,15 @@ msgstr "Communications pour les clients" #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:171 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:185 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:45 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:100 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:145 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:69 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86 msgid "Resource" msgstr "Ressource" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:71 msgid "Expense sheet \"{0}\" saved" msgstr "Feuille de dĂ©pense \"{0}\" sauvegardĂ©e" @@ -5640,7 +5670,7 @@ msgstr "Date du dernier rapport d'avancement" msgid "Could not load any resource" msgstr "Impossible de charger une quelconque ressource" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:462 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:464 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:39 msgid "Work And Progress Per Project" msgstr "Travail et avancement par projet" @@ -5663,7 +5693,7 @@ msgstr "Fermer" msgid "LibrePlan: Timesheet Lines List" msgstr "LibrePlan: Liste des lignes de feuille de temps" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:957 msgid "Specific Allocations" msgstr "Allocations spĂ©cifiques" @@ -5691,15 +5721,12 @@ msgstr "CrĂ©er une copie" msgid "Company data" msgstr "DonnĂ©es de la compagnie" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151 -msgid "Unit type code cannot be empty" -msgstr "Le code du type d'unitĂ© ne peut pas ĂȘtre vide" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:248 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:273 msgid "Users" msgstr "Utilisateurs" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:418 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/AssignedMachineCriterionsModel.java:401 msgid "The {0} is not valid. Other value exists from the same criterion type" msgstr "Le {0} n'est pas valide. Une autre valeur du mĂȘme type de critĂšre existe" @@ -5720,8 +5747,8 @@ msgstr "le dernier code de sĂ©quence du groupe d'heures n'est pas indiquĂ©" msgid "label type name is already in use" msgstr "le nom de type d'Ă©tiquette est dĂ©jĂ  utilisĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:636 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1272 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:635 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271 msgid "Please, select an End Date for the Exception" msgstr "Merci de choisir une date de fin pour l'exception" @@ -5745,7 +5772,7 @@ msgid "" "completed." msgstr "Un autre utilisateur a modifiĂ© la mĂȘme donnĂ©e, donc l'opĂ©ration ne peut ĂȘtre achevĂ©e en toute sĂ©curitĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1622 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1623 msgid "Please set a date" msgstr "Merci d'indiquer une date" @@ -5754,7 +5781,7 @@ msgstr "Merci d'indiquer une date" msgid "Template saved" msgstr "ModĂšle enregistrĂ©" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:94 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:93 msgid "prefix not specified" msgstr "prĂ©fixe non indiquer" @@ -5807,21 +5834,17 @@ msgstr "Appliquer le filtre Ă  " msgid "Enabled" msgstr "ActivĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1110 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1111 msgid "Please, enter a valid effort" msgstr "Merci de saisir un effort valide" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:519 -msgid "resource has to be bound to a user in monthly timesheets" -msgstr "ressource non liĂ©e Ă  un utilisateur dans les feuilles de temps mensuelles" - #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:321 msgid "" "Quality form should include an item with a value of 100% in order to report " "progress" msgstr "Le formulaire de qualitĂ© doit inclure un Ă©lĂ©ment avec une valeur de 100% de façon Ă  rendre compte de l'avancement" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:125 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:126 msgid "external company not specified" msgstr "organisme extĂ©rieur non indiquĂ©" @@ -5830,7 +5853,7 @@ msgid "Quality form name is already being used" msgstr "Nom de formulaire qualitĂ© dĂ©jĂ  utilisĂ©" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:944 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:366 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:368 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:61 msgid "Timesheets Templates" msgstr "Canevas de feuille de temps" @@ -5851,7 +5874,7 @@ msgstr "Charge due au projet actuel" msgid "length not specified" msgstr "longueur non indiquĂ©e" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:166 msgid "Track time" msgstr "Suivre le temps" @@ -5859,7 +5882,7 @@ msgstr "Suivre le temps" msgid "There must be at least 2 stretches for doing interpolation" msgstr "Il doit y avoir au moins 2 extensions pour faire une interpolation" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:477 msgid "Remove queue-based resource element" msgstr "Supprimer l'Ă©lĂ©ment de ressource en file" @@ -5880,9 +5903,9 @@ msgstr "Format de date incorrect. Merci d'utiliser le format suivant: {0}" #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:187 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:185 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:127 -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:139 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:136 #: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:72 #: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:42 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:186 @@ -5913,7 +5936,11 @@ msgstr "Filtre" msgid "Scheduling mode" msgstr "Mode de prĂ©vision" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java:122 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:78 +msgid "Personal timesheets peridocity" +msgstr "PĂ©riodicitĂ© des feuilles de temps personnelles" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java:121 msgid "a milestone cannot have a task associated" msgstr "un jalon ne peut pas avoir de tĂąche associĂ©e" @@ -5922,7 +5949,7 @@ msgid "" "Invalid value. Precission value must be lower than the Default Max value." msgstr "Valeur invalide. La valeur de prĂ©cision doit ĂȘtre infĂ©rieure Ă  la valeur max par dĂ©faut" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1314 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1311 msgid "Assignment function will be changed. Are you sure?" msgstr "La fonction d'affectation va changer. Êtes-vous sĂ»r ?" @@ -5949,11 +5976,15 @@ msgstr "Date de sous-traitance" msgid "Report progress" msgstr "Avancement du rapport" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:124 +msgid "Progress percentage per progress type" +msgstr "Pourcentage d'avancement par type d'avancement" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:248 msgid "ACWP" msgstr "CRTR" -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:31 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:89 msgid "Authentication type" msgstr "Type d'authentification" @@ -5985,7 +6016,7 @@ msgstr "Retour" msgid "Our company username" msgstr "Notre nom d'utilisateur d'organisme" -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58 msgid "Subcontractor" msgstr "Sous-traitant" @@ -6023,7 +6054,7 @@ msgstr "le projet doit avoir une Ă©chĂ©ance" msgid "last label sequence code not specified" msgstr "le dernier code de sĂ©quence d'Ă©tiquette n'est pas indiquĂ©" -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:31 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:31 msgid "Available hours" msgstr "Heures disponibles" @@ -6050,7 +6081,7 @@ msgstr "Longueur" msgid "Task code" msgstr "Code la tĂąche" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:345 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 msgid "Capacity" @@ -6065,7 +6096,7 @@ msgstr "CrĂ©er une dĂ©rive" msgid "Label Types" msgstr "Types de libellĂ©s" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:637 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:636 msgid "it must be greater than zero" msgstr "il doit ĂȘtre supĂ©rieur Ă  zĂ©ro" @@ -6100,14 +6131,18 @@ msgstr "feuille de dĂ©penses non indiquĂ©e" msgid "LibrePlan: Timesheets Templates" msgstr "LibrePlan: Canevas de feuilles de temps" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1073 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1066 msgid "Create project" msgstr "CrĂ©er le projet" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:64 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:63 msgid "Next" msgstr "Suivant" +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:22 +msgid "Personal timesheets" +msgstr "Feuilles de temps personnelles" + #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:51 msgid "" "Allow multiple values of this type of criterion in the same period of time" @@ -6132,7 +6167,7 @@ msgid "" "present." msgstr "Impossible d'ajouter ces droits Ă  l'utilisateur {0} car il les possĂšde dĂ©jĂ " -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:306 msgid "Root calendar" msgstr "Calendrier source" @@ -6145,7 +6180,7 @@ msgstr "oui" msgid "Select gap" msgstr "Choisir l'Ă©cart" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:291 msgid "Port" msgstr "Port" @@ -6154,7 +6189,6 @@ msgid "Date Finish" msgstr "Date de fin" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:455 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:147 msgid "From" msgstr "Depuis" @@ -6201,7 +6235,7 @@ msgstr "Affectation des catĂ©gories de coĂ»t" msgid "progress type name is already in use" msgstr "ce nom de type d'avancement est dĂ©jĂ  utilisĂ©" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:141 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:140 msgid "number of digits not specified" msgstr "le nombre de chiffres n'est pas indiquĂ©" @@ -6209,10 +6243,14 @@ msgstr "le nombre de chiffres n'est pas indiquĂ©" msgid "task cannot be empty if it is shared by lines" msgstr "la tĂąche ne peut pas ĂȘtre vide si elle est partagĂ©e par des lignes" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1010 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1024 msgid "All workers" msgstr "Tous les participants" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1189 +msgid "You have exceeded the maximum limit of resources" +msgstr "Vous avez dĂ©passĂ© la limite maximum de ressources" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:766 msgid "The field name must be unique and not empty" msgstr "Le nom de champ doit ĂȘtre unique et non vide" @@ -6227,17 +6265,11 @@ msgstr "Choisir les critĂšres ou les ressources" msgid "Select required criteria set and press filter button" msgstr "Choisir l'ensemble requis de critĂšres et appuyer sur le bouton filtrer" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:112 -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:116 -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:120 -msgid "%s h" -msgstr "%s h" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217 msgid "Timesheet lines" msgstr "Lignes de feuille de temps" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1522 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1521 msgid "It cannot be empty" msgstr "Il ne peut pas ĂȘtre vide" @@ -6260,7 +6292,7 @@ msgstr "Type d'unitĂ©" msgid "Load due to other assignments" msgstr "Charge due pour les autres affectations" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:508 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:515 msgid "Personal area" msgstr "Zone personnelle" @@ -6304,7 +6336,7 @@ msgstr "Exigences de critĂšre" msgid "working hours not specified" msgstr "heures travaillĂ©es non indiquĂ©es" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:156 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:155 msgid "format sequence code invalid. It must not contain '_'" msgstr "Code de sĂ©quence de forme invalide. Il ne doit contenir '_'" @@ -6355,13 +6387,13 @@ msgstr "VP" msgid "Label has already been added." msgstr "L'Ă©tiquette a dĂ©jĂ  Ă©tĂ© ajoutĂ©e." -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:123 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:122 msgid "Add task" msgstr "Ajouter une tĂąche" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1055 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:691 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:626 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1069 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:628 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:45 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 #: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:38 @@ -6383,7 +6415,7 @@ msgstr "CoĂ»t horaire" msgid "Last stretch should have 100% for length and amount of work" msgstr "La derniĂšre extension doit avoir 100% pour longueur et pour volume de travail" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:166 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:169 msgid "No project deadline defined" msgstr "Aucune Ă©chĂ©ance de projet dĂ©finie" @@ -6405,7 +6437,6 @@ msgid "" msgstr "Une autre tĂąche dans la mĂȘme branche rapporte dĂ©jĂ  l'avancement pour ce formulaire qualitĂ©" #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:457 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:148 msgid "To" msgstr "Pour" @@ -6413,7 +6444,7 @@ msgstr "Pour" msgid "options" msgstr "options" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1201 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1198 msgid "Queue-based assignment" msgstr "Affectation en file" @@ -6425,7 +6456,7 @@ msgstr "Montrer seulement les critĂšres actuellement satisfaits" msgid "Latest date" msgstr "DerniĂšre date" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:388 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:385 msgid "Deadline cannot be empty in backwards mode" msgstr "La date d'Ă©chĂ©ance ne peut pas ĂȘtre vide en mode rĂ©trospectif" @@ -6437,13 +6468,13 @@ msgstr "Grouper par semaine" msgid "Full name" msgstr "Nom complet" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:122 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:124 msgid "Default user \"admin\" cannot be removed as it is mandatory" msgstr "L'utilisateur \"admin\" par dĂ©faut ne peut pas ĂȘtre supprimĂ© car il est obligatoire" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:380 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:387 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:163 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:64 msgid "Hours Types" msgstr "Types d'heures" @@ -6469,17 +6500,13 @@ msgstr "DĂ©but prĂ©vu" msgid "Filter by projects" msgstr "Filtrer par projet" -#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:81 -msgid "VAC (Variance At Completion)" -msgstr "VAA (Variance A l'AchĂšvement)" - #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:69 msgid "Task Quality Form item name not specified" msgstr "nom d'Ă©lĂ©ment de formulaire qualitĂ© de tĂąche non indiquĂ©" #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:247 msgid "Active" msgstr "Actif" @@ -6492,12 +6519,12 @@ msgstr "LibellĂ©s hĂ©ritĂ©s" msgid "Queue-based resource" msgstr "Ressource en file" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:56 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:249 msgid "Delivery date" msgstr "Date de livraison" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1151 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1155 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 msgid "Unindent" msgstr "RĂ©duire le dĂ©calage" @@ -6538,7 +6565,7 @@ msgstr "date de dĂ©marrage estimĂ©e pour la tĂąche (appuyer sur entrĂ©e dans le msgid "Show all reported hours" msgstr "Afficher toutes les heures rapportĂ©es" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 msgid "Efforts" msgstr "Efforts" @@ -6604,15 +6631,15 @@ msgstr "Recharger" msgid "Profiles authorization" msgstr "Droits des profils" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 -msgid "Assignation" -msgstr "Affectation" - #: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98 msgid "Planning charts expanded" msgstr "Graphiques de planification Ă©tendus" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:703 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 +msgid "Assignation" +msgstr "Affectation" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:702 msgid "Inh" msgstr "HĂ©r" @@ -6633,7 +6660,7 @@ msgstr "le nom ne peut pas ĂȘtre vide" msgid "Doing {0} reassignations" msgstr "RĂ©alise {0} rĂ©affectations" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:212 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 msgid "Select entity" msgstr "Choisir l'entitĂ©" @@ -6658,7 +6685,7 @@ msgstr "Valeur invalide. La valeur par dĂ©faut maximum ne peut pas ĂȘtre vide" msgid "Invalid Spread values. At least one value should be true" msgstr "Valeurs de prolongation invalides. Au moins une des valeurs doit ĂȘtre vraie" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:587 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:600 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48 msgid "code not specified" msgstr "code non indiquĂ©" @@ -6673,6 +6700,7 @@ msgstr "dernier code de sĂ©quence non indiquĂ©" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:183 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:184 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:91 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:223 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:213 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:91 @@ -6682,7 +6710,7 @@ msgstr "dernier code de sĂ©quence non indiquĂ©" msgid "if the report is not opened automatically" msgstr "si le rapport ne s'est pas ouvert automatiquement" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:662 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:663 msgid "" "Invalid format prefix. Format prefix cannot be empty, contain '_' or contain" " whitespaces." @@ -6692,8 +6720,8 @@ msgstr "PrĂ©fixe de format invalide. Le prĂ©fixe de format ne peut pas ĂȘtre vid msgid "Create template from selected task" msgstr "CrĂ©er le modĂšle Ă  partir de la tĂąche sĂ©lectionnĂ©e" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:160 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:259 msgid "All projects" msgstr "Tous les projets" @@ -6705,7 +6733,7 @@ msgstr "TerminĂ©: {0}%" #: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:49 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:148 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:84 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:303 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 msgid "Password" msgstr "Mot de passe" @@ -6714,11 +6742,11 @@ msgstr "Mot de passe" msgid "Observations" msgstr "Observations" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:939 msgid "Edit project" msgstr "Modifier le projet" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1076 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1090 msgid "Hours cost: {0}, Expenses cost: {1}" msgstr "CoĂ»t des heures: {0}, coĂ»t des dĂ©penses: {1}" @@ -6736,7 +6764,7 @@ msgstr "Valider depuis" msgid "Month" msgstr "Mois" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:910 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:909 msgid "{0} could not be allocated. Cannot allocate more than one resource" msgstr "{0} ne peut pas ĂȘtre allouĂ©. Impossible d'allouer plus d'une ressource" @@ -6757,10 +6785,6 @@ msgstr "Impossible d'insĂ©rer le matĂ©riel dans la vue gĂ©nĂ©rale. Merci de choi msgid "Expense lines" msgstr "Lignes de dĂ©pense" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:495 -msgid "In monthly timesheets, all timesheet lines should be in the same month" -msgstr "Dans les feuilles de temps mensuelles, toutes les lignes de la feuille de temps doivent ĂȘtre dans le mĂȘme mois" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311 msgid "Delete {0} \"{1}\". Are you sure?" msgstr "Supprimer {0} \"{1}\". Êtes-vous sĂ»r ?" @@ -6782,14 +6806,14 @@ msgid "Accept" msgstr "Accepter" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:285 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:327 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:287 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:294 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:301 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:371 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:378 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:385 msgid "Example: {0}" msgstr "Exemple: {0}" @@ -6798,19 +6822,19 @@ msgid "" "Cannot delete timesheet template. There are some timesheets bound to it." msgstr "Impossible de supprimer le canevas de feuilles de temps. Il existe des feuilles de temps liĂ©es Ă  lui." -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:618 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617 msgid "Please, select type of exception" msgstr "Merci de choisir un type d'exception" +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 +msgid "cannot be negative or empty" +msgstr " ne peut pas ĂȘtre nĂ©gatif ou vide" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 msgid "Calculated" msgstr "CalculĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:341 -msgid " The " -msgstr " Le" - #: libreplan-webapp/src/main/webapp/common/layout/login.zul:56 msgid "Access to the system" msgstr "AccĂšder au systĂšme" @@ -6823,7 +6847,7 @@ msgstr "ProbabilitĂ©" msgid "Report data" msgstr "DonnĂ©es du rapport" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:184 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:181 #: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:27 msgid "Material Unit" msgstr "UnitĂ© de matĂ©riel" @@ -6832,13 +6856,6 @@ msgstr "UnitĂ© de matĂ©riel" msgid "External load" msgstr "Charge externe" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:676 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:685 -msgid "" -"There are unsaved changes in the current monthly timesheet, please save " -"before moving" -msgstr "Il existe des modifications non sauvegardĂ©es dans la feuille de temps mensuelle actuelle, merci de sauvegarder avant de dĂ©placer" - #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:207 msgid "Progress sent successfully" msgstr "Avancement envoyĂ© avec succĂšs" @@ -6857,7 +6874,7 @@ msgstr "PrioritĂ©" msgid "Apply changes and continue edition" msgstr "Appliquer les changements et continuer l'Ă©dition" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:222 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:221 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Infinitely Over Assignable" msgstr "Infiniment sur-affectable" @@ -6866,7 +6883,7 @@ msgstr "Infiniment sur-affectable" msgid "Money spent" msgstr "Argent dĂ©pensĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:818 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:819 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 @@ -6915,11 +6932,6 @@ msgstr "Argent dĂ©pensĂ©" msgid "Code" msgstr "Code" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:193 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:640 -msgid "Monthly timesheet saved" -msgstr "Feuille de temps mensuelle sauvegardĂ©e" - #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40 msgid "Add stretch" msgstr "Ajouter l'extension" @@ -6972,7 +6984,7 @@ msgstr "L'opĂ©ration ne peut pas ĂȘtre effectuĂ©e" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:80 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:82 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:65 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:168 msgid "Budget" @@ -7011,11 +7023,11 @@ msgstr "Ecrire" msgid "Number of applications" msgstr "Nombre d'applications" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:501 msgid "Assign element to queue automatically" msgstr "Affecte l'Ă©lĂ©ment Ă  la file automatiquement" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:396 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:406 msgid "Confirm worker edition" msgstr "Confirmer la modification du travailleur" @@ -7023,13 +7035,13 @@ msgstr "Confirmer la modification du travailleur" msgid "type" msgstr "type" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:605 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:604 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:38 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "Normal" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:391 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:398 #: libreplan-webapp/src/main/webapp/common/configuration.zul:36 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:65 msgid "Main Settings" @@ -7049,7 +7061,7 @@ msgstr "Vue projet" msgid "Probability %" msgstr "% de probabilitĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:707 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:323 #: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:854 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 @@ -7061,7 +7073,7 @@ msgstr "Charge" msgid "New criterion" msgstr "Nouveau critĂšre" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:696 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:702 #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:54 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:87 @@ -7071,7 +7083,6 @@ msgstr "Nouveau critĂšre" #: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:77 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:31 #: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:29 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 @@ -7102,7 +7113,7 @@ msgstr "Type de communication" msgid "Selected node" msgstr "Noeud choisi" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:670 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:669 msgid "already exists an allocation for criteria {0}" msgstr "il existe dĂ©jĂ  une allocation pour le critĂšre {0}" @@ -7114,7 +7125,7 @@ msgstr "Le code ne peut pas ĂȘtre vide." msgid "Project type" msgstr "Type de projet" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 msgid "Forward" msgstr "Avancer" @@ -7130,15 +7141,15 @@ msgstr "Nombre d'applications terminĂ©es" msgid "Invalid queue element" msgstr "ElĂ©ment de file incorrect" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:575 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:584 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:592 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:576 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:585 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:593 msgid "Unnasigned" msgstr "Non affectĂ©" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:233 -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:260 -#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:35 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:236 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:263 +#: libreplan-webapp/src/main/webapp/myaccount/_personalTimesheetsArea.zul:35 msgid "Number of tasks" msgstr "Nombre de tĂąches" @@ -7146,7 +7157,7 @@ msgstr "Nombre de tĂąches" msgid "At least one HoursGroup is needed" msgstr "Au moins un groupe d'heures est nĂ©cessaire" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:243 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:268 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:116 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:75 @@ -7179,7 +7190,7 @@ msgstr "Valeurs multiples par ressource" msgid "Split" msgstr "Eclater" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:436 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:443 msgid "Communications" msgstr "Communications" @@ -7197,7 +7208,7 @@ msgstr "Impossible de supprimer le jour prĂ©dĂ©fini d'exception du calendrier \" msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "Navigateurs supportĂ©s : Chrome, Firefox, Safari et Epiphany" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:175 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:178 msgid "Task deadline violations" msgstr "Violations de l'Ă©chĂ©ance de la tĂąche" @@ -7214,25 +7225,28 @@ msgstr "Violations de l'Ă©chĂ©ance de la tĂąche" msgid "Starting date" msgstr "Date de dĂ©but" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:913 +msgid "" +"Periocity cannot be changed because there is already any personal timesheet " +"stored" +msgstr "La pĂ©riodicitĂ© ne peut pas ĂȘtre modifiĂ©e car il existe dĂ©jĂ  des feuilles de temps personnelles enregistrĂ©es" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:62 msgid "Add materials" msgstr "Ajouter des matĂ©riels" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:21 -msgid "LibrePlan: Monthly timesheet" -msgstr "LibrePlan: Feuille de temps mensuelle" - #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:34 msgid "Load 100%" msgstr "Charge Ă  100%" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:943 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:940 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "Fonction" #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:158 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:159 +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:66 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:196 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:190 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 @@ -7251,24 +7265,24 @@ msgid "label names must be unique inside a label type" msgstr "les noms d'Ă©tiquette doivent ĂȘtre uniques Ă  l'intĂ©rieur d'un type d'Ă©tiquette" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:79 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java:207 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java:249 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java:196 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java:241 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:504 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1236 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:506 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1229 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:561 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:43 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:81 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:134 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:46 -#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:35 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:36 #: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 @@ -7291,12 +7305,20 @@ msgstr "Cliquer sur le lien suivant pour retourner Ă  la page d'accueil:" msgid "New password" msgstr "Nouveau mot de passe" +#: libreplan-webapp/src/main/webapp/reports/projectStatusReport.zul:20 +msgid "LibrePlan: Project Status Report" +msgstr "LibrePlan: Rapport d'Ă©tat de projet" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:159 msgid "" "The planning of this task is not in the current scenenario.\n" "You should change to any of the following scenarios: {0}" msgstr "Le calendrier de cette tĂąche n'est pas dans le scĂ©nario actuel.\nVous devez le modifier pour l'un des scĂ©narios suivants: {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetDTO.java:124 +msgid "{0} 2nd fortnight" +msgstr "{0} 2nde quinzaine" + #: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:20 msgid "LibrePlan: Received From Customers" msgstr "LibrePlan: Reçu des clients" @@ -7322,7 +7344,7 @@ msgid "Unit price" msgstr "Prix unitaire" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:288 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1293 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1286 msgid "Not enough permissions to create templates" msgstr "Pas assez de permissions pour crĂ©er des canevas" @@ -7351,7 +7373,7 @@ msgstr "Code projet" msgid "Reassigning" msgstr "RĂ©affectation" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:643 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:642 msgid "{0} already assigned to resource allocation list" msgstr "{0} dĂ©jĂ  affectĂ© Ă  la liste d'allocation des ressources" @@ -7363,6 +7385,10 @@ msgstr "Pas revu" msgid "Label Types List" msgstr "Liste des types de libellĂ©s" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 +msgid "Hours type for personal timesheets" +msgstr "Types d'heures pour les feuilles de temps personnelles" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44 @@ -7371,7 +7397,6 @@ msgstr "Liste des types de libellĂ©s" #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:56 #: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:91 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:150 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 @@ -7416,11 +7441,11 @@ msgstr "RafraĂźchir" msgid "Two Hour Cost of the same type overlap in time" msgstr "Deux coĂ»ts horaires du mĂȘme type se chevauchent dans le temps" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:501 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:508 msgid "Home" msgstr "Accueil" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:114 msgid "Enable/Disable" msgstr "Active/DĂ©sactive" @@ -7445,6 +7470,10 @@ msgstr "le pourcentage doit ĂȘtre entre 1 et 100" msgid "Communication Date" msgstr "Date de communication" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:281 +msgid "delivery date not specified" +msgstr "Date de livraison non indiquĂ©e" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1009 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "no" @@ -7474,19 +7503,19 @@ msgstr "CritĂšre" msgid "Edit Timesheet" msgstr "Modifier la feuille de temps" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:105 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:104 msgid "unl" msgstr "dech" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1628 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1629 msgid "Please select a worker" msgstr "Merci de choisir un travailleur" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:309 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:318 msgid "Test LDAP connection" msgstr "Tester la connexion au LDAP" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:134 msgid "Generate code for" msgstr "GĂ©nĂ©ration du code pour" @@ -7498,7 +7527,7 @@ msgstr "GĂ©nĂ©ration du code pour" #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:365 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:160 #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:99 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:519 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:529 msgid "name not specified" msgstr "nom non indiquĂ©" @@ -7520,17 +7549,13 @@ msgstr "CoĂ»t rĂ©el du travail rĂ©alisĂ©" msgid "Queue-based Resources Planning" msgstr "Calendrier des ressources en file" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:56 -msgid "Previous" -msgstr "PrĂ©cĂ©dent" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:137 msgid "Create project from Template" msgstr "CrĂ©er un projet Ă  partir d'un modĂšle" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:129 -msgid "Unit Type name cannot be empty" -msgstr "Le nom de type d'unitĂ© ne peut pas ĂȘtre vide" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:56 +msgid "Previous" +msgstr "PrĂ©cĂ©dent" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:436 msgid "" @@ -7547,7 +7572,7 @@ msgstr "Valeurs dĂ©jĂ  envoyĂ©s au client. Les valeurs ne peuvent pas ĂȘtre modi msgid "an authorization type must be set" msgstr "un type de permission doit ĂȘtre choisi" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:869 msgid "" "This project is a subcontracted project. If you delete it, you won't be able" " to report progress anymore. Are you sure?" @@ -7630,6 +7655,7 @@ msgstr "EchĂ©ance" msgid "Invalid Start Date. New Start Date must be earlier than End Date" msgstr "Date de dĂ©part invalide. La nouvelle date de dĂ©part doit ĂȘtre antĂ©rieure Ă  la date de fin" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:373 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 msgid "Tasks" msgstr "TĂąches" @@ -7695,7 +7721,7 @@ msgstr "l'effort n'est pas correctement calculĂ© en se basant sur l'horloge" msgid "Status" msgstr "Etat" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:322 msgid "from {0}" msgstr "Ă  partir de {0}" @@ -7703,7 +7729,7 @@ msgstr "Ă  partir de {0}" msgid "Resource load view" msgstr "Vue de la charge des ressources" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:811 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:81 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 @@ -7734,15 +7760,11 @@ msgstr "Type de formulaire qualitĂ©" msgid "{0} \"{1}\" deleted" msgstr "{0} \"{1}\" supprimĂ©" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:146 -msgid "type of work hours for monthly timesheets cannot be disabled" -msgstr "le type d'heures de travail pour les feuilles de temps mensuelles ne peut pas ĂȘtre dĂ©sactivĂ© " - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364 msgid " hours" msgstr "heures" -#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:262 msgid "" "% Deviation interval (difference % between consumed and estimated hours)" msgstr "% d'intervalle de dĂ©viation (diffĂ©rence en % entre les heures consommĂ©es et estimĂ©es)" @@ -7756,11 +7778,11 @@ msgid "Worker ID cannot be empty" msgstr "L'ID du participant ne peut pas ĂȘtre vide" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:303 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:306 msgid "All project tasks" msgstr "Toutes les tĂąches du projet" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:390 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:399 msgid "LDAP Roles (separated by ;)" msgstr "RĂŽles LDAP (sĂ©parĂ©s par ;)" @@ -7769,15 +7791,11 @@ msgstr "RĂŽles LDAP (sĂ©parĂ©s par ;)" msgid "Allocation configuration" msgstr "Configuration d'allocation" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:350 -msgid "Database" -msgstr "Base de donnĂ©es" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61 msgid "Subcontract price" msgstr "Prix de sous-traitance" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:427 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:434 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:71 msgid "Send To Customers" msgstr "EnvoyĂ© aux clients" @@ -7786,22 +7804,27 @@ msgstr "EnvoyĂ© aux clients" msgid "The page that you are requesting does not exist." msgstr "La page que vous demandez n'existe pas" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:495 +msgid "" +"In personal timesheets, all timesheet lines should be in the same period" +msgstr "Dans les feuilles de temps personnelles, toutes les lignes des feuilles de temps doivent ĂȘtre dans la mĂȘme pĂ©riode" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:835 msgid "Resources per day are zero" msgstr "Les ressources par jour sont Ă  zĂ©ro" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1079 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1083 msgid "Value is not valid in current list of Hours Group" msgstr "La valeur n'est pas valide dans la liste actuelle du groupe d'heures" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:100 -msgid "Total extra per day" -msgstr "Total de l'extra par jour" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:38 msgid "Timesheets List" msgstr "Liste des feuilles de temps" +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:100 +msgid "Total extra per day" +msgstr "Total de l'extra par jour" + #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 msgid "Assigned criteria" @@ -7811,7 +7834,7 @@ msgstr "CritĂšre d'affectation" msgid "Help on authentication (opens a new window)" msgstr "Aide pour l'authentification (ouvre une nouvelle fenĂȘtre)" -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:42 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:42 msgid "Timesheet data" msgstr "DonnĂ©es de la feuille de temps" @@ -7837,7 +7860,7 @@ msgstr "Impossible d'enregistrer le scĂ©nario" msgid "Apply filtering to tasks satisfying required criteria" msgstr "Appliquer le filtrage aux tĂąches satisfaisant les critĂšres demandĂ©s" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:485 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:487 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:39 msgid "Task Scheduling Status In Project" msgstr "Etat prĂ©visionnel de la tĂąche dans le projet" @@ -7855,7 +7878,7 @@ msgstr "le nom d'organisme doit ĂȘtre unique. Le nom d'organisme est dĂ©jĂ  util #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:162 #: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:92 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:378 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:873 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmer" @@ -7863,12 +7886,12 @@ msgstr "Confirmer" #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:56 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:36 -#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:49 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:38 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:50 #: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:32 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 #: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 @@ -7905,11 +7928,11 @@ msgstr "Prix total" msgid "criterion codes must be unique inside a criterion type" msgstr "les codes de critĂšre doivent ĂȘtre unique Ă  l'intĂ©rieur d'un type de critĂšre " -#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:37 +#: libreplan-webapp/src/main/webapp/myaccount/personalTimesheet.zul:37 msgid "Warning: Not editing from home page of bound users" msgstr "Attention: pas d'Ă©dition depuis la page d'accueil des utilisateurs liĂ©s" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java:195 #: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Invalid Effort Duration" msgstr "DurĂ©e d'effort invalide" @@ -7927,22 +7950,22 @@ msgstr "la date de dĂ©but non indiquĂ©e" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:212 #: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:412 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1208 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1220 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1209 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1221 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:341 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1189 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1195 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1193 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1199 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:287 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:456 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:162 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:270 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:895 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1215 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1462 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:894 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1461 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:959 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 @@ -7951,11 +7974,11 @@ msgstr "la date de dĂ©but non indiquĂ©e" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:404 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1252 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1655 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1245 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1642 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:48 #: libreplan-webapp/src/main/webapp/materials/materials.zul:107 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:87 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 @@ -7975,10 +7998,10 @@ msgstr "la date de dĂ©but non indiquĂ©e" #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:115 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:156 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:108 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:170 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:168 #: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:51 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 -#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:40 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:41 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 @@ -8220,10 +8243,6 @@ msgstr "Modifier tous les projets" msgid "Create projects" msgstr "CrĂ©er des projets" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:73 -msgid "Timesheet Lines List Report" -msgstr "Rapport de liste de lignes de feuille de temps" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:74 msgid "Hours Worked Per Resource Report" msgstr "Rapport d'heures travaillĂ©es par ressource" @@ -8256,6 +8275,14 @@ msgstr "Rapport d'Ă©tat de prĂ©vision de tĂąche dans le projet" msgid "Materials Needs At Date Report" msgstr "Rapport des besoins en matĂ©riel par date" +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:344 +msgid "Database" +msgstr "Base de donnĂ©es" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:345 +msgid "LDAP" +msgstr "LDAP" + #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:156 msgid "Line" msgstr "Ligne" @@ -8364,17 +8391,17 @@ msgstr "P" msgid "U" msgstr "D" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:761 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:774 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:995 msgid "Cannot spread two progress in the same task" msgstr "Impossible d'Ă©tendre deux avancements dans la mĂȘme tĂąche" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:785 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:811 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:798 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:824 msgid "Duplicate Progress Assignment For Task" msgstr "Affectation d'avancement dupliquĂ©e pour la tĂąche" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1133 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1146 msgid "Quality form already exists" msgstr "Le formulaire qualitĂ© existe dĂ©jĂ " @@ -8386,6 +8413,18 @@ msgstr "Le pourcentage total doit ĂȘtre infĂ©rieur Ă  100%" msgid "The criterion already exists into another task" msgstr "Le critĂšre existe dĂ©jĂ  dans une autre tĂąche" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:35 +msgid "Monthly" +msgstr "Mensuellement" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:66 +msgid "Twice-monthly" +msgstr "Bi-mensuellement" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/PersonalTimesheetsPeriodicityEnum.java:123 +msgid "Weekly" +msgstr "Hebdomadaire" + #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37 msgid "Progress with all tasks by hours" msgstr "Avancement avec toutes les tĂąches par heure"