From 183fc9d00e05927a0390a332012e2765b367289b Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 10 Nov 2011 20:12:42 +0100 Subject: [PATCH] [i18n] Update keys.pot files --- ganttzk/src/main/resources/i18n/keys.pot | 80 +- .../src/main/resources/i18n/keys.pot | 4167 +++++++++-------- 2 files changed, 2185 insertions(+), 2062 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot index 661bea98e..9485c0326 100644 --- a/ganttzk/src/main/resources/i18n/keys.pot +++ b/ganttzk/src/main/resources/i18n/keys.pot @@ -5,14 +5,14 @@ # This file is distributed under the same license as the LibrePlan package. # Diego Pino García , 2009. # Jacobo Aragunde Pérez , 2009, 2010. -# Manuel Rego Casasnovas , 2010, 2011. +# Manuel Rego Casasnovas , 2010, 2011. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.1.3\n" +"Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 16:17+0200\n" +"POT-Creation-Date: 2011-11-10 20:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,7 +26,7 @@ msgstr "" msgid "Erase" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299 msgid "Add Dependency" msgstr "" @@ -38,20 +38,20 @@ msgstr "" msgid "Start" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:629 msgid "Show reported hours" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90 msgid "by criteria" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:72 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85 msgid "Show/Hide reported hours" msgstr "" #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49 msgid "Zoom" msgstr "" @@ -59,7 +59,7 @@ msgstr "" msgid "Limiting resources" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68 +#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67 msgid "The specified dependency is not allowed" msgstr "" @@ -67,15 +67,15 @@ msgstr "" msgid "Set End-End" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:80 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78 msgid "Show/Hide progress" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:188 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199 msgid "available effort: {0}, assigned effort: {1}" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89 msgid "by resources" msgstr "" @@ -87,7 +87,7 @@ msgstr "" msgid "Criterion" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44 msgid "Print" msgstr "" @@ -95,7 +95,7 @@ msgstr "" msgid "Week" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:501 msgid "filtering by name" msgstr "" @@ -107,10 +107,6 @@ msgstr "" msgid "End" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37 -msgid "Choosing Template" -msgstr "" - #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243 msgid "changing zoom" msgstr "" @@ -123,7 +119,7 @@ msgstr "" msgid "None" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71 msgid "Flatten/Unflatten tree" msgstr "" @@ -135,7 +131,7 @@ msgstr "" msgid "Project" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:67 #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 msgid "Name" msgstr "" @@ -144,27 +140,23 @@ msgstr "" msgid "Name filter" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:609 msgid "Show progress" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:66 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67 msgid "Expand/Collapse all" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:56 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58 msgid "Show/Hide critical path" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36 -msgid "Create Project" -msgstr "" - #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 msgid "Year" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:145 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150 msgid "showing criteria" msgstr "" @@ -172,7 +164,7 @@ msgstr "" msgid "Month" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64 msgid "Show/Hide resources" msgstr "" @@ -180,11 +172,11 @@ msgstr "" msgid "Set End-Start" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:298 msgid "decreasing zoom" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:590 msgid "Hide critical path" msgstr "" @@ -192,19 +184,19 @@ msgstr "" msgid "Day" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:636 msgid "Hide reported hours" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:182 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:193 msgid "Load: {0}%" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:147 msgid "showing resources" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61 msgid "Show/Hide labels" msgstr "" @@ -212,8 +204,8 @@ msgstr "" msgid "Hour" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91 -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116 +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114 msgid "Graphics" msgstr "" @@ -221,30 +213,30 @@ msgstr "" msgid "Set Start-Start" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:141 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152 msgid "See resource allocation" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:281 msgid "increasing zoom" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:467 msgid "Show all elements" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454 +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:466 msgid "All" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38 msgid "Refresh" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:585 msgid "Show critical path" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:614 msgid "Hide progress" msgstr "" diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot index ea5cf1a7e..71dd6ce43 100644 --- a/libreplan-webapp/src/main/resources/i18n/keys.pot +++ b/libreplan-webapp/src/main/resources/i18n/keys.pot @@ -5,14 +5,14 @@ # This file is distributed under the same license as the LibrePlan package. # Diego Pino García , 2009. # Jacobo Aragunde Pérez , 2009, 2010. -# Manuel Rego Casasnovas , 2010, 2011. +# Manuel Rego Casasnovas , 2010, 2011. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.1.3\n" +"Project-Id-Version: 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-09 16:17+0200\n" +"POT-Creation-Date: 2011-11-10 20:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,11 +21,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:368 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:373 msgid "The resource cannot be null" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:419 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420 msgid "criterion codes must be unique inside a criterion type" msgstr "" @@ -34,71 +34,65 @@ msgid "No authorizations were added because you did not select any." msgstr "" #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:59 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:45 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:54 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71 msgid "en" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:192 msgid "Origin" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:165 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168 msgid "Create exception" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 msgid "Select report data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:399 -msgid "Up to company view" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:207 -msgid "there exist multiple resource calendars with name {0}" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:60 msgid "Create Virtual Worker" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:98 +#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:207 +msgid "there exist multiple resource calendars with name {0}" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:87 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:69 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 @@ -110,45 +104,49 @@ msgstr "" #: libreplan-webapp/src/main/webapp/templates/_list.zul:34 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:231 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:229 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 msgid "Operations" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:536 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:151 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:523 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:135 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:195 msgid "There is no type of work hours with this code" msgstr "" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:112 msgid "Select" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1355 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:215 +msgid "Work report removed successfully" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1514 msgid "It can not be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55 @@ -162,80 +160,80 @@ msgstr "" msgid "Reassign" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64 msgid "Description cannot be null or empty" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:79 -msgid "login name not specified" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:79 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:362 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:72 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:269 msgid "MonteCarlo Method" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:229 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:247 msgid "Project Scheduling" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 msgid "February" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:29 msgid "Managing fields and labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:356 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:269 msgid "Please, select a calendar" msgstr "" #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170 msgid "Predefined" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:267 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244 msgid "Summary" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 msgid "Reports" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:337 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 +msgid "LibrePlan: Advanced allocation" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340 msgid "" "The original workable days value {0}, is prevented because consolidated " "values cannot be modified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 msgid "The {0} sequence prefixes can not be repeated" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:82 msgid "Criterion requirements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:285 msgid "Stretch date must not be less than task start date: " msgstr "" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:66 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:68 msgid "Dedication chart" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:701 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:728 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729 msgid "Progress that are reported by quality forms can not be modified" msgstr "" @@ -243,33 +241,38 @@ msgstr "" msgid "Not the same hours group, impossible to update" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:520 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66 +msgid "Own exception" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:522 msgid "Cannot delete that material because it is assigned to a project." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:475 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479 msgid "Remove limiting resource element" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:275 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:141 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:155 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 msgid "Resource Usage" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 msgid "Active period from" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:52 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:51 msgid "hours type :" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:481 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:485 msgid "Unassign" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:295 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 msgid "Companies" msgstr "" @@ -277,7 +280,7 @@ msgstr "" msgid "Manual assignment" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 msgid "Quality form items list" msgstr "" @@ -287,16 +290,22 @@ msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:903 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128 +msgid "Create {0}: {1}" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51 msgid "generic workers allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:914 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:516 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 msgid "The project has no scheduled elements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:796 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806 msgid "Hour start" msgstr "" @@ -318,11 +327,11 @@ msgstr "" msgid "Delete Template element" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/order.zul:90 -#: libreplan-webapp/src/main/webapp/planner/order.zul:97 -msgid "Progress Consolidation" +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22 +msgid "LibrePlan: Calendars" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java:65 #: libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java:66 msgid "User with login name '{0}': not found" msgstr "" @@ -331,20 +340,16 @@ msgstr "" msgid "Resources capability" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:204 -msgid "The first stretch must be after the first day for doing interpolation" -msgstr "" - #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 msgid "Filter quality forms by :" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:106 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108 msgid "changing perspective" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "" @@ -354,28 +359,24 @@ msgid "" "present." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:55 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:63 msgid "Default calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:296 -msgid "Cannot delete user: it does not exist anymore" -msgstr "" - -#: libreplan-webapp/src/main/webapp/users/profiles.zul:23 -msgid "LibrePlan: Profiles" -msgstr "" - #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Project Name" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:931 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938 msgid "Indent" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 +msgid "Save passwords in database" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:255 msgid "Reassignation" msgstr "" @@ -388,40 +389,53 @@ msgstr "" msgid "Total estimated hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:130 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:144 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 +#: libreplan-webapp/src/main/webapp/common/error.zul:21 +msgid "LibrePlan: Runtime Error" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:151 msgid "Base calendar \"{0}\" saved" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:174 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:177 msgid "Exceptions list" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33 msgid "Locations" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78 msgid "New quality form item" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:41 +#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21 +msgid "LibrePlan: Labels" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242 +msgid "LDAP connection was successful" +msgstr "" + +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:43 msgid "Login name" msgstr "" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 +msgid "LibrePlan user" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84 +msgid "{0} List" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43 msgid "Current" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:632 -msgid "Machine deleted" -msgstr "" - -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 -msgid "LibrePlan: Progress Report" -msgstr "" - -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:67 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:63 msgid "Dependencies" msgstr "" @@ -433,7 +447,7 @@ msgstr "" msgid "Current selection" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1134 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1130 msgid "" "there exist criterion satisfactions referring to criterion types not " "applicable to this resource" @@ -457,39 +471,47 @@ msgstr "" msgid "You can not remove a scenario with derived scenarios" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 -msgid "Create new version" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:948 +msgid "Work Report Types" +msgstr "" + +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 +msgid "Maximum/minimum of estimated hours" +msgstr "" + +#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22 +msgid "LibrePlan: Quality Forms" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:63 msgid "LIMITING" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:324 -msgid "Derived" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:414 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:415 msgid "a disabled resource has enabled subresources" msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53 msgid "Client" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 +msgid "Role search query:" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " "can't be added" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:446 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 msgid "Error on showing warning message removing calendar: " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:428 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:415 msgid "work report has not any description value with this field name" msgstr "" @@ -503,12 +525,12 @@ msgstr "" msgid "Imputed hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "" @@ -517,15 +539,19 @@ msgstr "" msgid "Delete Milestone" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:152 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:155 msgid "default password were not changed" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112 +msgid "Type of hours" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:48 msgid "Non-assigned locations" msgstr "" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:77 msgid "Application URI" msgstr "" @@ -535,21 +561,22 @@ msgid "" "criterionSatisfaction from the same criterionType" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 msgid "Work Report Lines" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1514 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546 msgid "Configure" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "October" msgstr "" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:58 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:57 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 msgid "First name" msgstr "" @@ -557,20 +584,16 @@ msgstr "" msgid "Could not execute print command" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122 msgid "Complementary text fields" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:208 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:418 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:137 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:141 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:181 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 msgid "Confirm deleting {0}. Are you sure?" msgstr "" @@ -578,7 +601,7 @@ msgstr "" msgid "Work Reports List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 msgid "Accounts" msgstr "" @@ -586,7 +609,7 @@ msgstr "" msgid "External code" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50 msgid "Edit selected task" msgstr "" @@ -596,32 +619,32 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:84 msgid "Limiting" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:60 msgid "Required materials" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:666 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677 msgid "resources per day must be not empty and bigger than zero" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341 msgid "Backwards" msgstr "" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:78 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77 msgid "Version" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52 msgid "Apply filtering to resources satisfying required criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106 msgid "Up" msgstr "" @@ -631,7 +654,7 @@ msgid "" "same criterionType" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 msgid "Types of work hours" msgstr "" @@ -644,96 +667,83 @@ msgstr "" msgid "Stacktrace:" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:144 msgid "" "Its planning is not in the current scene.\n" "Should change to any of the following scenarios:\n" msgstr "" -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:37 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 msgid "Predecessor" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:189 -msgid "Some stretch has higher or equal values than the previous stretch" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:55 msgid "Please select a task" msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23 -msgid "LibrePlan: Cost Categories" +#: 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 "" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:58 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:75 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 -msgid "End date" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:255 -msgid "missing worker code in the work report" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:142 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 msgid "" "Value is not valid, the default max value must be greater than the precision " "value " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146 -msgid "" -"You can not remove the company \"{0}\" because is already in use in some " -"project or in some subcontrated task." +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 +msgid "missing worker code in the work report" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:88 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:58 +msgid "End date" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89 msgid "profile name is already being used by another profile" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:63 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:68 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 msgid "E-mail" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 -msgid "Prefix:" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:107 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:112 msgid "This project has already been added." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:381 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:204 +msgid "Prefix:" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:386 msgid "The task code cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 #: 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/planner/taskpanels/_taskInformation.zul:32 msgid "Criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 msgid "Resource / Criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:26 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:27 msgid "User data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97 -msgid "Error setting up creation form." -msgstr "" - #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "" @@ -742,11 +752,15 @@ msgstr "" msgid "Add new progress assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:193 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32 +msgid "Set Filter Options" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:977 msgid "Error on showing warning message removing workReportType: " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:624 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:633 msgid "Edit Work Report" msgstr "" @@ -758,36 +772,35 @@ msgstr "" msgid "Project version is the same in source and destination scenarios" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:30 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31 msgid "Personal data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:732 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733 msgid "Calculated progress can not be removed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:162 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:158 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:199 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:202 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202 msgid "please, select a Criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationModel.java:127 -msgid "Project does not exist" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:112 +msgid "Work reports" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143 msgid "{0} annotation required on {1}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "June" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1031 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038 msgid "Modified" msgstr "" @@ -799,12 +812,12 @@ msgstr "" msgid "You can not remove the current scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:648 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:89 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:338 msgid "MessagesContainer is needed" msgstr "" @@ -816,10 +829,14 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56 msgid "Ending date" msgstr "" +#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21 +msgid "LibrePlan: Page not found" +msgstr "" + #: libreplan-webapp/src/main/webapp/templates/_list.zul:21 msgid "Templates List" msgstr "" @@ -828,7 +845,7 @@ msgstr "" msgid "Export options" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:229 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:227 msgid "Last value" msgstr "" @@ -836,7 +853,11 @@ msgstr "" msgid "Subcontracted Tasks List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:705 +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 +msgid "Average of worked hours in finished applications" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706 msgid "Calculated progress can not be modified" msgstr "" @@ -844,40 +865,43 @@ msgstr "" msgid "Statistics log" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:51 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47 msgid "Edit Calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:112 +msgid "Profile" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:52 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:59 msgid "Cannot be empty or null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:275 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300 msgid "filtering" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233 +msgid "{0} \"{1}\" saved" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_list.zul:33 msgid "Total Budget" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:53 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:55 msgid "Hierarchy" msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23 -msgid "LibrePlan: Work Hours" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:833 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" @@ -892,25 +916,29 @@ msgstr "" msgid "Overload due to other assignments" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117 +msgid "Types of hours" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:149 msgid "Time period saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:305 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:206 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:164 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:205 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208 msgid "This Criterion has already been added." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252 msgid "" "Are you sure of changing the resource type? You will lose the criteria with " "different resource type." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:215 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 msgid "add" msgstr "" @@ -919,7 +947,7 @@ msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:35 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34 msgid "Filter work report by :" msgstr "" @@ -927,7 +955,7 @@ msgstr "" msgid "NON_LIMITING" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:290 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 msgid "Workers" msgstr "" @@ -935,8 +963,7 @@ msgstr "" msgid "Cannot remove {0}, since it is being used by some Exception Day" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "August" msgstr "" @@ -944,11 +971,23 @@ msgstr "" msgid "Resources matching selected criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 +msgid "with" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:297 +msgid "Label Type" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:48 msgid "Year" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:327 +msgid "{0} \"{1}\" could not be deleted, it was already removed" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68 msgid "profile name not specified" msgstr "" @@ -956,49 +995,41 @@ msgstr "" msgid "Date Start" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275 msgid "Value is not valid, the current value must be less than max value" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 -msgid "From Chosen" -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:109 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 msgid "Value" msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66 msgid "Hour costs" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:718 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:773 msgid "there are no valid periods for this calendar" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:52 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93 msgid "Add role" msgstr "" -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:41 -msgid "Edit Scenario" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1112 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271 msgid "Exception end date should be greater or equals than start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:601 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:611 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453 msgid "Repeated Project code {0} in Project {1}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:274 +#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:277 msgid "Project from client" msgstr "" @@ -1012,7 +1043,7 @@ msgid "" "other criterion" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62 msgid "Work done until ending date:" msgstr "" @@ -1020,31 +1051,28 @@ msgstr "" msgid "Schedule Performance Index" msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 msgid "Earlier starting date" msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:27 msgid "Type data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 msgid "Profiles" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:800 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 msgid "Hour finish" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:173 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:165 msgid "Perspectives" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:40 -msgid "Edit Work Report Type" -msgstr "" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:107 msgid "Workable time" msgstr "" @@ -1052,20 +1080,11 @@ msgstr "" msgid "missing code in a subcategory" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544 -msgid "Confirm deleting this cost category. Are you sure?" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/editTask.zul:66 msgid "Non limiting resource allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:191 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:297 -msgid "Error removing element: " -msgstr "" - -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:40 msgid "Company name" msgstr "" @@ -1078,16 +1097,15 @@ msgid "Split new assignment" msgstr "" #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:53 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57 msgid "Pagination" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:265 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:286 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263 msgid "Expiry date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342 msgid "" "The operation does not perform because the task has progress reports that is " "spread associated with this quality form" @@ -1102,14 +1120,14 @@ msgstr "" msgid "Critical path" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260 msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:38 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:41 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:80 msgid "Categories" msgstr "" @@ -1118,23 +1136,19 @@ msgstr "" msgid "Status code:" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:46 msgid "Project Details" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:94 -msgid "Create Criterion Type" -msgstr "" - -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162 msgid " to go to output directly" msgstr "" @@ -1142,16 +1156,20 @@ msgstr "" msgid "Add new hours group" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:219 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221 msgid "Criteria: {0} " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:44 +msgid "Cancel changes and back to scheduling" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/order.zul:109 msgid "Percentage" msgstr "" @@ -1159,7 +1177,7 @@ msgstr "" msgid "Updated" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:71 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:81 msgid "Company logo URL" msgstr "" @@ -1167,11 +1185,11 @@ msgstr "" msgid "No worker selected" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:227 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:225 msgid "Number of digits" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1651 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1639 msgid "Task not found" msgstr "" @@ -1180,24 +1198,16 @@ msgstr "" msgid "Total capability" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:732 -msgid "It not could remove the task " +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +msgid "Is a libreplan user" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:217 msgid "Problems connecting with client web service" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 -msgid "LibrePlan: User access" -msgstr "" - -#: libreplan-webapp/src/main/webapp/materials/materials.zul:21 -msgid "LibrePlan: Materials" -msgstr "" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:154 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:183 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186 msgid "Exception Type" msgstr "" @@ -1205,11 +1215,11 @@ msgstr "" msgid "Profiles List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:567 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:944 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:869 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 @@ -1221,7 +1231,7 @@ msgstr "" msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 msgid "Data Types" msgstr "" @@ -1230,25 +1240,25 @@ msgstr "" msgid "Total hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:342 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:38 +msgid "Data" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:343 msgid "Reassigning {0} projects" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:84 -msgid "Create Work Hours Type" -msgstr "" - -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55 msgid "Filter by task status" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:528 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:430 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:498 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:420 msgid "Select date:" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:635 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1105 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264 msgid "You should select a end date for the exception" msgstr "" @@ -1256,7 +1266,7 @@ msgstr "" msgid "Please try it again." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:49 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:56 msgid "Company code" msgstr "" @@ -1264,57 +1274,54 @@ msgstr "" msgid "Unknown attribute '{0}' in class {1}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:714 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:717 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33 msgid "NON LIMITING RESOURCE" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22 -msgid "LibrePlan: Workers" -msgstr "" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:117 -msgid "Activation periods" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389 -msgid "Passed" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:90 +msgid "passwords can not be empty" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 msgid "already assigned" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:68 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:390 +msgid "Passed" +msgstr "" + +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:120 +msgid "Activation periods" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:509 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:131 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 -#: libreplan-webapp/src/main/webapp/planner/order.zul:155 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:139 +#: libreplan-webapp/src/main/webapp/planner/order.zul:154 msgid "Calendar" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 +msgid "Resources" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56 msgid "Read" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:99 -msgid "Resources" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153 msgid "Source and destination scenarios should be different" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:230 -msgid "CriterionType and its criteria saved" -msgstr "" - -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:137 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:141 msgid "The browser you are using" msgstr "" @@ -1323,23 +1330,18 @@ msgid "scenario" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:51 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:248 -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49 +#: 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 msgid "to" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:197 -msgid "Error on removing typeOfWorkHours: " -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:112 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:115 msgid "worker's first name not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 msgid "date not specified" msgstr "" @@ -1347,9 +1349,9 @@ msgstr "" msgid "Select type :" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:259 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 msgid "Projects Planning" msgstr "" @@ -1357,12 +1359,18 @@ msgstr "" msgid "Shrink to fit page width" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773 +msgid "The max value must be greater than 0" +msgstr "" + +#: libreplan-webapp/src/main/webapp/settings/settings.zul:63 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 msgid "Last name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:551 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:380 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 msgid "Remove" msgstr "" @@ -1370,15 +1378,15 @@ msgstr "" msgid "cost category name not specified" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 -msgid "LibrePlan: Virtual Workers Groups" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:131 msgid "SPI" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1334 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:232 +msgid "Progress Type" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" @@ -1389,19 +1397,23 @@ msgid "" "start date" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:516 +msgid "This date can not include the whole previous work week" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390 msgid "the code must be not null or not empty" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:35 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:119 msgid "Create New Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1420 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430 msgid "Stretches list" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:180 msgid "Enable scenarios module" msgstr "" @@ -1409,52 +1421,50 @@ msgstr "" msgid "Zoom" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:608 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:41 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:52 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:95 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:124 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:88 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:106 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:117 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:41 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:38 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:42 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:81 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:80 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:135 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:130 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:135 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 msgid "Save" msgstr "" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:62 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 msgid "Standard Effort" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 msgid "Material categories" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:240 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:570 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674 msgid "number of digits must be between {0} and {1}" msgstr "" @@ -1466,7 +1476,7 @@ msgstr "" msgid "Pending update" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 msgid "End date:" msgstr "" @@ -1482,23 +1492,47 @@ msgstr "" msgid "Problems connecting with subcontractor web service" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:219 +msgid "Entity type" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263 +msgid "Unsaved changes will be lost. Are you sure?" +msgstr "" + +#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 +#: libreplan-webapp/src/main/webapp/planner/order.zul:22 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22 +#: libreplan-webapp/src/main/webapp/planner/index.zul:22 +#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: libreplan-webapp/src/main/webapp/planner/main.zul:22 +#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22 +msgid "LibrePlan: Scheduling" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:277 +msgid "UserDn:" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44 msgid "Assigned load" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:142 msgid "End Date" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:64 msgid "Filter by workers" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:374 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 msgid "Some allocations needed" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 msgid "Resources Per Day" msgstr "" @@ -1512,7 +1546,7 @@ msgid "" "popup or type in date directly)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:292 msgid "Expand/Collapse all" msgstr "" @@ -1520,34 +1554,33 @@ msgstr "" msgid "Overload due to current project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:857 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907 msgid "Name: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:867 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874 msgid "Move down" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:116 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:112 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:137 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139 msgid "Please, select a project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:29 +msgid "Inherits from date" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "September" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28 msgid "Report structure" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:88 -msgid "password not specified" -msgstr "" - -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:119 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:42 #: libreplan-webapp/src/main/webapp/templates/templates.zul:59 msgid "General data" @@ -1557,11 +1590,12 @@ msgstr "" msgid "BAC" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:399 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379 msgid "Calculate Number of Hours" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" @@ -1571,63 +1605,54 @@ msgstr "" msgid "missing code in a criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1296 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273 msgid "Create Template" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 -msgid "LibrePlan: Work Reports" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:115 -msgid "Edit Company" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Advanced search" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:82 msgid "Filter by labels" msgstr "" -#: 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:577 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:38 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36 msgid "MonteCarlo chart" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 -msgid "LibrePlan: Hours Worked Per Resource" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126 msgid "Schedule Variance" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:496 +msgid "Error on showing warning message removing qualityForm: " +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:410 msgid "Service does not manage resource of type: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:191 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:185 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:210 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:506 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:544 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:575 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1365 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:974 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:474 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:492 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 msgid "Warning" msgstr "" @@ -1636,15 +1661,13 @@ msgstr "" msgid "Select parent calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:96 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:463 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:526 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:513 msgid "There is no task with this code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:433 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:146 msgid "The type of hours cannot be null" msgstr "" @@ -1653,14 +1676,14 @@ msgid "criterion satisfaction with end date less than start date" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 msgid "Show" msgstr "" @@ -1672,18 +1695,6 @@ msgstr "" msgid "Assignment Type" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 -#: libreplan-webapp/src/main/webapp/planner/order.zul:22 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/index.zul:22 -#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 -#: libreplan-webapp/src/main/webapp/planner/main.zul:22 -#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22 -msgid "LibrePlan: Scheduling" -msgstr "" - #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29 msgid "Back to log in" msgstr "" @@ -1697,31 +1708,28 @@ msgstr "" msgid "Planned start :" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 -msgid "Company" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 msgid "Node without children" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:152 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +msgid "Company" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118 msgid "There is no label with this code " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:210 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212 msgid "Task: {0} " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:138 -msgid "Profile saved" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:75 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:84 msgid "There is no type of work report with this code" msgstr "" @@ -1734,10 +1742,6 @@ msgstr "" msgid "Surname" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1364 -msgid "You need to select some function to configure" -msgstr "" - #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22 msgid "Exception Day Types List" msgstr "" @@ -1746,66 +1750,57 @@ msgstr "" msgid "the name must be not null or not empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:741 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:157 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:750 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:394 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:68 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:131 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:111 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 +#: libreplan-webapp/src/main/webapp/planner/order.zul:110 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:363 -msgid "there must be {0} effort instead of {1}" -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42 msgid "Add From Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:505 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:543 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:508 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:546 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 -msgid "LibrePlan: Exception Days" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:646 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 msgid "Filter by month" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322 msgid "The criterion and its type cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:526 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421 msgid "The quality form must have an item with 100% value to report progress" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "July" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156 msgid "The code is not valid. There is another unit type with the same code" msgstr "" @@ -1813,16 +1808,15 @@ msgstr "" msgid "( max: {0} )" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:222 msgid "Error on removing element: " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 msgid "January" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:64 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60 msgid "Cannot calculate charts for current data" msgstr "" @@ -1830,8 +1824,8 @@ msgstr "" msgid "Select queue" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:582 -msgid "The cost category had already been removed." +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 +msgid "project name already being used" msgstr "" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48 @@ -1851,43 +1845,41 @@ msgstr "" msgid "You can not remove the default scenario called \"{0}\"" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161 msgid "direct link" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112 msgid "Down" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:842 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:48 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:89 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 msgid "Label" msgstr "" -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:37 -msgid "Create Scenario" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:834 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:48 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 msgid "Association with roles" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:371 msgid "missing type of work hours in a work report line" msgstr "" @@ -1895,8 +1887,8 @@ msgstr "" msgid "Quality forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:624 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "" @@ -1904,6 +1896,10 @@ msgstr "" msgid "Hours group" msgstr "" +#: libreplan-webapp/src/main/webapp/users/users.zul:23 +msgid "LibrePlan: Accounts" +msgstr "" + #: libreplan-webapp/src/main/webapp/templates/templates.zul:96 #: libreplan-webapp/src/main/webapp/templates/_list.zul:30 msgid "Days from Beginning to Deadline" @@ -1913,43 +1909,37 @@ msgstr "" msgid "Estimate At Completion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194 -msgid "Delete item. Are you sure?" -msgstr "" - #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:102 msgid "cost assignment's start date not specified" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:204 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174 msgid "Output format:" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1029 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1192 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45 msgid "Direct" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:818 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:268 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:289 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:828 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:245 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:266 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:52 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86 msgid "Op." msgstr "" -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:51 msgid "Reference date:" msgstr "" @@ -1957,17 +1947,17 @@ msgstr "" msgid "Pessimistic" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:376 msgid "Limiting resource assignation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:119 msgid "Work week" msgstr "" @@ -1976,15 +1966,15 @@ msgid "You will lose the changes. Are you sure?" msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47 msgid "Company ID" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:129 msgid "Unit type name cannot be empty" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:38 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:42 msgid "Entity sequences" msgstr "" @@ -1993,15 +1983,19 @@ msgstr "" msgid "Delay from beginning (days)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:324 msgid "Resource cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:505 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453 msgid "Total Hours" msgstr "" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +msgid "LibrePlan Role" +msgstr "" + +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:36 msgid "Create Progress Type" msgstr "" @@ -2009,12 +2003,8 @@ msgstr "" msgid "Confirm cancel" msgstr "" -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:62 -msgid "Label list" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "" @@ -2022,68 +2012,67 @@ msgstr "" msgid "WBS (tasks)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1250 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:423 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:133 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:538 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:552 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:227 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:310 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:859 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:894 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 msgid "Error on showing removing element: " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:698 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 msgid "Deleting sequence" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:87 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:88 msgid "Select scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:218 -msgid "Create Label Type" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:51 +msgid "Login" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:233 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:225 msgid "missing work report code in a work report" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -msgid "Create Work Report Type" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:299 +msgid "Edit Virtual Workers Group: {0}" msgstr "" #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 msgid "Criterion requirement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1245 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1404 msgid "Only the last activation period allows to delete end date." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189 +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 +msgid "Maximum/minimum of worked hours in finished applications" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 msgid "Scheduling saved" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:197 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:192 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70 msgid "Add new row" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:782 -msgid "incorrect initialization of the progress assignment controller." +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:492 +msgid "Move" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:488 -msgid "Move" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:67 +msgid "Password saved" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:224 @@ -2104,7 +2093,7 @@ msgstr "" msgid "CutycaptTimeout thread exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "" @@ -2117,25 +2106,29 @@ msgstr "" msgid "Deadline (days since beggining project)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:422 -msgid "number of hours is not properly calculated based on clock" +#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 +msgid "LibrePlan: Companies" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:385 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 +msgid "LibrePlan: Progress Report" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:417 msgid "" "Calendar cannot be removed because it still has children. Some other " "calendar is derived from this one." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:918 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 msgid "Value is not valid, the type must be not empty" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:444 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:445 msgid "criterion type name is already being used" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:331 msgid "Task code cannot be null" msgstr "" @@ -2143,16 +2136,12 @@ msgstr "" msgid "It is not allowed to consolidate progress." msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 msgid "Create Task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:98 -msgid "Error setting up creation form for Criterion Type" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:151 -msgid "Edit Cost Category" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +msgid "LDAP Authentication enabled" msgstr "" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 @@ -2163,44 +2152,52 @@ msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:82 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:112 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Actions" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:115 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:118 msgid "Exceptions" msgstr "" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:32 +msgid "User settings" +msgstr "" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:80 msgid "Start hour" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140 msgid "Assign materials" msgstr "" -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 msgid "Over assignable" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:231 msgid "format filters are not valid" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:72 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 msgid "ID" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:419 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +msgid "Settings" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:346 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:181 msgid "The init date cannot be empty" msgstr "" @@ -2209,20 +2206,20 @@ msgstr "" msgid "Is administrator" msgstr "" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:90 msgid "Our company password" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:275 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:172 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:130 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174 msgid "This label has already been added." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:79 -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80 +#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:181 msgid "Could not get code, please try again later" msgstr "" @@ -2232,19 +2229,15 @@ msgid "" " Code cannot contain chars like '_'." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625 -msgid "Confirm deleting this machine. Are you sure?" -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161 msgid "Hours Group" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:823 msgid "Unallocated name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:888 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895 msgid "Move up" msgstr "" @@ -2257,10 +2250,10 @@ msgid "Subcontract communication date" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:262 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:354 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:129 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 msgid "Scheduling" msgstr "" @@ -2268,7 +2261,13 @@ msgstr "" msgid "Dependencies have priority" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:206 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:516 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:901 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126 +msgid "Create {0}" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:218 msgid "Unlimited" msgstr "" @@ -2280,20 +2279,21 @@ msgstr "" msgid "Assign Label" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23 +msgid "Create new project" +msgstr "" + #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73 msgid "Page up" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:228 -msgid "Create new project" -msgstr "" - -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:58 msgid "Work done from starting date:" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:159 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 @@ -2305,36 +2305,28 @@ msgstr "" msgid "Must start after" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1345 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306 msgid "Confirm change" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:864 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 msgid "You don't have permissions to edit this project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:104 -msgid "Edit Profile" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192 msgid "missing date in a calendar exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:432 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:213 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:440 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:145 msgid "" "Type of hours is empty. Please, create some type of hours before proceeding" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:598 -msgid "Exception" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:108 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:180 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:515 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:437 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:502 msgid "There is no resource with this ID" msgstr "" @@ -2343,15 +2335,19 @@ msgstr "" msgid "Send" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:103 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 msgid "user" msgstr "" +#: libreplan-webapp/src/main/webapp/materials/materials.zul:21 +msgid "LibrePlan: Materials" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeModel.java:53 msgid "New task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192 msgid "The password for a new user cannot be empty" msgstr "" @@ -2363,23 +2359,19 @@ msgstr "" msgid "Type name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 -msgid "Progress assignment" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:182 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:440 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:687 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27 msgid "All" msgstr "" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:40 -msgid "Edit Progress Type" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 +msgid "Progress assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77 msgid "Manual" msgstr "" @@ -2391,11 +2383,11 @@ msgstr "" msgid "Receipt date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:210 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:209 msgid "Cannot be higher than Ending date" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:292 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269 msgid "Create activation period" msgstr "" @@ -2407,9 +2399,9 @@ msgstr "" msgid "Personal details" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1027 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1190 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:214 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:217 msgid "Inherited" msgstr "" @@ -2417,27 +2409,28 @@ msgstr "" msgid "Delete project template. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:255 -msgid "Worker" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:517 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:595 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599 msgid "" "Cannot allocate selected element. There is not any queue that matches " "resource allocation criteria at any interval of time" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287 +msgid "Worker" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:217 msgid "Criterion must be not-null" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:161 -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:299 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:300 msgid "criterion name not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95 msgid "Value is not valid, the default max value must not be empty " msgstr "" @@ -2458,29 +2451,42 @@ msgstr "" msgid "Recommended allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:303 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 +msgid "Activation" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 msgid "Scenarios" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376 msgid "Materials saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252 msgid "" "This progress measurement can not be in current date, because it is " "consolidated. it is necessary to select other date." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:705 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 +msgid "Total Worked Hours By Resource In A Month" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672 msgid "Other projects" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:159 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:111 +msgid "Tasks input buffer" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 msgid "At least one {0} sequence must be active" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:111 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 @@ -2499,15 +2505,19 @@ msgstr "" msgid "You should select a source scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 msgid "At least one {0} sequence is needed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "" +#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23 +msgid "LibrePlan: Cost Categories" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:68 msgid "Assigned" msgstr "" @@ -2516,11 +2526,15 @@ msgstr "" msgid "Details" msgstr "" +#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21 +msgid "LibrePlan: Units" +msgstr "" + #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 msgid "Communication" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 msgid "More options" msgstr "" @@ -2529,15 +2543,11 @@ msgstr "" msgid "Error: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:185 -msgid "Company saved" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240 msgid "Confirm create template" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:261 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:238 msgid "Parent" msgstr "" @@ -2545,62 +2555,68 @@ msgstr "" msgid "Earliest date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:126 -msgid "Type of work hours saved" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +msgid "Change Password" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 +msgid "LibrePlan: Work And Progress Per Task" +msgstr "" + +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48 msgid "Projects" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:150 -msgid "Create Quality Form" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264 +msgid "Confirm exit dialog" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:46 msgid "December" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:922 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:35 +msgid "Change password" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:830 msgid "Text field" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:122 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81 msgid "" "Value is not valid, the Precision value must be less than the defalt max " "value." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97 msgid "Question" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249 msgid "" "This progress measurement can not be changed or removed, because it is " "consolidated. It is needed to remove its consolidation." msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:222 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225 msgid "Create new work week" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:134 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:137 msgid "The admin's account password remains the default one. This is unsecure" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:713 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:716 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:34 msgid "LIMITING RESOURCE" msgstr "" @@ -2609,30 +2625,26 @@ msgstr "" msgid "Subcontratation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:135 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:535 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:590 msgid "{0} cannot be fulfilled" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:69 msgid "Extended view" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34 msgid "Work record" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:116 -msgid "Error setting up edition form." -msgstr "" - -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:147 msgid "Output format" msgstr "" @@ -2640,14 +2652,6 @@ msgstr "" msgid "Print" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22 -msgid "LibrePlan: Calendars" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:412 -msgid "Hours cannot be null" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:179 msgid "{0} not found type for criterion " msgstr "" @@ -2656,56 +2660,53 @@ msgstr "" msgid "Page down" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:485 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:486 msgid "resource type does not allow enabled criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 -#: libreplan-webapp/src/main/webapp/common/error.zul:21 -msgid "LibrePlan: Runtime Error" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:416 +msgid "Effort cannot be null" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:43 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1015 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:191 -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:49 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:55 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:101 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:46 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:40 -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:44 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:87 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:84 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:81 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:134 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:99 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:243 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:72 -#: libreplan-webapp/src/main/webapp/planner/order.zul:135 -#: libreplan-webapp/src/main/webapp/planner/order.zul:170 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:85 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41 +#: libreplan-webapp/src/main/webapp/planner/order.zul:73 +#: libreplan-webapp/src/main/webapp/planner/order.zul:134 +#: libreplan-webapp/src/main/webapp/planner/order.zul:169 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:32 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:35 msgid "General user data" msgstr "" @@ -2717,7 +2718,7 @@ msgstr "" msgid "Subcontracted task sent successfully" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:73 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:77 msgid "Accumulated hours chart" msgstr "" @@ -2729,13 +2730,13 @@ msgstr "" msgid "CPI" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:660 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:923 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:526 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 msgid "You don't have read access to this project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:180 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:96 msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" msgstr "" @@ -2746,17 +2747,13 @@ msgstr "" msgid "Units" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:48 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:43 msgid "Dates" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:45 -msgid "Create Calendar" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:185 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168 msgid "At least one stretch is needed" msgstr "" @@ -2764,10 +2761,22 @@ msgstr "" msgid "a day is not valid" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:87 +msgid "Autocomplete login form" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 +msgid "LibrePlan: Project Costs Per Resource" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61 msgid "Task Properties" msgstr "" +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 +msgid "LibrePlan: Task Scheduling Status In Project" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:229 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214 @@ -2775,20 +2784,11 @@ msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:192 -msgid "Cost category saved" -msgstr "" - #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33 msgid "name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:170 -msgid "Progress type saved" -msgstr "" - -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:73 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:75 msgid "Delete selected task" msgstr "" @@ -2796,10 +2796,14 @@ msgstr "" msgid "{0} (max: {1})" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470 msgid "end" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:529 +msgid "Cost Category" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:63 msgid "Log" msgstr "" @@ -2822,7 +2826,7 @@ msgstr "" msgid "Start date cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 msgid "Subcontracting" msgstr "" @@ -2830,7 +2834,7 @@ msgstr "" msgid "references" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1284 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278 msgid "Value is not valid, the Precision value must be exact " msgstr "" @@ -2842,7 +2846,11 @@ msgstr "" msgid "Planned workable days :" msgstr "" -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:51 +msgid "Template" +msgstr "" + +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49 msgid "Default max value" msgstr "" @@ -2850,7 +2858,7 @@ msgstr "" msgid "Add criterion requirement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855 msgid "" "You can not remove the project \"{0}\" because of any of its tasks are " "already in use in some work reports and the project just exists in the " @@ -2865,13 +2873,14 @@ msgstr "" msgid "Criterion Name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:498 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502 msgid "Automatic" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 msgid "Task" msgstr "" @@ -2880,20 +2889,28 @@ msgstr "" msgid "Planned end :" msgstr "" +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:21 +msgid "LibrePlan: Change password" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:270 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:128 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:167 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:124 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:169 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168 msgid "please, select a label" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 msgid "Add profile" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215 +#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23 +msgid "LibrePlan: Scenarios Management" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220 msgid "filter already exists" msgstr "" @@ -2911,6 +2928,10 @@ msgstr "" msgid "values are not valid, the values must not be null" msgstr "" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41 +msgid "Apply changes and go back to scheduling" +msgstr "" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 @@ -2923,9 +2944,9 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:73 msgid "Project" msgstr "" @@ -2934,11 +2955,7 @@ msgstr "" msgid "Unassigned" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:25 -msgid "Select the date from which the new version will be valid" -msgstr "" - -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:102 msgid "Add new criterion requirement" msgstr "" @@ -2946,11 +2963,11 @@ msgstr "" msgid "Budgeted Cost Work Performed" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:135 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:138 msgid "Change the password" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:95 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 msgid "Work report" msgstr "" @@ -2958,24 +2975,29 @@ msgstr "" msgid "the name must be not empty" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:86 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:58 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:85 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:731 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:326 msgid "Earned value" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:216 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 +msgid "Overtime Effort" +msgstr "" + +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:219 msgid "Inherited from parent calendar" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:146 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:184 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:210 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:187 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:213 msgid "Normal Effort" msgstr "" @@ -2990,51 +3012,48 @@ msgid "" "Please save your project before proceeding." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:92 -msgid "Edit Work Hours Type" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43 -msgid "From Today" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1060 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1075 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129 msgid "{0} not supported yet" msgstr "" +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:143 +msgid "is not supported for its use with LibrePlan." +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53 msgid "New entry" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 msgid "Some sequences to remove not existed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:105 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:114 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:212 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:100 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:109 msgid "Resources Load" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214 msgid "Changes have been canceled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:266 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:281 -msgid "Machine saved" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21 +msgid "LibrePlan: Hours Worked Per Worker In A Month" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143 -msgid "Create Cost Category" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:297 +msgid "Authentication" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "March" msgstr "" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:85 +msgid "Select language" +msgstr "" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104 msgid "Appropriative allocation" msgstr "" @@ -3043,11 +3062,11 @@ msgstr "" msgid "Assigned criterion requirements" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:115 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:123 msgid "Filter by criteria" msgstr "" @@ -3060,11 +3079,11 @@ msgstr "" msgid "Scenarios List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:115 msgid "The name is not valid, the name must not be null " msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 msgid "Hours to allocate" msgstr "" @@ -3072,7 +3091,7 @@ msgstr "" msgid "A category must be selected" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:134 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:137 msgid "Period" msgstr "" @@ -3085,90 +3104,83 @@ msgstr "" msgid "Select start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:188 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:214 -msgid "Error on showing warning message removing typeOfWorkHours: " -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:153 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:151 -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:901 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877 msgid "Removed {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152 +msgid "Error on showing warning message removing typeOfWorkHours: " +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 msgid "Confirm deleting this worker. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:62 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:64 msgid "Group name" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51 msgid "Start date:" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:57 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98 msgid "Role name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:837 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:840 msgid "This worker was already removed by other user" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:611 -msgid "Create Work Report" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:116 -msgid "Value is not valid, the precision value must not be empty" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:484 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:791 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:474 msgid "h" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:359 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:620 +msgid "Create Work Report" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:75 +msgid "Value is not valid, the precision value must not be empty" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363 msgid "Workable capacity for this period " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:150 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159 msgid "Cannot be null or empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:190 -msgid "Cannot delete profile: it does not exist anymore" +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:440 +msgid "Quality Form" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:225 -msgid "Edit Machine" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:77 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:67 msgid "Add Milestone" msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:116 msgid "Assign selected items" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:438 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449 msgid "init" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1212 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215 msgid "Add new progress measurement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:528 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:532 msgid "Select for automatic queuing" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 msgid "Scenarios Management" msgstr "" @@ -3180,86 +3192,96 @@ msgstr "" msgid "Create & Assign" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:148 -msgid "Edit User" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549 +msgid "Not configurable" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 -msgid "Maximum/minimum of the estimated hours" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationCommand.java:47 +msgid "Advanced allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:753 -msgid "D" -msgstr "" - -#: libreplan-webapp/src/main/webapp/planner/order.zul:112 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90 +#: libreplan-webapp/src/main/webapp/planner/order.zul:111 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 msgid "Consolidated" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:145 msgid "Work report types" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:182 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:174 msgid "MonteCarlo method" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1057 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1220 msgid "derived exception can not be removed" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:307 +msgid "Edit Worker: {0}" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:217 msgid "missing code in a material" msgstr "" +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 +msgid "LibrePlan: User access" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:61 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:109 msgid "Customer" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:86 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 msgid "Hours type" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:156 -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:210 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211 msgid "criterion type name not specified" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246 +msgid "Cannot connect to LDAP server" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220 msgid "Add Exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:427 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:451 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346 msgid "cannot be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1468 -msgid "Sigmoid function" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:421 +msgid "Effort must be greater than zero" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:49 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:48 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27 msgid "from" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:147 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:146 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:121 msgid "Heading Fields" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:70 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:80 msgid "Progress type" msgstr "" @@ -3277,7 +3299,7 @@ msgid "" "date" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:43 +#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Save Project" msgstr "" @@ -3286,8 +3308,8 @@ msgstr "" msgid "Day is not valid" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1097 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:619 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1256 msgid "You should select a start date for the exception" msgstr "" @@ -3303,89 +3325,93 @@ msgstr "" msgid "Exportation options" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:92 +msgid "Settings saved" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160 msgid "" "Could not save time period. Time period overlaps with another non-compatible " "time period" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:376 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/BaseCalendarBandboxFinder.java:46 #: 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/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:493 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:978 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:88 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:27 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:38 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:41 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:74 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:31 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:39 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80 #: libreplan-webapp/src/main/webapp/templates/_list.zul:27 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 #: libreplan-webapp/src/main/webapp/planner/main.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:90 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:134 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:175 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:104 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 msgid "Name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:162 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168 msgid "Delete task" msgstr "" @@ -3397,11 +3423,11 @@ msgstr "" msgid "please, select an item" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:392 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:397 msgid "Time Start cannot be null" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:208 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212 msgid "Day of week" msgstr "" @@ -3409,12 +3435,12 @@ msgstr "" msgid "Companies List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1443 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453 msgid "Stretches with Interpolation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "" @@ -3426,19 +3452,17 @@ msgstr "" msgid "cost assignment with end date less than start date" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 -msgid "Maximum/minimum of the worked hours" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:91 +msgid "" +"Enable/Disable autocomplete property in login form, if the admin password is " +"still in default" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 msgid "Category name" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 -msgid "LibrePlan: Work And Progress Per Task" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:766 msgid "Not the same material, impossible to update" msgstr "" @@ -3447,10 +3471,6 @@ msgstr "" msgid "Main menu" msgstr "" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22 -msgid "LibrePlan: Progress" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:31 msgid "MonteCarlo" msgstr "" @@ -3459,15 +3479,23 @@ msgstr "" msgid "Duration" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:39 -msgid "Create From Template" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:585 +msgid "Exception: {0}" +msgstr "" + +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:46 +msgid "Password settings" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:381 msgid "There exists other workReportType with the same name." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22 +msgid "LibrePlan: Progress" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:149 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29 msgid "Schedule" msgstr "" @@ -3486,45 +3514,41 @@ msgstr "" msgid "Notes" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:224 +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178 msgid "Connect" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21 -msgid "LibrePlan: Units" -msgstr "" - -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23 -msgid "LibrePlan: Transfer Projects Between Scenarios" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223 msgid "Allocation: [{0},{1}]" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:194 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:892 +msgid "Virtual Workers Group" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198 msgid "Changes saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258 msgid "See scheduling" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 msgid "Progress measurements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1211 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214 msgid "Add measure" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:253 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:258 msgid "Work report saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:52 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:374 +#: 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:377 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "" @@ -3544,7 +3568,7 @@ msgstr "" msgid "End" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1366 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 msgid "The date is not valid, the date must be not empty" msgstr "" @@ -3552,25 +3576,29 @@ msgstr "" msgid "User login name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 msgid "Cost Categories" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:312 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313 msgid "criterion type not specified" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 +msgid "Role property:" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143 msgid "must be not empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "April" msgstr "" -#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 -msgid "LibrePlan: Companies" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:301 +msgid "Derived of Calendar " msgstr "" #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22 @@ -3583,16 +3611,20 @@ msgstr "" msgid "Task quality forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593 msgid "Not working day" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:237 +msgid "Progress Types" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:135 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:155 msgid "Cost category" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700 msgid "It can not be deleted. At least one sequence is necessary." msgstr "" @@ -3600,23 +3632,29 @@ msgstr "" msgid "Resource allocation" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50 msgid "Amount work" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:172 msgid "please, select a quality form" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:201 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:195 msgid "Select entity:" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:132 +msgid "Edit {0}: {1}" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:400 msgid "Exist other workReportType with the same code." msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:65 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67 msgid "Unindent selected task" msgstr "" @@ -3628,20 +3666,11 @@ msgstr "" msgid "Constraint" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155 -msgid "Create Exception Day Type" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 -msgid "Hours Worked Per Resource In A Month" -msgstr "" - #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:402 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:407 msgid "Time finish cannot be null" msgstr "" @@ -3649,23 +3678,22 @@ msgstr "" msgid "Customer reference" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:661 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:865 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:915 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:924 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:461 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:517 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:527 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 msgid "Information" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:946 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926 msgid "Sorry, you do not have permissions to access this project" msgstr "" @@ -3673,11 +3701,11 @@ msgstr "" msgid "END" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:226 msgid "Worker saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266 msgid "can not pass until the previous item is passed." msgstr "" @@ -3685,11 +3713,7 @@ msgstr "" msgid "New hours group " msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22 -msgid "LibrePlan: Quality Forms" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:460 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "" @@ -3697,15 +3721,15 @@ msgstr "" msgid "Edit Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:216 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:218 msgid "Resource: {0} " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:463 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358 msgid "percentage cannot be duplicated" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 msgid "Work Hours" msgstr "" @@ -3713,7 +3737,7 @@ msgstr "" msgid "Heading" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:164 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:165 msgid "Company ID already used. It has to be be unique" msgstr "" @@ -3725,23 +3749,20 @@ msgstr "" msgid "Percentages should sum 100" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:284 -msgid "Could not save machine" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:339 msgid "The calendar exception type not found" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81 +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:106 msgid "Unable to convert value to {0} type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:223 msgid "Worker must be not-null" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1067 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1063 msgid "Some criterion satisfactions overlap in time" msgstr "" @@ -3749,34 +3770,43 @@ msgstr "" msgid "Value last progress measurement" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 +msgid "LibrePlan: Materials Needs At Date" +msgstr "" + +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 msgid "Worker assignments" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:541 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:402 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:147 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:610 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:409 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:431 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 msgid "{0} already exists" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:318 msgid "Create Worker" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587 +msgid "Exception: {0} (Inh)" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 msgid "Code " msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:52 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65 msgid "Password confirmation" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:69 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71 msgid "Indent selected task" msgstr "" @@ -3784,12 +3814,13 @@ msgstr "" msgid "Work Report" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:135 msgid "Unit Measures" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:63 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39 msgid "Show progress" msgstr "" @@ -3798,16 +3829,27 @@ msgstr "" msgid "Work" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297 +msgid "" +"Error saving the project\n" +"{0}" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:358 msgid "" "The task has got progress consolidations. It must delete all consolidations " "to change the resource allocation type " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:626 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 +msgid "LibrePlan: Machines" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 #: 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:1335 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1296 msgid "Error" msgstr "" @@ -3825,15 +3867,15 @@ msgstr "" msgid "ETC" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:105 msgid "Log out" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:25 msgid "Add new configuration unit" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:37 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:41 msgid "Main preferences" msgstr "" @@ -3844,24 +3886,20 @@ msgid "" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:82 +#: libreplan-webapp/src/main/webapp/planner/order.zul:83 msgid "Progress consolidation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:246 -msgid "Label type saved" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:419 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:568 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:556 msgid "missing field name in a description value" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47 msgid "Add new worker assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:688 msgid "Show all elements" msgstr "" @@ -3869,11 +3907,11 @@ msgstr "" msgid "It couldn't complete all the reassignations" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:73 msgid "Show dependencies:" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:66 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:68 msgid "Limited resource" msgstr "" @@ -3881,6 +3919,10 @@ msgstr "" msgid "Task Information" msgstr "" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 +msgid "Apply filter to: " +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 msgid "Hours Group at " msgstr "" @@ -3889,8 +3931,8 @@ msgstr "" msgid "Your session has expired after inactivity period. Please log in again." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:166 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:191 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:190 msgid "SPREAD" msgstr "" @@ -3902,27 +3944,31 @@ msgstr "" msgid "Budgeted Cost Work Scheduled" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:57 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703 +msgid "Changes applied" +msgstr "" + +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58 msgid "Name cannot be null or empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements: " msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:43 +msgid "LDAP configuration" +msgstr "" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32 msgid "Queue Element Information" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:136 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139 msgid "Start Date" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:31 -msgid "Create Order" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22 msgid "Virtual Workers Groups List" msgstr "" @@ -3931,13 +3977,13 @@ msgstr "" msgid "Cost Variance" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:470 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471 msgid "criterion type does not allow resource hierarchy" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_edition.zul:150 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 msgid "Total" msgstr "" @@ -3950,25 +3996,26 @@ msgstr "" msgid "Budget hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:150 msgid "Edit task: {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:53 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:52 msgid "Select destination" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529 +#: libreplan-webapp/src/main/webapp/planner/order.zul:92 +#: libreplan-webapp/src/main/webapp/planner/order.zul:98 +msgid "Check consolidated progresses" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530 msgid "must be greater than the previous date." msgstr "" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 -msgid "LibrePlan: Advanced allocation" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1481 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:583 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585 msgid "Show all" msgstr "" @@ -3977,19 +4024,20 @@ msgid "Estimated hours" msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:59 msgid "Default price" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121 msgid "Apply tab changes" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171 msgid "passwords don't match" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:88 msgid "Day properties" msgstr "" @@ -4005,7 +4053,7 @@ msgstr "" msgid "Work Hours Types List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:62 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54 msgid "new milestone" msgstr "" @@ -4013,19 +4061,11 @@ msgstr "" msgid "Value last progress reported" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 msgid "Report Progress" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:154 -msgid "Unit {0} cannot be removed because it is used in materials" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:133 -msgid "Create User" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 msgid "Schedule from start to deadline" msgstr "" @@ -4035,31 +4075,43 @@ msgstr "" msgid "Estimated days" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:61 msgid "Reference date" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 +msgid "LibrePlan: Estimated/Planned Hours Per Task" +msgstr "" + +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48 msgid "Selected node:" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 -msgid "LibrePlan: Task Scheduling Status In Project" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 +msgid "From chosen date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:249 -msgid "Create new project from template" -msgstr "" - -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81 msgid "Progress Evolution" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:112 +#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 +msgid "LibrePlan: Exception Days" +msgstr "" + +#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23 +msgid "LibrePlan: Work Hours" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +msgid "LibrePlan Configuration" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 msgid "Original" msgstr "" @@ -4080,20 +4132,20 @@ msgstr "" msgid "Resource allocation type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:491 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:493 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:71 msgid "List of materials for all categories (select one to filter)" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:99 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:103 msgid "User disabled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:788 msgid "In the available periods {0} only {1} hours are available." msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118 msgid "Association with profiles" msgstr "" @@ -4106,12 +4158,12 @@ msgstr "" msgid "Message - {0}" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:121 -msgid "worker's surname not specified" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:21 +msgid "LibrePlan: Settings" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:211 -msgid "Error on removing workReportType: " +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:124 +msgid "worker's surname not specified" msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41 @@ -4119,65 +4171,77 @@ msgstr "" msgid "Save changes" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:77 +msgid "Application settings" +msgstr "" + +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47 +msgid "Average of estimated hours" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " "are already in use in some work reports" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:192 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203 msgid "Total dedication" msgstr "" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:45 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44 msgid "Select source" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:825 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:828 msgid "Worker deleted" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:735 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733 msgid "Select entity, please" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:291 msgid "Stretch date must not be greater than the task's end date: " msgstr "" +#: libreplan-webapp/src/main/webapp/users/profiles.zul:23 +msgid "LibrePlan: Profiles" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 msgid "Subcontratation date" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:212 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:207 msgid "Number of digits:" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:93 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:182 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 +msgid "LibrePlan: Subcontracted Tasks" +msgstr "" + +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:96 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185 msgid "Day" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:233 -msgid "Edit Label Type" +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:54 +msgid "Current password" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:911 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1197 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:921 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:276 msgid "Please, select an item" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:180 -msgid "Work report type saved" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1122 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1096 msgid "Cannot be higher than finish hour" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:225 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:223 msgid "Prefix" msgstr "" @@ -4190,44 +4254,48 @@ msgstr "" msgid "New Template element" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21 -msgid "LibrePlan: Hours Worked Per Worker In A Month" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:251 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:325 msgid "The base calendar parent not found" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97 msgid "Non Consolidated" msgstr "" +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43 +msgid "From date" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34 msgid "Reassigning type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:295 -msgid "Edit Virtual Workers Group" +#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 +msgid "LibrePlan: Virtual Workers Groups" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:441 +#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:190 +msgid "{0} \"{1}\" can not be deleted because of it is being used" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445 msgid "Edit limiting resource element" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:770 msgid "The field name must be unique, not null and not empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 msgid "Position" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:104 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:108 msgid "Incorrect authentication" msgstr "" @@ -4241,15 +4309,15 @@ msgstr "" msgid "Edit work report" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:45 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:44 msgid "Limiting resources (project)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:764 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:672 msgid "A description field of the same name already exists." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1174 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4258,26 +4326,21 @@ msgstr "" msgid "Current value" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:165 -msgid "Edit Quality Form" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:823 msgid "Duplicate progress assignment for task " msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:54 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:84 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94 msgid "Save and Continue" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:46 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:50 msgid "Zoom level" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:166 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:29 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168 msgid "Quality form" msgstr "" @@ -4285,16 +4348,21 @@ msgstr "" msgid "Go!" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:271 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:30 +msgid "Inherits up to date" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:280 msgid "The name of the label is empty." msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:26 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:27 msgid "Profile data" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:31 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:35 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:248 msgid "Configuration" msgstr "" @@ -4302,29 +4370,42 @@ msgstr "" msgid "It was not possible load entity. Not found. Id: " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:569 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:496 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:528 +msgid "This date can not be empty" +msgstr "" + +#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22 +msgid "LibrePlan: Workers" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:572 msgid "Create Virtual Workers Group" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:933 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:861 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911 msgid "Hours invested" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:160 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 +msgid "Authorization" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:119 msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318 msgid "Project saved" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:45 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44 msgid "task :" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:712 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:715 msgid "ALL" msgstr "" @@ -4332,11 +4413,11 @@ msgstr "" msgid "criterion satisfaction's resource not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68 msgid "Derived exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 msgid "Machines" msgstr "" @@ -4344,10 +4425,6 @@ msgstr "" msgid "Unit Measures List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:222 -msgid "Confirm deleting this profile. Are you sure?" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153 msgid "Couldn't find element: {0}" msgstr "" @@ -4361,27 +4438,27 @@ msgstr "" msgid "unit type code not found" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180 -msgid "Calendar Exception Type saved" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +msgid "My account" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:42 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:41 msgid "Resource :" msgstr "" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:40 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39 msgid "Destination scenario" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:153 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:105 msgid "Company view" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:18 -msgid "LibrePlan: Configuration" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 +msgid "Both" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:751 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758 msgid "Not editable for containing more that an hours group." msgstr "" @@ -4389,41 +4466,41 @@ msgstr "" msgid "Filter by" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:80 msgid "Limiting resource" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58 -#: libreplan-webapp/src/main/webapp/planner/order.zul:147 +#: libreplan-webapp/src/main/webapp/planner/order.zul:146 msgid "Calendar allocation" msgstr "" +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48 +msgid "Up to date" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:819 msgid "Duplicate value true report global progress for task" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:85 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:154 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:156 msgid "must be greater than finish date" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 -msgid "LibrePlan: Materials Needs At Date" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79 -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:202 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203 msgid "[generic all workers]" msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27 msgid "Category data" msgstr "" @@ -4431,18 +4508,30 @@ msgstr "" msgid "Search" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:242 +msgid "Valid until" +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128 msgid "Add New Complementary Field" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232 msgid "Work weeks list" msgstr "" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:38 msgid "Source scenario" msgstr "" +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24 +msgid "LibrePlan: Criteria" +msgstr "" + +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23 +msgid "LibrePlan: Transfer Projects Between Scenarios" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 msgid "%" msgstr "" @@ -4452,25 +4541,27 @@ msgstr "" msgid "Remove calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1548 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1712 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:512 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:648 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1346 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:656 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:228 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:312 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:139 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 msgid "must be lower than finish date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:757 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:161 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:766 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:70 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:135 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "" @@ -4483,16 +4574,16 @@ msgstr "" msgid "Date last progress reported" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:123 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 msgid "Could not load any resource" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:383 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:386 msgid "" "You must allow multiple active criteria for this type to use this assignment " "strategy" @@ -4506,26 +4597,26 @@ msgstr "" msgid "Default Label" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:113 msgid "Close" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:471 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945 msgid "Specific Allocations" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225 #: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:119 msgid "error doing reassignation: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:423 msgid "Time filter" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:61 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 msgid "Move selected task up" msgstr "" @@ -4533,44 +4624,32 @@ msgstr "" msgid "Select criteria set or specific resources for allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348 msgid "Create copy" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33 msgid "Work Report Lines List" msgstr "" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28 msgid "Company data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:215 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151 msgid "Unit type code cannot be empty" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47 -msgid "Average of the estimated hours" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:178 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:240 -msgid "Quality form saved" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:167 -msgid "Create Unit Type" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 msgid "Users" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145 msgid "Label Type fields" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:105 msgid "Hours Management" msgstr "" @@ -4578,7 +4657,7 @@ msgstr "" msgid "New task:" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:140 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:144 msgid "" "Please use some of the compatible browsers: Chrome, Firefox, Safari or " "Epiphany." @@ -4588,7 +4667,7 @@ msgstr "" msgid "specific allocation" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:147 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:148 msgid "company name has to be unique. It is already used" msgstr "" @@ -4603,26 +4682,22 @@ msgstr "" msgid "Template saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:305 -msgid "Confirm deleting this User. Are you sure?" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:577 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:565 msgid "work report have not any description value with this field name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 -msgid "User saved" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:23 +msgid "LibrePlan: Configuration" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 msgid "Task quality form name" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1097 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:156 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:161 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:181 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1093 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:158 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:163 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:183 msgid "Some cost category assignments overlap in time" msgstr "" @@ -4650,45 +4725,41 @@ msgstr "" msgid "Statistics list " msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116 +msgid "Please, enter a valid effort" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:59 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58 msgid "Enabled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143 -msgid "Edit Exception Day Type" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222 msgid "All resources must be limiting. " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:327 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:525 msgid "Filter by worker" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22 -msgid "LibrePlan: Machines" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 msgid "Load due to current project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1344 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 msgid "You are going to change the assignment function. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 msgid "Exception Days" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:200 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:183 msgid "There must be at least 2 stretches for doing interpolation" msgstr "" @@ -4696,59 +4767,58 @@ msgstr "" msgid "Incompatible update: stored resource is not of type: {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:213 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:98 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:109 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:42 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:82 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:132 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:137 msgid "Save & Continue" msgstr "" +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 +msgid "LibrePlan: Work And Progress Per Project" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:90 msgid "Scheduling mode" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:53 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:55 -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23 msgid "Filter" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:943 +msgid "Work Report Type" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:26 msgid "Assigned locations" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:247 -msgid "Unit type saved" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:267 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:129 -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:138 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:270 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:131 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:140 msgid "Two hour costs with the same type overlap in time" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:201 -msgid "Create Machine" -msgstr "" - -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 msgid "Report progress" msgstr "" @@ -4757,7 +4827,7 @@ msgstr "" msgid "ACWP" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:736 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:791 msgid "The periods available depend on the resource's calendar." msgstr "" @@ -4765,7 +4835,7 @@ msgstr "" msgid "START" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342 msgid "Schedule from the deadline to start" msgstr "" @@ -4773,18 +4843,18 @@ msgstr "" msgid "generic machines allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:372 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:375 msgid "Non limiting resource assignation" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:82 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 msgid "Back" msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58 msgid "Subcontractor" msgstr "" @@ -4793,22 +4863,18 @@ msgstr "" msgid "Administration" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1531 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1694 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:495 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:631 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1329 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:638 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:211 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:293 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:239 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242 msgid "must be greater than start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:93 -msgid "Create Company" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47 msgid "Cancel and return" msgstr "" @@ -4818,25 +4884,27 @@ msgstr "" msgid "Assign quality form" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387 msgid "Delete item {0}. Are you sure?" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:215 +msgid "Error setting up creationg form for Criterion Type with id}" +msgstr "" + #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 msgid "worked hours" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:50 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:51 msgid "Unit measure name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:772 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144 msgid "cannot include a progress of the same progress type twice" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:489 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:476 msgid "a work report line has not this label type assigned" msgstr "" @@ -4845,35 +4913,34 @@ msgstr "" msgid "Allocations" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:32 -msgid "Choosing Template" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 msgid "Task code" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49 msgid "Length" msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:85 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 msgid "Capacity" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133 msgid "Create derived" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:627 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:302 +msgid "Label Types" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:638 msgid "it must be greater than zero" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 msgid "must be a real positive number" msgstr "" @@ -4886,34 +4953,33 @@ msgstr "" msgid "Total hours task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:409 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:441 msgid "Removed calendar \"{0}\"" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1083 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063 msgid "Create project" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:49 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:542 +msgid "This date can not include the whole next work week" +msgstr "" + +#: 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" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:113 -msgid "Edit Criterion Type" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:445 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:453 msgid "The code cannot be empty." msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 msgid "Human hours per machine working hour within configuration unit" msgstr "" @@ -4928,12 +4994,16 @@ msgstr "" msgid "New work report" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 msgid "yes" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:304 +msgid "Root calendar" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -4952,17 +5022,17 @@ msgstr "" msgid "Validate" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:175 msgid "This resource has already been added." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:149 msgid "Calendar exception types" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36 msgid "Cost category assignment" msgstr "" @@ -4970,14 +5040,10 @@ msgstr "" msgid "missing code in a hour cost" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:822 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870 msgid "All workers" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:304 -msgid "Label saved" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25 msgid "Select criteria or resources" msgstr "" @@ -4988,56 +5054,55 @@ msgstr "" msgid "Select required criteria set and press filter button" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1018 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1279 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:229 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:231 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:233 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:280 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:380 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:147 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:740 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:135 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:63 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:47 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:72 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:49 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:44 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:50 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:84 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:88 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:93 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:33 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:53 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:42 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 -#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 -msgid "cannot be null or empty" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:632 msgid "Hours Group {0} : Duplicate code in DB" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 -msgid "LibrePlan: Work And Progress Per Project" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:990 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1181 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1438 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 +#: 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/materials/MaterialsController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50 +#: 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 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:94 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:92 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:94 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:55 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 +#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 +msgid "cannot be null or empty" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43 @@ -5049,25 +5114,21 @@ msgstr "" msgid "The progress type cannot be modified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:412 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392 msgid "Calculate Resources per Day" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:996 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:904 msgid "The index fields and labels must be uniques and consecutives" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 -msgid "LibrePlan: Estimated/Planned Hours Per Task" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130 msgid "Estimate To Complete" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:84 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:83 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "" @@ -5080,20 +5141,20 @@ msgstr "" msgid "Sum of all task leafs imputed hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:644 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554 msgid "This machine was already removed by other user" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 -msgid "Work Reports" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:256 +msgid "Host:" msgstr "" #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:26 msgid "Calendar data" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:173 -msgid "login name is already being used by another user" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 +msgid "Work Reports" msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22 @@ -5104,31 +5165,37 @@ msgstr "" msgid "code is already used" msgstr "" +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:67 +msgid "Labels list" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:284 +msgid "Password:" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 msgid "Criterion Requirements" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:148 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:215 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76 msgid "Extra Effort" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:57 -msgid "Move selected task down" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:260 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269 msgid "Already exists other label with the same name" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59 +msgid "Move selected task down" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 msgid "Customer Reference" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:777 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147 msgid "spread values are not valid, at least one value should be true" @@ -5146,24 +5213,24 @@ msgstr "" msgid "SV" msgstr "" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:85 msgid "Our company login" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1483 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1471 msgid "Filter work reports" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:395 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:427 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "the Configuration window before." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:587 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:932 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63 @@ -5171,42 +5238,42 @@ msgstr "" msgid "Progress" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:128 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:259 msgid "" "This criterion type cannot be deleted because it has assignments to projects " "or resources" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1221 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 msgid "All progress types have already been assigned." msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 msgid "Price per hour" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:209 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 msgid "Project: {0} " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315 msgid "Calendars" msgstr "" -#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21 -msgid "LibrePlan: Page not found" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:355 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:360 msgid "The date cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:317 msgid "" "Another task in the same branch is already reporting progress for this " "quality form" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 +msgid "options" +msgstr "" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 msgid "Latest date" msgstr "" @@ -5215,13 +5282,18 @@ msgstr "" msgid "Show only current satisfied criteria" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 +msgid "LibrePlan: Work Reports" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 msgid "Error on showing delete confirm" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:671 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623 msgid "Sum of all rows" msgstr "" @@ -5237,26 +5309,18 @@ msgstr "" msgid "Done {0} of {1}" msgstr "" -#: libreplan-webapp/src/main/webapp/users/users.zul:23 -msgid "LibrePlan: Accounts" -msgstr "" - -#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23 -msgid "LibrePlan: Scenarios Management" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:194 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:177 msgid "" "Last stretch should have one hundred percent for length and amount of work " "percentage" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:60 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:96 msgid "Filter by projects" msgstr "" @@ -5264,17 +5328,17 @@ msgstr "" msgid "Criteria of selected type " msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 msgid "Each worker configuration unit name" msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:224 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 msgid "Active" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1258 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 msgid "This progress measurement can not be in " msgstr "" @@ -5282,19 +5346,19 @@ msgstr "" msgid "Inherited labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1243 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 msgid "" "This progress can not be changed or removed, because it has got consolidated " "progress. It is needed to remove the consolidation on all its progress." msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:910 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917 msgid "Unindent" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:932 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1390 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384 msgid "Value is not valid, the current value must be not empty" msgstr "" @@ -5302,7 +5366,11 @@ msgstr "" msgid "Direct labels" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:92 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43 +msgid "From today" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:96 msgid "Log in" msgstr "" @@ -5310,15 +5378,15 @@ msgstr "" msgid "Project name" msgstr "" -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55 msgid "Precision" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:372 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:359 msgid "missing code in a work report line" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:985 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928 msgid "Efforts" msgstr "" @@ -5326,32 +5394,30 @@ msgstr "" msgid "Show all reported hours" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 -msgid "LibrePlan: Subcontracted Tasks" -msgstr "" - +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 msgid "Projects List" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:137 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:65 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:49 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:51 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:52 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:136 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:44 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:80 msgid "Generate code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:116 msgid "Scheduling state" msgstr "" @@ -5363,19 +5429,27 @@ msgstr "" msgid "The code sequence is already in use and it can not be updated." msgstr "" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 -msgid "LibrePlan: Project Costs Per Resource" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:332 +msgid "Import LDAP roles" +msgstr "" + +#: libreplan-webapp/src/main/webapp/settings/settings.zul:43 +msgid "Personal Data" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:206 msgid "criterion satisfaction's criterion not specified" msgstr "" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21 +msgid "LibrePlan: Hours Worked Per Resource" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:163 msgid "Number of iterations should be between 1 and " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:126 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" @@ -5393,11 +5467,11 @@ msgstr "" msgid "Profiles authorization" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293 msgid "Virtual Workers Groups" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:144 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:95 msgid "Planning charts expanded" msgstr "" @@ -5405,7 +5479,11 @@ msgstr "" msgid "Assignation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:431 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:694 +msgid "Inh" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:339 msgid "Not deletable" msgstr "" @@ -5421,7 +5499,7 @@ msgstr "" msgid "Projects list" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:190 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:973 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" @@ -5430,41 +5508,40 @@ msgstr "" msgid "Criterion Type List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:732 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:702 msgid "Overall progress" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:52 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54 msgid "Create template from selected task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:119 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:129 msgid "All projects" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:79 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 msgid "Password" msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:93 msgid "Observations" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:962 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942 msgid "Edit project" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:27 msgid "Progress assignments" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:27 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:285 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:262 msgid "Valid from" msgstr "" @@ -5476,24 +5553,24 @@ msgstr "" msgid "There exists other template with the same name." msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53 msgid "Month" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:900 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:911 msgid "{0} could not be allocated. Cannot allocate more than one resource" msgstr "" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:56 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 msgid "Color" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759 -msgid "Advanced assignment saved" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:105 +msgid "Current password is incorrect" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367 msgid "Cannot insert material in general view. Please, select a category" msgstr "" @@ -5501,42 +5578,50 @@ msgstr "" msgid "criterion satisfaction's start date not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:371 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405 msgid "Only {0} resources per day were achieved for current allocation" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311 +msgid "Delete {0} \"{1}\". Are you sure?" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:270 +msgid "Base:" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:79 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:97 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 -#: libreplan-webapp/src/main/webapp/planner/order.zul:69 -#: libreplan-webapp/src/main/webapp/planner/order.zul:132 -#: libreplan-webapp/src/main/webapp/planner/order.zul:167 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:83 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:43 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 msgid "Accept" msgstr "" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:266 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:273 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:280 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:308 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 msgid "Example: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:303 -#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:40 -msgid "Edit Worker" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:458 msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:190 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:167 msgid "Work report lines" msgstr "" @@ -5545,15 +5630,15 @@ msgstr "" msgid "Calculated" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:213 msgid "Completed: {0}% " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:118 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:229 msgid "Error setting up edition form for Criterion Type with id: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1178 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181 msgid "Calculated progress measurement can not be removed" msgstr "" @@ -5562,22 +5647,22 @@ msgstr "" msgid " The " msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:51 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:55 msgid "Access to the system" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:48 msgid "Probability" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159 msgid "Click on " msgstr "" @@ -5586,6 +5671,10 @@ msgstr "" msgid "Report data" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 +msgid "UserId:" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44 msgid "External load" msgstr "" @@ -5594,6 +5683,10 @@ msgstr "" msgid "Progress sent successfully" msgstr "" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 +msgid "Order elements" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46 msgid "instance not found" msgstr "" @@ -5602,67 +5695,72 @@ msgstr "" msgid "Priority" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:207 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:219 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Infinitely Over Assignable" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:425 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 +msgid "Apply changes and continue edition" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426 msgid "criterion names must be unique inside a criterion type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:735 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:790 msgid "" "The periods available depend on the satisfaction of the criteria by the " "resources and their calendars." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:814 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:79 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:59 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:287 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:44 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:131 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:264 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:69 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:47 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:76 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79 #: libreplan-webapp/src/main/webapp/materials/materials.zul:59 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:81 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:36 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:80 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:51 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:40 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:76 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 msgid "Code" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:41 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40 msgid "Add stretch" msgstr "" @@ -5674,7 +5772,7 @@ msgstr "" msgid "Assignation type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:387 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367 msgid "Calculate Workable Days" msgstr "" @@ -5684,16 +5782,16 @@ msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 -#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:55 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 +#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:53 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117 msgid "Start date" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:171 msgid "Update exception" msgstr "" @@ -5706,8 +5804,7 @@ msgstr "" msgid "Budget" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "May" msgstr "" @@ -5715,7 +5812,7 @@ msgstr "" msgid "Already exists other criterion with the same name" msgstr "" -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38 msgid "Unit name" msgstr "" @@ -5724,10 +5821,6 @@ msgstr "" msgid "Write" msgstr "" -#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21 -msgid "LibrePlan: Labels" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 @@ -5736,7 +5829,7 @@ msgstr "" msgid "Project code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:499 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503 msgid "Assign element to queue automatically" msgstr "" @@ -5750,32 +5843,27 @@ msgid "" "calendar popup or type in date directly)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:603 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:317 msgid "Date cannot be null" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:765 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:169 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:108 +msgid "Project view" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:774 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:166 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:76 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:142 msgid "Task Code" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:157 -msgid "Project view" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:96 -msgid "Create Profile" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:747 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:655 msgid "This label type already is assigned to the work report type." msgstr "" @@ -5790,50 +5878,48 @@ msgstr "" msgid "New criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:730 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:346 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:542 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:700 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:813 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:937 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:60 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:682 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:65 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:82 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:81 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:41 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:120 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 msgid "Description" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24 -msgid "LibrePlan: Criteria" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:45 +msgid "Apply" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117 -msgid "Go to advanced Allocation" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:660 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:671 msgid "already exists an allocation for criteria {0}" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 msgid "Project Templates" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339 msgid "Forward" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:465 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469 msgid "Invalid queue element" msgstr "" @@ -5847,21 +5933,22 @@ msgstr "" msgid "Unnasigned" msgstr "" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:70 -#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 msgid "User" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 msgid "At least one HoursGroup is needed" msgstr "" -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71 msgid "Interacts with applications" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:257 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:289 msgid "Virtual worker" msgstr "" @@ -5869,7 +5956,7 @@ msgstr "" msgid "Length percentage should be between 0 and 100" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:48 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:50 msgid "Multiple values per resource" msgstr "" @@ -5882,13 +5969,13 @@ msgstr "" msgid "Split" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:101 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:105 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:107 msgid "please, select a project" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:118 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:122 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "" @@ -5898,14 +5985,14 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:94 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 msgid "Starting date" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:63 msgid "Add materials" msgstr "" @@ -5913,66 +6000,61 @@ msgstr "" msgid "Load 100%" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:991 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84 msgid "Function" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:775 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:394 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:745 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:364 msgid "date in future" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:654 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:630 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851 msgid "New project version" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:156 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:137 msgid "Format" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:174 -msgid "Edit Unit Type" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:332 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:474 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1249 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:472 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:532 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:27 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:24 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:39 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:41 #: libreplan-webapp/src/main/webapp/templates/_list.zul:48 msgid "Edit" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 msgid "Init date" msgstr "" @@ -5980,7 +6062,15 @@ msgstr "" msgid "Responsible" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:457 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:60 +msgid "New password" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 +msgid "Port:" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352 msgid "percentage must be in range (0,100]" msgstr "" @@ -5989,7 +6079,7 @@ msgstr "" msgid "New Description" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1154 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150 msgid "" "resources cost category assignment codes must be unique inside a resource" msgstr "" @@ -6006,22 +6096,23 @@ msgid "" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61 +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:85 msgid "Unable to convert {0} value to {1} type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:114 msgid "Tree {0} sucessfully flattened" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:83 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:82 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Project Code" msgstr "" @@ -6033,15 +6124,11 @@ msgstr "" msgid "Reassigning" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:588 -msgid "" -"Cannot delete that cost category because there are resources assigned to it." -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:633 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:644 msgid "{0} already assigned to resource allocation list" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:184 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:27 msgid "Unit Measure" msgstr "" @@ -6057,14 +6144,13 @@ msgstr "" #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:128 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:98 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:127 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:101 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:42 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 @@ -6074,37 +6160,40 @@ msgstr "" #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:83 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:123 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:103 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:144 msgid "Type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:347 msgid "{0} projects reassignation remaining" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:637 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:542 msgid "" "This machine cannot be deleted because it has assignments to projects or " "imputed hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "November" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1310 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:89 +msgid "Enable/Disable" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." @@ -6118,68 +6207,62 @@ msgstr "" msgid " in the specified directory." msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1148 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144 msgid "criterion satisfaction codes must be unique inside a resource" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 msgid "no" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:347 msgid "missing code in a work report." msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:85 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 msgid "Criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:94 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:103 msgid "unl" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:76 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:290 +msgid "Test LDAP connection" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:96 msgid "Generate code for" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:397 -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:481 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:468 #: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103 msgid "missing code in a label" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:139 -msgid "is not supported for its use with LibrePlan." -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:123 msgid "Actual Cost Work Performed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:185 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172 msgid "Create project from Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 -msgid "LibrePlan Configuration" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" " and should not be empty" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 -msgid "Average of the worked hours" -msgstr "" - #: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43 msgid "an authorization type must be set" msgstr "" @@ -6188,65 +6271,68 @@ msgstr "" msgid "Must start after (days since beginning project)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:653 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:629 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:68 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:44 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:74 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:45 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:80 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:163 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:92 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:133 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105 msgid "Add" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:47 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:48 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:82 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120 msgid "Unselect" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:609 msgid "You should select the type of exception" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:99 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +msgid "Group path:" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Subcontracted Tasks" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:118 msgid "Filter by categories or materials" msgstr "" @@ -6254,7 +6340,7 @@ msgstr "" msgid "Amount work percentage should be between 0 and 100" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 msgid "Machine data" msgstr "" @@ -6262,19 +6348,18 @@ msgstr "" msgid "VAC" msgstr "" -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:28 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:29 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 msgid "Label type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:246 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:319 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:243 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236 msgid "Advanced Allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:309 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 msgid "Administration / Management" msgstr "" @@ -6286,8 +6371,8 @@ msgstr "" msgid "Template Tree" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:499 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 msgid "Alpha" msgstr "" @@ -6300,20 +6385,20 @@ msgstr "" msgid "inconsistent parent code." msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:430 +msgid "effort is not properly calculated based on clock" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:63 msgid "Status" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:163 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:111 msgid "Resource load view" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763 -msgid "the date must be inside the visualization area" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 @@ -6322,32 +6407,40 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 #: libreplan-webapp/src/main/webapp/orders/_list.zul:34 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:69 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:76 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 msgid "Hours" msgstr "" -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:733 +msgid "the date must be inside the visualization area" +msgstr "" + +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56 msgid "Quality form type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:392 msgid "work report has not this label type assigned" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1230 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192 msgid "Limiting assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523 msgid "date not specified." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318 +msgid "{0} \"{1}\" deleted" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364 msgid " hours" msgstr "" @@ -6355,43 +6448,40 @@ msgstr "" msgid "The name of the criterion is empty." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:134 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:147 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 msgid "Limiting Resources Planning" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:770 -msgid "The max value must be not empty" -msgstr "" - -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:66 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69 msgid "New label" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:134 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:137 msgid "Worker ID cannot be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:177 -msgid "All project tasks" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352 msgid "The start date cannot be null" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:188 +msgid "All project tasks" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:367 +msgid "LDAP Roles (separated by ;)" +msgstr "" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 msgid "Allocation configuration" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:125 -msgid "Scenario \"{0}\" saved" -msgstr "" - -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:215 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:209 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:189 msgid "Save & New work report" msgstr "" @@ -6400,39 +6490,39 @@ msgstr "" msgid "Subcontract price" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:744 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:799 msgid "Resources per day are zero" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 msgid "Assigned criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:53 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:57 msgid "Help on authentication (opens a new window)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:870 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:778 msgid "The length must be greater than 0, and not null." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:39 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54 msgid "Not a valid effort duration" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:544 +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:199 +msgid "Cannot remove the predefined Exception Day Type \"{0}\"" +msgstr "" + +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 +msgid "Base calendar type" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:613 msgid "Could not save new calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1467 -msgid "Sigmoid function applied to current resource" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:160 -msgid "Deleted unit type {0}" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:224 msgid "Could not save the scenario" msgstr "" @@ -6441,43 +6531,40 @@ msgstr "" msgid "Couldn't find criterion {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:35 msgid "Apply filtering to tasks satisfying required criteria" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:345 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:887 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:32 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:32 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:51 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:52 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:54 msgid "Create" msgstr "" @@ -6486,76 +6573,76 @@ msgstr "" msgid "Permissions" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1728 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1734 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1716 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1722 msgid "please, select a work report type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:486 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:487 msgid "List of materials for category: {0}" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 +msgid "Cancel edition" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 msgid "Total price" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:436 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1230 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:786 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1044 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1295 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625 +#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46 +msgid "Labels without inheritance" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:886 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1454 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:138 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818 -#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:126 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:362 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:223 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1265 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1204 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:694 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:948 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:954 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:232 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45 #: 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/externalcompanies/_listExternalCompanies.zul:49 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:92 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:66 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:44 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 @@ -6564,19 +6651,19 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127 msgid "Delete" msgstr "" @@ -6600,43 +6687,99 @@ msgstr "" msgid "line" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:150 +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34 +msgid "Use browser language configuration" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:35 +msgid "Galician" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36 +msgid "Spanish" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:37 +msgid "English" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:38 +msgid "Russian" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 msgid "unlimited" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 msgid "Monday" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 msgid "Tuesday" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 msgid "Wednesday" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 msgid "Thursday" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 msgid "Friday" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 msgid "Saturday" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:85 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101 msgid "Sunday" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31 +msgid "red (default)" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32 +msgid "green" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33 +msgid "blue" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34 +msgid "cyan" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35 +msgid "magenta" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36 +msgid "yellow" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37 +msgid "black" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38 +msgid "orange" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39 +msgid "purple" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "Yes" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "No" msgstr "" @@ -6644,35 +6787,19 @@ msgstr "" msgid "STRATEGIC RESOURCE" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:37 -msgid "WORK_RELATIONSHIP" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:39 +msgid "LOCATION" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:43 -msgid "LOCATION_GROUP" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:50 -msgid "MACHINE LOCATION_GROUP" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:58 -msgid "LEAVE" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:64 -msgid "TRAINING" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:70 -msgid "JOB" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:76 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:46 msgid "CATEGORY" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:206 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:53 +msgid "SKILL" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207 msgid "[generic all machines]" msgstr "" @@ -6712,15 +6839,15 @@ msgstr "" msgid "by items" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:107 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109 msgid "Hours cost type cannot be empty or null" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:116 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118 msgid "Init date cannot be empty or null" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:121 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123 msgid "End date cannot be empty or null" msgstr "" @@ -6762,23 +6889,23 @@ msgid "" "HoursGroup" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:577 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 msgid "" "Some ancestor has the same label assigned, so this element is already " "inheriting this label" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:676 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 msgid "Cannot spread two progress in the same task" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:700 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:726 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 msgid "Duplicate Progress Assignment For Task" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1053 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 msgid "Quality form already exists" msgstr "" @@ -6876,14 +7003,18 @@ msgid "You can not modifiy this entity sequence, it is already in use" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36 -msgid "Progress with all tasks by hours" +msgid "Spreading progress" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37 -msgid "Progress with critical path tasks by hours" +msgid "Progress with all tasks by hours" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38 +msgid "Progress with critical path tasks by hours" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39 msgid "Progress with critical path tasks by duration" msgstr "" @@ -6904,19 +7035,19 @@ msgstr "" msgid "Success sent" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:58 -msgid "None" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76 +msgid "Flat" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:59 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78 msgid "Stretches" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:60 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 msgid "Interporlation" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:61 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 msgid "Sigmoid" msgstr ""