diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot index 1a555cf52..689168088 100644 --- a/ganttzk/src/main/resources/i18n/keys.pot +++ b/ganttzk/src/main/resources/i18n/keys.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: libreplan-1.2.3\n" +"Project-Id-Version: libreplan-1.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-11 08:32+0200\n" +"POT-Creation-Date: 2012-06-29 17:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -43,10 +43,6 @@ msgstr "" msgid "Show reported hours" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90 -msgid "by criteria" -msgstr "" - #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85 msgid "Show/Hide reported hours" msgstr "" @@ -76,10 +72,6 @@ msgstr "" msgid "Task" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89 -msgid "by resources" -msgstr "" - #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199 msgid "available effort: {0}, assigned effort: {1}" msgstr "" @@ -108,14 +100,14 @@ msgstr "" msgid "See scheduling" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 -msgid "Show" -msgstr "" - #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30 msgid "End" msgstr "" +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89 +msgid "Resources" +msgstr "" + #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243 msgid "changing zoom" msgstr "" @@ -124,10 +116,22 @@ msgstr "" msgid "Show/Hide money cost bar" msgstr "" +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:47 +msgid "Group by" +msgstr "" + +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90 +msgid "Generic allocation criteria" +msgstr "" + #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45 msgid "Quarter" msgstr "" +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 +msgid "Page" +msgstr "" + #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "None" msgstr "" @@ -145,10 +149,6 @@ msgstr "" msgid "Name" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50 -msgid "Name filter" -msgstr "" - #: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:641 msgid "Show progress" msgstr "" diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot index d0e60e136..e9ff9e97c 100644 --- a/libreplan-webapp/src/main/resources/i18n/keys.pot +++ b/libreplan-webapp/src/main/resources/i18n/keys.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: libreplan-1.2.4\n" +"Project-Id-Version: libreplan-1.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-04 13:15+0200\n" +"POT-Creation-Date: 2012-06-29 17:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,25 +18,29 @@ 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:373 -msgid "The resource cannot be null" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:436 +msgid "currency code not specified" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:495 +msgid "You do not have permissions to create new users" +msgstr "" + +#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:95 +msgid "Availability ratio" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:358 msgid "Group path" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420 -msgid "criterion codes must be unique inside a criterion type" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:96 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:92 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/_customMenu.zul:71 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:59 msgid "en" msgstr "" @@ -48,28 +52,25 @@ msgstr "" msgid "Create exception" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:43 msgid "Select report data" 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:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:61 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:86 -#: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:63 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:88 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:58 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:174 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 @@ -80,26 +81,34 @@ msgstr "" #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 -#: 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/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/schedulingProgressPerOrderReport.zul:118 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97 -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:34 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:110 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:127 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:169 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 +#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:33 +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:41 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 +#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:40 +#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:37 +#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:42 +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:59 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:60 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:58 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:52 +#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:29 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:258 #: libreplan-webapp/src/main/webapp/calendars/_list.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 @@ -117,20 +126,22 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:279 #: libreplan-webapp/src/main/webapp/orders/_list.zul:36 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:226 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:143 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:246 msgid "Operations" msgstr "" -#: 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" +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:41 +msgid "Basic data" +msgstr "" + +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:95 +msgid "New deliver date" msgstr "" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84 @@ -138,47 +149,61 @@ msgstr "" msgid "Select" msgstr "" -#: 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:1517 msgid "It can not be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:35 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:48 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:176 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:57 msgid "Materials" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:357 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:361 msgid "Reassign" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64 -msgid "Description cannot be null or empty" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:180 +msgid "Not bound" msgstr "" -#: 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:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:46 +msgid "By critical path hours" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:159 msgid "MonteCarlo Method" msgstr "" -#: 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:181 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:34 +msgid "No deadline" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:238 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:256 msgid "Project Scheduling" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:236 +msgid "Cost of expenses" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 msgid "February" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLabelTypeAssigment.java:61 +msgid "label type not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:29 msgid "Managing fields and labels" msgstr "" @@ -197,13 +222,14 @@ msgid "Predefined" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:49 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:59 msgid "Quality Forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:495 msgid "Reports" msgstr "" @@ -211,12 +237,8 @@ msgstr "" msgid "Create task" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 -msgid "LibrePlan: Advanced allocation" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 -msgid "The {0} sequence prefixes can not be repeated" +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:118 +msgid "username not specified" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340 @@ -225,24 +247,39 @@ msgid "" "values cannot be modified" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:186 +msgid "The {0} sequence prefixes can not be repeated" +msgstr "" + +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22 +msgid "LibrePlan: Advanced allocation" +msgstr "" + #: 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:285 -msgid "Stretch date must not be less than task start date: " +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1569 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1575 +msgid "please, select a timesheet template type" msgstr "" #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:68 msgid "Dedication chart" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:748 -msgid "Not the same hours group, impossible to update" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 +msgid "Sum of expenses imputed in children tasks" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:694 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:721 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1130 +msgid "" +"there exist criterion satisfactions referring tocriterion types not " +"applicable to this resource" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:710 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:741 msgid "Progress that are reported by quality forms can not be modified" msgstr "" @@ -250,13 +287,16 @@ msgstr "" msgid "Own exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:526 msgid "Cannot delete that material because it is assigned to a project." msgstr "" -#: 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 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java:169 +msgid "Alpha must be greater than 0" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:138 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:160 msgid "Resource Usage" msgstr "" @@ -268,16 +308,25 @@ msgstr "" msgid "Active period from" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:40 +msgid "Work done" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:485 msgid "Unassign" msgstr "" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:36 +msgid "Filter timesheet lines by" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:505 msgid "Manual assignment" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:302 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:412 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:68 msgid "Companies" msgstr "" @@ -285,28 +334,30 @@ msgstr "" msgid "Quality form items list" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:218 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:240 -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:520 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:885 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:514 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1054 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128 msgid "Create {0}: {1}" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:197 +msgid "entity name not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:414 +msgid "You do not have permissions to go to worker edition window" +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/resourceload/ResourceLoadController.java:310 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 msgid "The project has no scheduled elements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:800 msgid "Hour start" msgstr "" @@ -316,15 +367,11 @@ msgstr "" msgid "Start" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:34 -msgid "Progress Report" -msgstr "" - #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:119 msgid "cost assignment's category not specified" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:96 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:112 msgid "Check for updates" msgstr "" @@ -336,67 +383,95 @@ msgstr "" 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" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:256 +msgid "Number of Tasks / % Deviation" msgstr "" #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:37 msgid "Resources capability" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:501 +msgid "must be greater or equal than 0" +msgstr "" + #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:107 msgid "changing perspective" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:124 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:120 msgid "" "Could not add those authorizations to profile {0} because they were already " "present." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:63 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:160 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/ResourceCalendar.java:78 +msgid "resource not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java:76 +msgid "measure not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:64 msgid "Default calendar" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156 +#: libreplan-business/src/main/java/org/libreplan/business/requirements/entities/CriterionRequirement.java:68 +msgid "criterion not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158 msgid "Click on this" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:53 msgid "Project Name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1100 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1171 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 msgid "Indent" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:252 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:256 msgid "Reassignation" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:311 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:331 msgid "Save passwords in database" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1432 +msgid "a quality form can not be assigned twice to the same order element" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:42 msgid "New template" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:977 +msgid "Delete bound user" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:61 +msgid "unit price not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:38 msgid "Total estimated hours" msgstr "" @@ -419,6 +494,14 @@ msgstr "" msgid "Locations" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:167 +msgid "timeshet template name is already being used" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:520 +msgid "The code must be unique." +msgstr "" + #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "New quality form item" msgstr "" @@ -427,41 +510,38 @@ msgstr "" msgid "LibrePlan: Labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:252 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:253 msgid "LDAP connection was successful" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 -msgid "Login name" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:349 +msgid "" +"This resource allocation type is incompatible. The task has an associated " +"order element which has a progress that is of type subcontractor. " +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:87 +msgid "position not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:56 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43 +msgid "Current" 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/webapp/reports/workingArrangementsPerOrderReport.zul:63 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:65 msgid "Dependencies" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:187 -msgid "missing code in a calendar exception" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:78 msgid "Current selection" msgstr "" -#: 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" -msgstr "" - -#: libreplan-webapp/src/main/webapp/templates/templates.zul:66 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:47 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 msgid "Criterion Requirement" @@ -479,12 +559,21 @@ msgstr "" msgid "You can not remove a scenario with derived scenarios" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:91 -msgid "Available materials" +#: libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/OrderVersion.java:55 +msgid "owner scenario not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:950 -msgid "Work Report Types" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:98 +msgid "Expense sheet \"{0}\" deleted" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:117 +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:118 +msgid "the expense sheet must have least a expense sheet line." +msgstr "" + +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:91 +msgid "Available materials" msgstr "" #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55 @@ -508,10 +597,6 @@ msgstr "" msgid "Client" 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/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 msgid "" @@ -519,34 +604,31 @@ msgid "" "can't be added" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1503 +msgid "must be later than start date" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:351 msgid "Role search strategy" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:480 -msgid "Error on showing warning message removing calendar: " -msgstr "" - -#: 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" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:163 +msgid "It already exists a deliver date with the same date. " msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:153 msgid "material category name has to be unique. It is already used" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:169 msgid "Imputed hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 -msgid "Project Costs Per Resource" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java:74 +msgid "progress should be greater than 0% and less than 100%" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:456 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "" @@ -555,12 +637,12 @@ msgstr "" msgid "Delete Milestone" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:155 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:171 msgid "default password were not changed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112 -msgid "Type of hours" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:247 +msgid "external company should be subcontractor" msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:48 @@ -577,12 +659,12 @@ msgid "" "criterionSatisfaction from the same criterionType" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:333 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 msgid "Group strategy" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 -msgid "Work Report Lines" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1071 +msgid "Budget: {0}, Consumed: {1} ({2}%)" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1555 @@ -593,66 +675,72 @@ msgstr "" msgid "October" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:58 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:54 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:59 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:61 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 msgid "First name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:250 -msgid "Could not execute print command" -msgstr "" - #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122 msgid "Complementary text fields" msgstr "" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 +msgid "LibrePlan: Send To Subcontractors" +msgstr "" + +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:229 +msgid "Cost of hours" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 -#: 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:452 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:211 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1220 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:829 msgid "Confirm deleting {0}. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:37 -msgid "Work Reports List" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 -msgid "Accounts" -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50 msgid "Edit selected task" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:220 msgid "External code" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:49 +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:51 msgid "View" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 msgid "Limiting" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:225 +msgid "subcontratation date not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:164 +msgid "base not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:60 msgid "Required materials" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:315 msgid "Backwards" msgstr "" -#: 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" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:181 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:104 +msgid "Existing user" msgstr "" #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52 @@ -664,28 +752,24 @@ msgstr "" msgid "Version" msgstr "" +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:35 +msgid "Communications To Customers" +msgstr "" + #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 msgid "Up" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:184 -msgid "" -"CriterionType is not valid, it overlaps other criterionSatisfaction with the " -"same criterionType" -msgstr "" - -#: libreplan-webapp/src/main/webapp/common/configuration.zul:138 -msgid "Types of work hours" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:252 msgid "EAC" msgstr "" -#: 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" +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:539 +msgid "it already exists another expense sheet with the same code." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:597 +msgid "Not workable day" msgstr "" #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39 @@ -700,8 +784,13 @@ msgstr "" msgid "Please select a task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 -msgid "missing worker code in the work report" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java:171 +msgid "order element associated to a task must be not null" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:473 +msgid "" +"only one timesheet line per day and task is allowed in monthly timesheets" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 @@ -713,49 +802,65 @@ msgstr "" #: 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/hoursWorkedPerWorkerReport.zul:55 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:58 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:125 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:57 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:60 +#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:36 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:277 msgid "End date" msgstr "" +#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 +msgid "LibrePlan: Calendar Exception Days" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:983 +msgid "Worker and bound user deleted" +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/settings/settings.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:84 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:71 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:122 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:158 msgid "E-mail" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:112 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:115 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106 msgid "This project has already been added." 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:598 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:558 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:619 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:134 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:54 msgid "Criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:27 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:28 msgid "User data" msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 msgid "Resource / Criteria" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionField.java:71 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionValue.java:71 +msgid "field name not specified or empty" +msgstr "" + #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "" @@ -764,7 +869,7 @@ msgstr "" msgid "Add new progress assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1284 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1323 msgid "" "Value must be a multiple of the precision value of the progress type: {0}" msgstr "" @@ -773,12 +878,15 @@ msgstr "" msgid "Set Filter Options" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:979 -msgid "Error on showing warning message removing workReportType: " +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:370 +#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:22 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:62 +msgid "Expenses" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:633 -msgid "Edit Work Report" +#: libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java:145 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:165 +msgid "name is already used" msgstr "" #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:22 @@ -789,26 +897,30 @@ msgstr "" msgid "Project version is the same in source and destination scenarios" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:210 +msgid "Quality form item name must be unique" +msgstr "" + +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:50 +msgid "Subcontracting communication date" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31 msgid "Personal data" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:202 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159 msgid "please, select a Criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:725 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:745 msgid "Calculated progress can not be removed" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:112 -msgid "Work reports" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "June" msgstr "" @@ -817,7 +929,7 @@ msgstr "" msgid "{0} annotation required on {1}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1217 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1296 msgid "Modified" msgstr "" @@ -829,20 +941,26 @@ msgstr "" msgid "You can not remove the current scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:655 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:664 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1223 +msgid "inherited exception can not be removed" +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:335 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:457 msgid "MessagesContainer is needed" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 -msgid "Project element code" +#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:103 +msgid "" +"Load percentage of resources participating in the project while they are " +"assigned" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:58 #: 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 @@ -850,23 +968,23 @@ msgstr "" msgid "Ending date" msgstr "" -#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21 +#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:22 msgid "LibrePlan: Page not found" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:576 +msgid "project name is already being used" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:29 msgid "Export options" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_list.zul:21 +#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:21 msgid "Templates List" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:34 -msgid "Subcontracted Tasks List" -msgstr "" - -#: libreplan-webapp/src/main/webapp/common/configuration.zul:224 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 msgid "Last value" msgstr "" @@ -874,15 +992,15 @@ msgstr "" msgid "Average of worked hours in finished applications" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:698 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:714 msgid "Calculated progress can not be modified" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:58 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:60 msgid "Work done from starting date" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:70 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:51 msgid "Statistics log" msgstr "" @@ -891,30 +1009,28 @@ msgstr "" msgid "Edit Calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:235 +msgid "item" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:119 msgid "Profile" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:491 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:39 msgid "Materials Needs At Date" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:276 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:296 msgid "UserDn" 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:59 -msgid "Cannot be empty or null" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233 msgid "{0} \"{1}\" saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:301 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:307 msgid "filtering" msgstr "" @@ -926,13 +1042,13 @@ msgstr "" msgid "Hierarchy" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:815 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:962 msgid "" "This worker cannot be deleted because it has assignments to projects or " "imputed hours" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:64 msgid "Work done until ending date" msgstr "" @@ -941,12 +1057,16 @@ msgstr "" msgid "Print configuration" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:422 +msgid "There is another timesheet template with the same code" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:27 msgid "Overload due to other assignments" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117 -msgid "Types of hours" +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:104 +msgid "Expense properties" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:149 @@ -961,36 +1081,43 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:213 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165 msgid "This Criterion has already been added." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:206 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:226 msgid "add" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:876 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:112 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:951 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:86 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:69 msgid "Budget value cannot be negative" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:239 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:395 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1135 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:243 msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:290 +msgid "please select a user to bound" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:38 msgid "NON_LIMITING" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:49 msgid "Workers" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeModel.java:102 -msgid "Cannot remove {0}, since it is being used by some Exception Day" +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:45 @@ -1005,11 +1132,11 @@ msgstr "" msgid "with" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:297 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:293 msgid "Label Type" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:48 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:50 msgid "Year" msgstr "" @@ -1017,35 +1144,66 @@ msgstr "" msgid "{0} \"{1}\" could not be deleted, it was already removed" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:422 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:70 +msgid "Received From Subcontractors" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68 msgid "profile name not specified" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:62 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:112 +msgid "you do not have permissions to create new labels" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1364 +msgid "" +"Date is not valid, it must be greater than the last progress reported to the " +"customer" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:421 +msgid "In Heading the index labels and fields must be unique and consecutive." +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Start" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1280 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1319 msgid "Value is not valid, the current value must be less than max value" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/order.zul:105 -#: 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 -msgid "Value" +#: libreplan-webapp/src/main/webapp/typeofworkhours/typeOfWorkHours.zul:23 +msgid "LibrePlan: Hours Types" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:44 +msgid "By all tasks hours" msgstr "" #: 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:773 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:137 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:168 +#: libreplan-webapp/src/main/webapp/planner/order.zul:105 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:58 +#: 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/orders/_listOrderElementHours.zul:87 +msgid "Value" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:809 msgid "there are no valid periods for this calendar" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:101 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:132 +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:54 msgid "Add role" msgstr "" @@ -1054,13 +1212,13 @@ msgstr "" msgid "Exception end date should be greater or equals than start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:474 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:484 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:517 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:527 msgid "Repeated Project code {0} in Project {1}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:277 -msgid "Project from client" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:285 +msgid "Stretch date must not be before task start date: " msgstr "" #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:22 @@ -1073,32 +1231,50 @@ msgid "" "other criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:257 msgid "Schedule Performance Index" msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:141 msgid "Earlier starting date" msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:27 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:27 msgid "Type data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:122 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:536 +msgid "The code cannot be empty and it must be unique." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:124 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:401 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:67 msgid "Profiles" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:255 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:60 +msgid "Monthly timesheet \"{0}\" saved" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:96 +msgid "init date not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:46 +#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:35 +msgid "First expense" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 msgid "Host" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:804 msgid "Hour finish" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:178 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:198 msgid "Perspectives" msgstr "" @@ -1106,11 +1282,7 @@ msgstr "" msgid "Workable time" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:240 -msgid "missing code in a subcategory" -msgstr "" - -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:66 +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:67 msgid "Non limiting resource allocation" msgstr "" @@ -1118,11 +1290,19 @@ msgstr "" msgid "Company name" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:67 +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Limiting resource allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:463 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 +msgid "LibrePlan: Send To Customers" +msgstr "" + +#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:85 +msgid "Resources usage" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:464 msgid "Split new assignment" msgstr "" @@ -1131,7 +1311,7 @@ msgid "Expiry date" msgstr "" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73 msgid "Pagination" msgstr "" @@ -1141,11 +1321,11 @@ msgid "" "spread associated with this quality form" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:82 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:86 msgid "Change scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloModel.java:84 +#: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloModel.java:70 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:69 msgid "Critical path" msgstr "" @@ -1155,14 +1335,14 @@ msgid "" "Deleting this item, it will disable the report progress option. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:41 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:43 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:77 msgid "Categories" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:46 -#: 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:47 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:181 msgid "Project Details" msgstr "" @@ -1178,7 +1358,7 @@ msgstr "" msgid "Cancel changes and back to scheduling" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 #: libreplan-webapp/src/main/webapp/planner/order.zul:106 @@ -1187,11 +1367,15 @@ msgstr "" msgid "Percentage" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:137 -msgid "Updated" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:229 +msgid "default max value of percentage advance type must be 100" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:81 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:51 +msgid "Remaining time" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:88 msgid "Company logo URL" msgstr "" @@ -1199,12 +1383,12 @@ msgstr "" msgid "No worker selected" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:204 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:222 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:224 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 msgid "Number of digits" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1639 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:294 msgid "Task not found" msgstr "" @@ -1213,7 +1397,7 @@ msgstr "" msgid "Total capability" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:217 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:224 msgid "Problems connecting with client web service" msgstr "" @@ -1222,89 +1406,126 @@ msgstr "" msgid "Exception Type" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:22 -msgid "Profiles List" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:155 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:169 +msgid "The current value must be less than the max value." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1082 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:226 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:606 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:76 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:46 +#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:138 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:56 +msgid "Labels" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:278 msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1006 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:241 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:697 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:585 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:65 -#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 -msgid "Labels" +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:22 +msgid "Profiles List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 -msgid "Data Types" -msgstr "" - -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 -msgid "Total hours" -msgstr "" - -#: libreplan-webapp/src/main/webapp/settings/settings.zul:38 -msgid "Data" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:106 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47 +msgid "New timesheet" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:344 msgid "Reassigning {0} projects" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:152 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:195 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 +msgid "Total hours" +msgstr "" + +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:39 +msgid "Data" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:57 msgid "Filter by task status" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:529 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:416 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:74 +msgid "BAC (Budget At Completion)" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:490 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:418 msgid "Select date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:631 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1267 -msgid "You should select a end date for the exception" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:264 +msgid "state not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300 +msgid "" +"Spread progress cannot be removed. Please select another progress as spread." msgstr "" #: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:34 msgid "Please try it again." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:56 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:57 msgid "Company code" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62 -msgid "Sum of imputed hours in children tasks" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:110 msgid "Unknown attribute '{0}' in class {1}" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:62 +msgid "Sum of imputed hours in children tasks" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:96 msgid "passwords can not be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:699 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:851 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33 msgid "NON LIMITING RESOURCE" 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-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:110 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:176 +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:72 +msgid "order element not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1093 +msgid "Task {0}" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:40 +msgid "" +"Please try to contact with any administrator in order to review your " +"permissions in LibrePlan." +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Machine.java:101 +msgid "machine name not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:93 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:139 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 msgid "already assigned" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:390 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:388 msgid "Passed" msgstr "" @@ -1312,22 +1533,24 @@ msgstr "" msgid "Activation periods" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:511 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:505 #: libreplan-webapp/src/main/webapp/planner/order.zul:151 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:90 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:75 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:133 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:152 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:76 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:138 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:168 msgid "Calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:307 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:355 +#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:79 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:148 msgid "Resources" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:48 +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:56 msgid "" "LDAP users cannot change their password if LDAP authentication is enabled. " "Talk to one of the administrators" @@ -1342,37 +1565,65 @@ msgstr "" msgid "Source and destination scenarios should be different" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:141 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:142 msgid "The browser you are using" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:78 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:82 msgid "scenario" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:51 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:52 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:59 #: 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-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:115 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:122 msgid "worker's first name not specified" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1407 +msgid "End date can only be deleted in the the last activation" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:354 msgid "Property strategy" msgstr "" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:107 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:276 +msgid "Save date" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:248 +msgid "" +"The quality item positions must be correct in function to the percentage." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:521 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:82 +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:146 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:137 +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:139 msgid "date not specified" msgstr "" -#: 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 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:718 +msgid "" +"You can not remove the task \"{0}\" because it has work reported on it or " +"any of its children" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:427 +msgid "In Lines the index labels and fields must be unique and consecutive." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:197 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:215 msgid "Projects Planning" msgstr "" @@ -1380,22 +1631,22 @@ msgstr "" msgid "Shrink to fit page width" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:770 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:798 msgid "The max value must be greater than 0" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:63 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:59 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:248 +msgid "Limiting resources cannot be bound to any user" +msgstr "" + +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:61 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:65 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:73 msgid "Last name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:254 -msgid "cost category name not specified" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:382 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:575 msgid "Remove" msgstr "" @@ -1403,7 +1654,11 @@ msgstr "" msgid "Planned workable days" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:131 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionField.java:80 +msgid "length less than 1" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:256 msgid "SPI" msgstr "" @@ -1411,30 +1666,30 @@ msgstr "" msgid "Progress Type" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:85 +msgid "name not specified or empty" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:304 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:324 msgid "UserId" 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/java/org/libreplan/web/calendars/BaseCalendarModel.java:509 msgid "This date can not include the whole previous work week" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:245 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:220 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:119 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:123 msgid "Create New Project" msgstr "" @@ -1446,54 +1701,65 @@ msgstr "" msgid "to {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21 +msgid "LibrePlan: Total Worked Hours By Resource In A Month" +msgstr "" + +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:65 msgid "Zoom" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:863 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:910 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:115 -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:118 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:180 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:232 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:81 -#: libreplan-webapp/src/main/webapp/settings/settings.zul:124 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:70 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:144 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 -#: 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/users/_editUser.zul:185 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:125 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:124 +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:89 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:127 +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:70 +#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:41 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 +#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:41 +#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:42 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44 +#: 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/_workers.zul:48 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:379 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:59 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:77 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:399 msgid "Save" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:156 +msgid "" +"It will only be possible to add a Deliver Date if all the deliver date " +"exiting in the table have a CommunicationDate not empty. " +msgstr "" + #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72 msgid "Standard Effort" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:142 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:158 msgid "Material categories" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:283 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:578 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:676 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:284 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:587 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:685 msgid "number of digits must be between {0} and {1}" msgstr "" @@ -1501,15 +1767,11 @@ msgstr "" msgid "Criteria Requirement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:134 -msgid "Pending update" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:158 msgid "Criterion previously selected" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:881 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:909 msgid "" "Spread progress cannot be changed if there is a consolidation in any " "progress assignment from root task" @@ -1519,16 +1781,25 @@ msgstr "" msgid "Users authorization" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:177 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:248 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:294 msgid "Problems connecting with subcontractor web service" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:216 +#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:22 +msgid "Monthly timesheets" +msgstr "" + +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:117 +msgid "Expense date" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:236 msgid "Entity type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1127 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1069 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:237 msgid "Unsaved changes will be lost. Are you sure?" msgstr "" @@ -1536,10 +1807,8 @@ msgstr "" #: 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/main.zul:22 -#: libreplan-webapp/src/main/webapp/planner/index.zul:22 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 #: libreplan-webapp/src/main/webapp/planner/order.zul:22 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 #: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22 msgid "LibrePlan: Scheduling" msgstr "" @@ -1548,7 +1817,7 @@ msgstr "" msgid "Assigned load" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:64 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:66 msgid "Filter by workers" msgstr "" @@ -1574,7 +1843,7 @@ msgid "" "popup or type in date directly)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:310 msgid "Expand/Collapse all" msgstr "" @@ -1582,11 +1851,11 @@ msgstr "" msgid "Overload due to current project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:984 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1054 msgid "Name: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1036 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1107 msgid "Move down" msgstr "" @@ -1600,6 +1869,10 @@ msgstr "" msgid "Inherits from date" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:589 +msgid "Expense Sheet" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "September" msgstr "" @@ -1608,13 +1881,32 @@ msgstr "" msgid "Report structure" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:119 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:59 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:99 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:100 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:362 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 +msgid "Yes" +msgstr "" + +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:127 +msgid "Go to user edition window" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:385 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:110 +msgid "Cost" +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:146 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:40 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:42 msgid "General data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:251 msgid "BAC" msgstr "" @@ -1629,12 +1921,21 @@ msgstr "" msgid "Assign" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/criterion/impl/CriterionConverter.java:130 -msgid "missing code in a criterion" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1283 +msgid "Create Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1318 -msgid "Create Template" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/DashboardTabCreator.java:108 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/DashboardTabCreator.java:126 +msgid "Dashboard" +msgstr "" + +#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:67 +msgid "Time" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:127 +msgid "last expense sheet line sequence code not specified" msgstr "" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60 @@ -1642,15 +1943,15 @@ msgstr "" msgid "Advanced search" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:82 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:76 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:76 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:114 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:84 msgid "Filter by labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:586 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:639 msgid "" "IMPORTANT: Don't forget to communicate to subcontractor that his contract " "has been cancelled" @@ -1660,16 +1961,16 @@ msgstr "" msgid "MonteCarlo chart" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:251 msgid "Schedule Variance" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:395 -msgid "Error on showing warning message removing qualityForm: " +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677 +msgid "resources per day cannot be empty or less than zero" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:410 -msgid "Service does not manage resource of type: {0}" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:131 +msgid "company code not specified" msgstr "" #: libreplan-webapp/src/main/webapp/common/error.zul:44 @@ -1677,15 +1978,20 @@ msgstr "" msgid "Status code" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:906 +msgid "Index fields and labels must be unique and consecutive" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:976 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:518 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:556 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:587 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:153 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:476 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:571 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:609 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:640 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:155 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:472 msgid "Warning" msgstr "" @@ -1694,28 +2000,28 @@ msgstr "" msgid "Select parent calendar" msgstr "" -#: 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" +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:66 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:67 +msgid "Identification" msgstr "" -#: 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" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:119 +msgid "Unbound resource" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:297 -msgid "criterion satisfaction with end date less than start date" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:210 +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:81 +msgid "quality form not specified" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:187 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:188 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:228 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:216 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:168 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:195 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:165 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 msgid "Show" msgstr "" @@ -1728,90 +2034,137 @@ msgstr "" msgid "Duration (days)" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:342 +msgid "You do not have permissions to edit this timesheet" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:417 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:69 +msgid "Send To Subcontractors" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:223 +msgid "date:the date must be not null if is shared by lines" +msgstr "" + +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:204 +msgid "Customer information" +msgstr "" + #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29 msgid "Back to log in" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:481 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:483 -msgid "Error on splitting" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:657 +msgid "Label type already assigned" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:945 +msgid "Timesheets Template" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:144 +msgid "host not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:158 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:416 +msgid "" +"Value is not valid.\n" +" Code cannot contain chars like '_'." +msgstr "" + +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:73 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 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:56 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 msgid "Company" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:348 +msgid "{0} projects remaining to reassign" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212 msgid "Task: {0} " 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/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "" -#: 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 "" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:56 msgid "Sum of direct imputed hours" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:230 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:113 +msgid "type of work hours not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:125 +msgid "the type of work hours name has to be unique. It is already used" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:35 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:28 msgid "Surname" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:1206 +msgid "calendars with zero hours are not allowed" +msgstr "" + #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22 msgid "Exception Day Types List" msgstr "" -#: 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/java/org/libreplan/web/workreports/WorkReportCRUDController.java:744 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:392 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:170 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:181 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:68 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:131 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:98 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 #: libreplan-webapp/src/main/webapp/planner/order.zul:107 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:43 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:43 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:43 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:60 +#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:28 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:84 msgid "Date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:375 -msgid "the name must be not null or not empty" +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:58 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:59 +msgid "Reviewed" 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:517 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:555 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:570 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:608 msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:662 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:43 msgid "Filter by month" msgstr "" @@ -1819,12 +2172,6 @@ msgstr "" msgid "The quality form must have an item with 100% value to report progress" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351 -#: 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/materials/UnitTypeController.java:156 msgid "The code is not valid. There is another unit type with the same code" msgstr "" @@ -1833,7 +2180,7 @@ msgstr "" msgid "July" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:239 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:259 msgid "Enable LDAP authentication" msgstr "" @@ -1841,14 +2188,19 @@ msgstr "" msgid "( max: {0} )" msgstr "" -#: 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:43 msgid "January" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:182 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:182 +msgid "Criterion already assigned" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:100 +msgid "passed not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54 msgid "Select queue" msgstr "" @@ -1857,36 +2209,32 @@ msgstr "" msgid "Cannot calculate charts for current data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:176 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1535 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:172 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1512 msgid "project name already being used" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56 msgid "Work description" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:58 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:61 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 msgid "Split assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:118 -msgid "You can not remove the default scenario called \"{0}\"" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 msgid "There are not any assigned progress to current task" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:211 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:90 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 msgid "direct link" msgstr "" @@ -1894,65 +2242,94 @@ msgstr "" msgid "Down" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:71 +msgid "template calendar not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:844 #: 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/TaskGroupFilterEnum.java:30 #: 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/TaskElementFilterEnum.java:34 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:48 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:122 msgid "Label" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1003 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:87 +msgid "price cost not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1078 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:95 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:126 +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:51 msgid "Association with roles" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:371 -msgid "missing type of work hours in a work report line" +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:36 +#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:44 +msgid "New expense sheet" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:607 +msgid "Create Timesheet" msgstr "" #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:30 msgid "Quality forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:497 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:507 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:540 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:550 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:244 +msgid "the advance type name has to be unique. It is already used" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:144 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:98 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:30 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:72 +#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:29 msgid "Days from Beginning to Deadline" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:128 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:253 msgid "Estimate At Completion" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:266 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78 +msgid "Indirect" +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/dashboard/_dashboardfororder.zul:121 +msgid "No tasks available yet" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:263 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1195 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:77 msgid "Direct" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:828 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:92 +msgid "" +"Estimated init date for the task (press enter in textbox to open calendar " +"popup or type in date directly)" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:822 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86 @@ -1967,14 +2344,16 @@ msgstr "" msgid "Pessimistic" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:385 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:438 msgid "Limiting resource assignation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 -msgid "" -"This progress can not be removed, because it is spread. It is necessary to " -"select another progress as spread." +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:243 +msgid "Delivery dates requested by the customer. " +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:292 +msgid "Code has to be autogenerated to create a new project from templates" msgstr "" #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:131 @@ -1994,28 +2373,45 @@ msgstr "" msgid "Unit type name cannot be empty" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:42 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:43 msgid "Entity sequences" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:93 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:28 -msgid "Delay from beginning (days)" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:138 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:257 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:768 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:236 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:677 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1321 +msgid "must be after start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:324 -msgid "Resource cannot be null" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:248 +msgid "" +"closckStart:the clockStart must be not null if number of hours is calcultate " +"by clock" +msgstr "" + +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:67 +#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:27 +msgid "Delay from beginning (days)" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:455 msgid "Total Hours" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:389 msgid "LibrePlan Role" msgstr "" -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:36 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:116 +msgid "Ended date communicated by the subcontractor." +msgstr "" + +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 msgid "Create Progress Type" msgstr "" @@ -2023,57 +2419,76 @@ msgstr "" msgid "Confirm cancel" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 +#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:43 +msgid "If you want to go to the initial page you can use the following link: " +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:468 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:39 msgid "Work And Progress Per Task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1559 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1536 msgid "project code already being used" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java:47 +msgid "type not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:40 msgid "WBS (tasks)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:703 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:712 msgid "Deleting sequence" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 -#: 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/calendars/BaseCalendarCRUDController.java:457 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:880 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:915 -msgid "Error on showing removing element: " +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:222 +msgid "The subcategories names must be unique." msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:88 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:99 +msgid "Total extra" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:432 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:72 +msgid "Received From Customers" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:92 msgid "Select scenario" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:51 -msgid "Login" +#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 +msgid "LibrePlan: Templates" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:225 -msgid "missing work report code in a work report" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:872 +msgid "" +"This is a subcontracted project, if you delete it you can not report " +"progress anymore. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:296 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:417 msgid "Edit Virtual Workers Group: {0}" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:83 +msgid "Total other" +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:1407 -msgid "Only the last activation period allows to delete end date." +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:198 +msgid "the assigned label type can not repeat in the timeshet template." +msgstr "" + +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:21 +msgid "LibrePlan: Expenses" msgstr "" #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 @@ -2084,8 +2499,14 @@ msgstr "" msgid "Scheduling saved" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:192 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:171 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:708 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:854 +msgid "" +"You can not remove the project \"{0}\" because this one has imputed expense " +"sheets." +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:219 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28 msgid "Add new row" @@ -2095,12 +2516,12 @@ msgstr "" msgid "Move" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:68 -msgid "Password saved" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:363 +msgid "deadline must be after start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:224 -msgid "missing code in the resource calendar" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:68 +msgid "Password saved" msgstr "" #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:34 @@ -2108,25 +2529,25 @@ msgstr "" msgid "Overload" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java:76 +msgid "subcontrated task data not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:50 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 msgid "Assignment log" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 -msgid "Work Report Models" -msgstr "" - -#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:75 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:160 msgid "New" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 msgid "Date last progress measurement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:112 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:111 msgid "Deadline (days since beggining project)" msgstr "" @@ -2134,50 +2555,55 @@ msgstr "" msgid "LibrePlan: Companies" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22 -msgid "LibrePlan: Progress Report" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:423 +msgid "number of hours is not properly calculated based on clock" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419 -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:925 -msgid "Value is not valid, the type must be not empty" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:109 +msgid "prefix must not contain white spaces" msgstr "" #: 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:331 -msgid "Task code cannot be null" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:302 msgid "Derived of calendar {0}" msgstr "" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:90 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:108 +msgid "Deliver date" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:515 msgid "It is not allowed to consolidate progress." msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:101 +msgid "" +"Each date must be greater than the dates of the previous task quality form " +"items." +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:38 +msgid "You do not have permissions to access to this page." +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27 msgid "External company" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:68 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:61 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:108 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:32 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:140 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:162 +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:61 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:27 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:30 msgid "Actions" msgstr "" @@ -2185,15 +2611,19 @@ msgstr "" msgid "Exceptions" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:32 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:33 msgid "User settings" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:80 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:110 msgid "Start hour" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:161 +msgid "must be after finish date" +msgstr "" + +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:130 msgid "Assign materials" msgstr "" @@ -2202,22 +2632,18 @@ msgid "Over assignable" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:79 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29 msgid "ID" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:231 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:238 msgid "format filters are not valid" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:351 -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 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:345 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:180 msgid "The init date cannot be empty" msgstr "" @@ -2225,72 +2651,68 @@ msgstr "" msgid "Our company password" msgstr "" +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 +msgid "LibrePlan: Project Costs" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:179 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131 msgid "This label has already been added." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:181 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:79 msgid "Could not get code, please try again later" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:394 -msgid "" -"Value is not valid.\n" -" Code cannot contain chars like '_'." -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161 msgid "Hours Group" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:996 -msgid "Budget: {0}€, Consumed: {1}€ ({2}%)" +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:101 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:45 +msgid "Bound user" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:825 msgid "Unallocated name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1057 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1128 msgid "Move up" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:124 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java:149 +msgid "" +"date format is wrong, please use the right format (for example for today the " +"format would be: {0})" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:249 msgid "BCWP" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:43 -msgid "Subcontract communication date" -msgstr "" - -#: 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 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:301 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:367 -msgid "Scheduling" -msgstr "" - -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:128 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:149 msgid "Dependencies have priority" 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:883 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:512 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1052 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126 msgid "Create {0}" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:423 +msgid "order calendar not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:219 msgid "Unlimited" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:252 msgid "Budget At Completion" msgstr "" @@ -2298,7 +2720,7 @@ msgstr "" msgid "Assign Label" msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:79 msgid "Page up" msgstr "" @@ -2306,12 +2728,12 @@ msgstr "" msgid "Create new project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:993 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1063 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:165 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:57 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:104 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35 msgid "State" msgstr "" @@ -2324,33 +2746,33 @@ msgstr "" msgid "Confirm change" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 +#: 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/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" +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:48 +msgid "units not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192 -msgid "missing date in a calendar exception" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:303 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:524 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:47 +msgid "Planning" 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: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" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:397 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:311 +msgid "the name cannot be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:198 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:195 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:199 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:218 msgid "Send" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:108 msgid "user" msgstr "" @@ -2363,7 +2785,7 @@ msgstr "" msgid "New task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:197 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:256 msgid "The password for a new user cannot be empty" msgstr "" @@ -2371,26 +2793,35 @@ msgstr "" msgid "Associated user" msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:27 msgid "Type name" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:207 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:728 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java:28 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:75 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:76 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27 +msgid "All" +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/reports/TimeLineRequiredMaterialController.java:205 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:689 -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27 -msgid "All" -msgstr "" - #: 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 "" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:177 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:36 +msgid "On schedule" +msgstr "" + #: libreplan-webapp/src/main/webapp/calendars/_list.zul:22 msgid "Calendars List" msgstr "" @@ -2407,6 +2838,16 @@ msgstr "" msgid "Create activation period" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1193 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229 +msgid "Inherited" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:377 +msgid "Delete project template. Are you sure?" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31 msgid "Personal details" msgstr "" @@ -2415,14 +2856,14 @@ msgstr "" msgid "Workers List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:375 -msgid "Delete project template. Are you sure?" +#: 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/web/calendars/BaseCalendarEditionController.java:1193 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229 -msgid "Inherited" +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1041 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:122 +msgid "Worker" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521 @@ -2432,32 +2873,42 @@ msgid "" "resource allocation criteria at any interval of time" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:872 -msgid "Worker" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:224 +msgid "User already bound to other 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:300 msgid "criterion name not specified" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:154 +msgid "port not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:263 +msgid "calendar not specified" +msgstr "" + #: 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 "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:346 -msgid "Role property" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:504 +msgid "Preferences" msgstr "" #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25 msgid "Manual allocation" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:366 +msgid "Role property" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:108 +msgid "Expense sheet \"{1}\" could not be deleted, it was already removed" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:29 msgid "External overload" msgstr "" @@ -2471,44 +2922,44 @@ msgstr "" msgid "Recommended allocation" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 msgid "Activation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310 -msgid "Scenarios" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375 msgid "Materials saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:456 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:39 msgid "Total Worked Hours By Resource In A Month" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:671 +#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:20 +msgid "LibrePlan: Access Forbidden" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672 msgid "Other projects" msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:111 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:117 msgid "Tasks input buffer" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:182 msgid "At least one {0} sequence must be active" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:161 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:26 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 msgid "Profile name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:246 -msgid "Could open generated PDF" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:296 +msgid "criterion satisfaction with end date before start" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:107 @@ -2519,15 +2970,19 @@ msgstr "" msgid "You should select a source scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163 -msgid "At least one {0} sequence is needed" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:326 +msgid "some code is repeated between hours group codes" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:474 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:39 msgid "Estimated/Planned Hours Per Task" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:177 +msgid "At least one {0} sequence is needed" +msgstr "" + #: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23 msgid "LibrePlan: Cost Categories" msgstr "" @@ -2536,38 +2991,40 @@ msgstr "" msgid "Assigned" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:91 +msgid "Total capacity" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 msgid "Use LDAP roles" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:167 +msgid "It has not been defined a project deadline" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:44 msgid "Details" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21 -msgid "LibrePlan: Units" -msgstr "" - -#: libreplan-webapp/src/main/webapp/common/configuration.zul:104 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:120 msgid "" "Check this option to send this information to LibrePlan developers in order " "to generate usage statistics" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:219 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:179 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:226 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:250 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:296 msgid "Error: {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 -msgid "Communication" -msgstr "" - +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:65 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 msgid "More options" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:244 msgid "Confirm create template" msgstr "" @@ -2575,7 +3032,7 @@ msgstr "" msgid "Parent" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:35 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:36 msgid "" "Password cannot be managed for LDAP users because LDAP authentication is " "being used" @@ -2585,7 +3042,7 @@ msgstr "" msgid "Earliest date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:352 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:506 msgid "Change Password" msgstr "" @@ -2593,12 +3050,17 @@ msgstr "" msgid "LibrePlan: Work And Progress Per Task" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:495 +msgid "all timesheet lines have to be in the same month in monthly timesheets" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48 msgid "Projects" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1128 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1070 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:238 msgid "Confirm exit dialog" msgstr "" @@ -2606,15 +3068,23 @@ msgstr "" msgid "Not found converter for {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:79 msgid "Material assignments" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:104 +msgid "last value not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:120 +msgid "task not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:46 msgid "December" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:35 +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:43 msgid "Change password" msgstr "" @@ -2632,27 +3102,27 @@ msgstr "" msgid "Question" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:69 +msgid "task quality form item name not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:237 msgid "Create new work week" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:698 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:850 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:34 msgid "LIMITING RESOURCE" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43 -msgid "Subcontratation" -msgstr "" - #: 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:590 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:626 msgid "{0} cannot be fulfilled" msgstr "" @@ -2664,14 +3134,14 @@ msgstr "" msgid "Work record" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:166 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:204 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:147 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:168 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:169 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:206 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:199 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:76 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:149 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:176 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:147 msgid "Output format" msgstr "" @@ -2683,7 +3153,7 @@ msgstr "" msgid "{0} not found type for criterion " msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:68 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:74 msgid "Page down" msgstr "" @@ -2691,48 +3161,45 @@ msgstr "" msgid "resource type does not allow enabled criteria" msgstr "" -#: 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/planner/order/OrderPlanningModel.java:1119 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1061 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:126 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:191 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:184 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:238 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:39 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:50 -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:83 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 #: 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/order.zul:131 #: libreplan-webapp/src/main/webapp/planner/order.zul:166 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:74 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:148 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:189 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:129 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:130 +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:74 +#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:43 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:49 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45 +#: 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/_workers.zul:49 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:89 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:129 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:90 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:132 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:382 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:81 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:402 msgid "Cancel" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:38 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:39 msgid "General user data" msgstr "" @@ -2740,7 +3207,7 @@ msgstr "" msgid "Unschedule" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:204 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:227 msgid "Subcontracted task sent successfully" msgstr "" @@ -2748,17 +3215,21 @@ msgstr "" msgid "Accumulated hours chart" msgstr "" +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:69 +msgid "EAC (Estimate At Completion)" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:22 msgid "Machines List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:320 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:732 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:944 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:694 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 msgid "You don't have read access to this project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:255 msgid "CPI" msgstr "" @@ -2767,9 +3238,13 @@ msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:48 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:43 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:139 +msgid "Cannot create another progress of the same type" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:50 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:43 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:45 msgid "Dates" msgstr "" @@ -2780,18 +3255,15 @@ msgid "Units" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:309 msgid "At least one stretch is needed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:307 -msgid "a day is not valid" +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:140 +msgid "The expense sheet line codes must be unique." msgstr "" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 -msgid "LibrePlan: Project Costs Per Resource" -msgstr "" - -#: libreplan-webapp/src/main/webapp/common/configuration.zul:87 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:103 msgid "Autocomplete login form" msgstr "" @@ -2799,7 +3271,7 @@ msgstr "" msgid "Task Properties" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:51 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:69 msgid "hours type" msgstr "" @@ -2807,13 +3279,6 @@ msgstr "" msgid "LibrePlan: Task Scheduling Status In Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:222 -msgid "" -"End date is not valid, the new end date must be greater than the start date" -msgstr "" - #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 msgid "name" msgstr "" @@ -2822,26 +3287,34 @@ msgstr "" msgid "Delete selected task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:129 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:133 msgid "{0} (max: {1})" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:529 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:526 msgid "Cost Category" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:475 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:490 msgid "end" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:373 msgid "Role search query" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:285 +msgid "The hour cost codes must be unique." +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:63 msgid "Log" msgstr "" +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68 +msgid "Inherited exception" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_edition.zul:57 msgid "Authorizations" msgstr "" @@ -2855,27 +3328,47 @@ msgstr "" msgid "Edit task {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:210 -msgid "Start date cannot be null" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 +msgid "LibrePlan: Timesheets" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304 -msgid "Subcontracting" +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:216 +msgid "username is already being used by another user" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:328 msgid "references" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:149 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1582 +msgid "You must select a valid date. " +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/GenericAllocationRow.java:55 msgid "Generic" msgstr "" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:43 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:42 msgid "Template" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:112 +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:277 +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:126 +msgid "percentage should be greater than 0% and less than 100%" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:118 +msgid "You can not remove the default scenario \"{0}\"" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java:187 +msgid "The field name must be unique." +msgstr "" + #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49 msgid "Default max value" msgstr "" @@ -2884,14 +3377,7 @@ msgstr "" msgid "Add criterion requirement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900 -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 " -"current scenario" -msgstr "" - -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:146 msgid "Percentage of estimated budget hours / hours consumed" msgstr "" @@ -2903,28 +3389,36 @@ msgstr "" msgid "Criterion Name" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:541 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:127 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:167 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:146 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 msgid "Task" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:21 +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:21 msgid "LibrePlan: Change password" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:169 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:90 msgid "please, select a label" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:57 +msgid "Expected" +msgstr "" + +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 msgid "Add profile" msgstr "" @@ -2932,11 +3426,11 @@ msgstr "" msgid "LibrePlan: Scenarios Management" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:225 -msgid "missing code in a calendar data version" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:145 +msgid "cost assignment with end date before start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:227 msgid "filter already exists" msgstr "" @@ -2950,12 +3444,22 @@ msgstr "" msgid "values are not valid, the values must not be null" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:284 +msgid "Limiting Resources" +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/subcontract/subcontractedTasks.zul:50 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:42 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36 +msgid "Spreading progress" +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:108 +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 msgid "Task name" msgstr "" @@ -2964,53 +3468,63 @@ msgstr "" msgid "cost assignment's resource not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1091 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:540 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:68 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:66 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:47 +#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:31 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:64 msgid "Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:407 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:374 msgid "" "Starting date cannot be empty because there is a task with constraint \"as " "soon as possible\"" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:290 +msgid "last material sequence code not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:369 +msgid "Extra" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:79 msgid "Unassigned" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1594 +msgid "It already exists a end date with the same date. " +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:102 msgid "Add new criterion requirement" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:124 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:249 msgid "Budgeted Cost Work Performed" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:138 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:142 msgid "Change the password" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:128 -msgid "Work report" +#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:158 +msgid "label code is already being used" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:302 -msgid "the name must be not empty" -msgstr "" - -#: libreplan-webapp/src/main/webapp/materials/materials.zul:85 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:75 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:87 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:78 msgid "Disabled" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:764 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:707 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324 msgid "Earned value" msgstr "" @@ -3033,23 +3547,62 @@ msgstr "" msgid "{0} reassignations finished" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:250 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:254 msgid "" "Templates can only be created out of existent tasks.You are trying to create " "a template out of a new task.\n" "Please save your project before proceeding." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1210 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1225 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 +#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:33 +msgid "Total work" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:435 +msgid "The timesheet line codes must be unique." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:252 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:53 +msgid "Calendar Exception Days" +msgstr "" + +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:108 +msgid "Time tracking" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:43 +msgid "" +"If you entered the URL directly in the navigation bar of the browser, please " +"review it or click in the following link in order to go to initial page: " +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1267 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1282 msgid "{0} not supported yet" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:143 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:151 +msgid "Total tasks" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java:174 +msgid "" +"All Machine worker assignments must have a start date earlier than the " +"finish date" +msgstr "" + +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:79 +msgid "Total monthly timesheet" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:144 msgid "is not supported for its use with LibrePlan." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360 msgid "" "Date is not valid, it must be greater than the last progress consolidation" msgstr "" @@ -3058,32 +3611,40 @@ msgstr "" msgid "New entry" msgstr "" -#: 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:111 msgid "Resources Load" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 -msgid "Some sequences to remove not existed" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:174 +msgid "userId not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:224 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 msgid "Changes have been canceled" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21 -msgid "LibrePlan: Hours Worked Per Worker In A Month" +#: libreplan-webapp/src/main/webapp/planner/index.zul:22 +msgid "LibrePlan: Planning" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:296 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:188 +msgid "Expense sheets" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:316 msgid "Authentication" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:1140 +msgid "indirect advance assignments should have different types" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "March" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:85 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:88 msgid "Select language" msgstr "" @@ -3095,11 +3656,15 @@ msgstr "" msgid "Assigned criterion requirements" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:115 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:123 +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:247 +msgid "Calendar Exception Day" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:117 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:155 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:125 msgid "Filter by criteria" msgstr "" @@ -3108,6 +3673,13 @@ msgstr "" msgid "Max value" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:99 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:100 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:364 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 +msgid "No" +msgstr "" + #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:22 msgid "Scenarios List" msgstr "" @@ -3116,7 +3688,7 @@ msgstr "" msgid "The name is not valid, the name must not be null " msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:142 msgid "Hours to allocate" msgstr "" @@ -3124,6 +3696,10 @@ msgstr "" msgid "A category must be selected" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:264 +msgid "Delivery dates asked by the subcontractor. " +msgstr "" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149 msgid "Period" msgstr "" @@ -3133,46 +3709,49 @@ msgstr "" msgid "Spread" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:973 +msgid "Disabled because of it contains more than one hours group" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:287 +msgid "Confirm remove user" +msgstr "" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:93 msgid "Select start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:157 -msgid "Error on showing warning message removing typeOfWorkHours: " -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:922 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 msgid "Removed {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:803 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:966 msgid "Confirm deleting this worker. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:64 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:67 msgid "Group name" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:60 msgid "Role name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:822 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:991 msgid "This worker was already removed by other user" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:620 -msgid "Create Work Report" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java:188 +msgid "The same resource is assigned twice inside an interval" 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/planner/order/OrderPlanningModel.java:889 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:470 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:830 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:472 msgid "h" msgstr "" @@ -3180,9 +3759,16 @@ msgstr "" msgid "Workable capacity for this period " msgstr "" -#: 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" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:312 +msgid "last hours cost sequence code not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul:21 +msgid "LibrePlan: My Dashboard" +msgstr "" + +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:33 +msgid "Communications From Subcontractors" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:339 @@ -3193,15 +3779,15 @@ msgstr "" msgid "Add Milestone" msgstr "" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:116 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:122 msgid "Assign selected items" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:454 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:468 msgid "init" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1277 msgid "Add new progress measurement" msgstr "" @@ -3213,10 +3799,6 @@ msgstr "" msgid "Project {0} transfered" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 -msgid "Scenarios Management" -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:96 msgid "Create & Assign" msgstr "" @@ -3225,6 +3807,20 @@ msgstr "" msgid "Not configurable" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:272 +msgid "Task Status" +msgstr "" + +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:31 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:97 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +msgid "Bound resource" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:178 +msgid "Calendar exception days" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationCommand.java:47 msgid "Advanced allocation" msgstr "" @@ -3235,25 +3831,17 @@ msgstr "" msgid "Consolidated" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:158 -msgid "Work report types" -msgstr "" - -#: libreplan-webapp/src/main/webapp/common/configuration.zul:180 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:200 msgid "MonteCarlo method" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1223 -msgid "derived exception can not be removed" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:284 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:386 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:425 msgid "Edit Worker: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:217 -msgid "missing code in a material" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1150 +msgid "You do not have permissions to go to user edition window" msgstr "" #: libreplan-webapp/src/main/webapp/common/layout/login.zul:21 @@ -3262,14 +3850,16 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:68 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:111 +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:56 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:69 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:225 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32 msgid "Customer" msgstr "" -#: 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/java/org/libreplan/web/workreports/WorkReportCRUDController.java:814 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:116 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:149 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 msgid "Hours type" msgstr "" @@ -3278,12 +3868,11 @@ msgstr "" msgid "Show money cost bar" 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:211 msgid "criterion type name not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:256 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:257 msgid "Cannot connect to LDAP server" msgstr "" @@ -3291,35 +3880,122 @@ msgstr "" msgid "Add Exception" msgstr "" +#: 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:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:193 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:197 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:478 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:314 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:328 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:357 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:370 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:383 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:394 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:404 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:413 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:438 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:222 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:144 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:205 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:305 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:202 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:223 #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:379 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignController.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:994 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1184 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1441 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:236 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:357 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:212 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:304 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:953 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:967 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1421 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1448 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:167 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:126 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:394 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1505 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1529 +#: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:749 +#: 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/excetiondays/_editExceptionDayType.zul:43 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:94 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:96 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:161 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:43 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:53 +#: 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/machine/_editMachine.zul:58 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64 +#: 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/orders/_projectDetails.zul:38 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41 +#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:44 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:55 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:61 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:60 msgid "cannot be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:421 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:418 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:47 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:50 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:55 #: 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:146 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:121 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:173 msgid "Heading Fields" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:70 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:80 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:72 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:82 msgid "Progress type" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:437 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143 +msgid "" +"Hours types are empty. Please, create some hours types before proceeding" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:155 msgid "" "Time period contains non valid data. Ending data must be older than starting " @@ -3330,7 +4006,7 @@ msgstr "" msgid "Expand taskgroups" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:137 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:141 msgid "The admin's account password remains the default one. This is insecure" msgstr "" @@ -3338,15 +4014,15 @@ msgstr "" msgid "Save Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:581 -msgid "Task {0}: Project is incompatible type with {1}" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:318 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:324 msgid "Day is not valid" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java:226 +msgid "max value of percentage advance type must be 100" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:623 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1259 msgid "You should select a start date for the exception" @@ -3356,25 +4032,38 @@ msgstr "" msgid "Help" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:129 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:254 msgid "Variance At Completion" msgstr "" +#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:21 +msgid "LibrePlan: Material Units" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:256 +msgid "Virtual resources cannot be bound to any user" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:96 msgid "Settings saved" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:64 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:71 msgid "Exportation options" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:91 +msgid "effort not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:376 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:374 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46 #: 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/BaseCalendarBandboxFinder.java:46 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TypeOfWorkHoursBandboxFinder.java:43 #: 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/ExternalCompanyBandboxFinder.java:51 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42 @@ -3384,7 +4073,7 @@ msgstr "" #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:58 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:60 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 @@ -3397,32 +4086,32 @@ msgstr "" #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 #: libreplan-webapp/src/main/webapp/planner/main.zul:49 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 -#: 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/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/schedulingProgressPerOrderReport.zul:115 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:104 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:81 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:27 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:98 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:139 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:139 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:136 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:177 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:126 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:168 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:106 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:147 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:62 +#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:26 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 +#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:27 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:40 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40 #: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 @@ -3438,10 +4127,11 @@ msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:36 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:27 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:78 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:96 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:52 msgid "Name" msgstr "" @@ -3459,69 +4149,58 @@ msgstr "" msgid "Seconds" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:108 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:119 msgid "please, select an item" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1146 +msgid "a label can not be assigned twice in the same branch" +msgstr "" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:224 msgid "Day of week" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:397 -msgid "Time Start cannot be null" -msgstr "" - #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22 msgid "Companies List" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:119 +msgid "default calendar not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1462 msgid "Stretches with Interpolation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:449 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:39 msgid "Hours Worked Per Resource" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:146 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:153 msgid "The end date cannot be before the init date" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:117 +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialInfo.java:39 +msgid "material not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:149 msgid "" "Profiles of LDAP users cannot be managed because LDAP roles are being used." msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:145 -msgid "cost assignment with end date less than start date" -msgstr "" - -#: 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/costcategories/_listCostCategories.zul:26 #: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 msgid "Category name" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:766 -msgid "Not the same material, impossible to update" -msgstr "" - -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34 -msgid "Filter work report by" -msgstr "" - -#: libreplan-webapp/src/main/webapp/common/configuration.zul:99 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 msgid "Show a notification when new LibrePlan versions are released" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:65 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:69 msgid "Main menu" msgstr "" @@ -3537,19 +4216,15 @@ msgstr "" msgid "Exception: {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:46 +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:54 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." +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:90 +msgid "Delete expense sheet \"{0}\". Are you sure?" msgstr "" -#: 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/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29 msgid "Schedule" msgstr "" @@ -3558,6 +4233,10 @@ msgstr "" msgid "Unexpected: {0}" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:241 +msgid "a personal expense sheet must have the same resource in all the lines" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/main.zul:61 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50 msgid "Notes" @@ -3567,7 +4246,13 @@ msgstr "" msgid "Connect" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:97 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:145 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:169 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:85 +msgid "Concept" +msgstr "" + +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128 msgid "" "Roles of LDAP users cannot be managed because LDAP roles are being used." msgstr "" @@ -3576,26 +4261,26 @@ msgstr "" msgid "Allocation: [{0},{1}]" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:874 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1043 msgid "Virtual Workers Group" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:209 msgid "Changes saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1303 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1268 msgid "See scheduling" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:329 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:332 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341 msgid "Progress measurements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1237 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1276 msgid "Add measure" msgstr "" @@ -3608,13 +4293,9 @@ msgstr "" msgid "Relationship" msgstr "" -#: 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:53 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:386 -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:68 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:439 +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:69 msgid "Subcontract" msgstr "" @@ -3624,80 +4305,125 @@ msgstr "" msgid "End" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1379 -msgid "The date is not valid, the date must be not empty" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:480 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:39 +msgid "Project Costs" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:26 -msgid "User login name" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:531 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:375 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:63 msgid "Cost Categories" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:309 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:556 +msgid "Other" +msgstr "" + +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:36 +msgid "CV (Cost Variance)" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313 msgid "criterion type not specified" 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:44 msgid "April" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:103 +msgid "default price not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:133 +msgid "timesheet template not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:352 +msgid "LDAP" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:216 +msgid "Timesheet removed successfully" +msgstr "" + #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22 msgid "Users List" msgstr "" +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:46 +msgid "CPI (Cost Performance Index)" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 msgid "Task quality forms" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:597 -msgid "Not working day" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java:47 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:52 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:144 +msgid "Username" +msgstr "" + +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:105 +msgid "Has bound resource" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:55 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:168 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:184 msgid "Cost category" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:702 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:444 +msgid "label type: the timesheet has not assigned this label type" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:711 msgid "It can not be deleted. At least one sequence is necessary." msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/Material.java:105 +msgid "description is not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationCommand.java:74 msgid "Resource allocation" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:266 +msgid "New end date for the customer" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50 msgid "Amount work" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:161 +msgid "ID already used. It has to be be unique" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:172 msgid "please, select a quality form" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:524 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:889 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1058 #: 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/qualityforms/_listQualityForm.zul:26 msgid "Filter quality forms by" msgstr "" @@ -3706,15 +4432,15 @@ msgstr "" msgid "Unindent selected task" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 msgid "Customer reference code" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:66 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:67 msgid "Constraint" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:426 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:393 msgid "" "Deadline cannot be empty because there is a task with constraint \"as late " "as possible\"" @@ -3724,30 +4450,26 @@ msgstr "" msgid "Add New Label Type Field" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:407 -msgid "Time finish cannot be null" -msgstr "" - -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:118 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:233 msgid "Customer reference" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:365 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:366 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:311 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:321 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:733 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:936 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:945 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:972 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:160 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:316 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 msgid "Information" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:971 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 msgid "Sorry, you do not have permissions to access this project" msgstr "" @@ -3755,12 +4477,12 @@ 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:272 msgid "Worker saved" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266 -msgid "can not pass until the previous item is passed." +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:35 +msgid "Communications To Subcontractors" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:206 @@ -3775,6 +4497,10 @@ msgstr "" msgid "Please remember that only saved changes will be printed" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:254 +msgid "There are repeated material codes" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:259 msgid "percentage cannot be duplicated" msgstr "" @@ -3783,12 +4509,12 @@ msgstr "" msgid "Resource: {0} " msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:55 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:36 msgid "Edit Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 -msgid "Work Hours" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:68 +msgid "Progress %" msgstr "" #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:27 @@ -3799,36 +4525,44 @@ msgstr "" msgid "Company ID already used. It has to be be unique" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:122 -msgid "There is no material category with this code" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:528 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274 +msgid "must be after the previous date" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112 +msgid "Hours Type" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:192 msgid "Percentages should sum 100" 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/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:106 -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81 -msgid "Unable to convert value to {0} type" +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CustomerCommunication.java:132 +msgid "order not specified" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:81 msgid "Total task budget" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:222 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:245 msgid "Worker must be not-null" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:278 +msgid "Resource Load" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:206 +msgid "Only one sequence for each entity can be active at the same time." +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1063 msgid "Some criterion satisfactions overlap in time" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 msgid "Value last progress measurement" msgstr "" @@ -3840,7 +4574,7 @@ msgstr "" msgid "Worker assignments" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:270 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:266 #: 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 @@ -3851,10 +4585,15 @@ msgstr "" msgid "{0} already exists" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:315 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:437 msgid "Create Worker" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java:45 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderInExpenseSheetBandboxFinder.java:44 +msgid "Project name (Project code)" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 msgid "Code " msgstr "" @@ -3863,8 +4602,9 @@ msgstr "" msgid "Exception: {0} (Inh)" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:69 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:69 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:77 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:153 msgid "Password confirmation" msgstr "" @@ -3872,32 +4612,30 @@ msgstr "" msgid "Indent selected task" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88 -msgid "Work Report" +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:665 +msgid "Regular" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:148 -msgid "Unit Measures" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:356 +msgid "the order must have a deadline" msgstr "" #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:79 msgid "Show progress" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:142 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:170 msgid "Work" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:342 msgid "" "Error saving the project\n" "{0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:363 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:364 msgid "" "The task has got progress consolidations. It must delete all consolidations " "to change the resource allocation type " @@ -3907,37 +4645,40 @@ msgstr "" msgid "LibrePlan: Machines" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:306 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:86 +msgid "{0} h" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:350 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 msgid "Error" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:256 msgid "Cost Performance Index" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:129 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:254 msgid "ETC" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:182 -msgid "" -"Criterion is not valid, the criterion overlap other criterionSatisfaction " -"whith same criterion" +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:109 +msgid "Log out" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:105 -msgid "Log out" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42 +msgid "Filter timesheet by" msgstr "" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:25 msgid "Add new configuration unit" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:41 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:42 msgid "Main preferences" msgstr "" @@ -3946,22 +4687,15 @@ msgstr "" msgid "Progress consolidation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:180 -msgid "" -"Criterion is not valid, it overlaps other criterionSatisfaction with the " -"same criterion" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47 msgid "Add new worker assignment" msgstr "" -#: 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" +#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:22 +msgid "My tasks" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:690 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:729 msgid "Show all elements" msgstr "" @@ -3977,16 +4711,12 @@ msgstr "" msgid "Task Information" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:144 -msgid "Hours Group at " -msgstr "" - #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:27 msgid "Your session has expired after inactivity period. Please log in again." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:309 -msgid "a day is empty" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:403 +msgid "There is another timesheet template with the same name" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165 @@ -3998,22 +4728,42 @@ msgstr "" msgid "Changes applied" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:122 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:247 msgid "Budgeted Cost Work Scheduled" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58 -msgid "Name cannot be null or empty" +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:61 +msgid "Project closing previsions" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:43 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:164 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:58 +msgid "Material Units" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:44 msgid "LDAP configuration" msgstr "" +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35 +msgid "Superuser" +msgstr "" + #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32 msgid "Queue Element Information" msgstr "" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:98 +msgid "Select template" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:398 +msgid "fields should match with timesheet data if are shared by lines" +msgstr "" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151 msgid "Start Date" msgstr "" @@ -4022,7 +4772,7 @@ msgstr "" msgid "Virtual Workers Groups List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250 msgid "Cost Variance" msgstr "" @@ -4030,32 +4780,72 @@ msgstr "" msgid "criterion type does not allow resource hierarchy" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:250 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:560 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:50 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:87 +#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:33 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:182 msgid "Total" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:396 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:66 +msgid "User Accounts" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:222 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:99 msgid "Invalidate" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:285 +msgid "" +"User is bound to resource \"{0}\" and it will be unbound. Do you want to " +"continue with user removal?" +msgstr "" + +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:163 msgid "Budget hours" msgstr "" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132 +msgid "Go to monthly timesheet" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java:78 +msgid "percentage not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:151 msgid "Edit task: {0}" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:187 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:186 +msgid "This type of criteria cannot have multiple values in the same period" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554 +msgid "Machine was already removed" +msgstr "" + +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:125 +msgid "Expenses lines" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:232 +msgid "expense line of the " +msgstr "" + #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:52 msgid "Select destination" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274 -msgid "must be greater than the previous date." +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:203 +msgid "cannot be empty or less than zero" msgstr "" #: libreplan-webapp/src/main/webapp/planner/order.zul:89 @@ -4063,17 +4853,21 @@ msgstr "" msgid "Check consolidated progresses" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:587 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:308 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:311 +msgid "Update task end" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:578 msgid "Show all" msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:59 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:28 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:59 msgid "Default price" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 msgid "Estimated hours" msgstr "" @@ -4082,55 +4876,81 @@ msgid "Apply tab changes" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:99 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:176 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:235 msgid "passwords don't match" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:516 +msgid "Criteria of this criterion type has been assigned to some resource." +msgstr "" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:100 msgid "Day properties" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:72 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:263 +msgid " (%d tasks)" +msgstr "" + +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:82 msgid "Hours groups" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:107 +msgid "" +"Enable/Disable autocomplete property in login form, if the admin password is " +"still the default one" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:182 +msgid "Create new user" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersController.java:183 msgid "Transfer" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:903 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:22 +msgid "Work Hours Types List" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:931 msgid "" "Spread progress cannot be changed if there is a consolidation in any " "progress assignment" msgstr "" -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:22 -msgid "Work Hours Types List" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/GlobalProgressChart.java:48 +msgid "By critical path duration" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54 msgid "new milestone" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:236 +msgid "Save & New timesheet" +msgstr "" + +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Value last progress reported" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:103 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 msgid "" "Help project developers to collect information about which LibrePlan version " "you are using" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 -msgid "Report Progress" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:118 +msgid "Timesheet" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:73 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:75 msgid "Show dependencies" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 msgid "Schedule from start to deadline" msgstr "" @@ -4140,9 +4960,9 @@ msgstr "" msgid "Estimated days" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:51 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:61 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:53 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:53 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:63 msgid "Reference date" msgstr "" @@ -4150,6 +4970,18 @@ msgstr "" msgid "LibrePlan: Estimated/Planned Hours Per Task" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:94 +msgid "quality form item percentage not specified" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:316 +msgid "passwords do not match" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:84 +msgid "quality form name not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81 msgid "Progress Evolution" msgstr "" @@ -4158,31 +4990,42 @@ msgstr "" msgid "From chosen date" msgstr "" -#: 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" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:259 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:718 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:754 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 +msgid "" +"Subcontractor values are read only because they were reported by the " +"subcontractor company." 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/java/org/libreplan/web/common/CustomMenuController.java:317 -msgid "LibrePlan Configuration" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:162 +msgid "" +"There is a margin of %d days with the project global deadline (%.2f %%)." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250 msgid "CV" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:497 +#: libreplan-webapp/src/main/webapp/myaccount/userDashboard.zul:35 +msgid "My dashboard" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 msgid "Original" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:163 +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:219 +msgid "advance type marked as quality form but is updatable" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:179 msgid "" "A new version of LibrePlan is available. Please check next link for more " "information:" @@ -4197,16 +5040,20 @@ msgstr "" msgid "Not indentable" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:493 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:71 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:255 +msgid "Timesheet saved" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:497 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:73 msgid "List of materials for all categories (select one to filter)" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:73 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:74 msgid "Resource allocation type" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:103 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:104 msgid "User disabled" msgstr "" @@ -4215,11 +5062,11 @@ msgstr "" msgid "Exception type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:788 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:824 msgid "In the available periods {0} only {1} hours are available." msgstr "" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:115 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:147 msgid "Association with profiles" msgstr "" @@ -4228,11 +5075,16 @@ msgstr "" msgid "Message - {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:21 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:467 +msgid "" +"description value: the timesheet has not assigned the description field" +msgstr "" + +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:21 msgid "LibrePlan: Settings" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:124 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:131 msgid "worker's surname not specified" msgstr "" @@ -4241,7 +5093,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:77 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:80 msgid "Application settings" msgstr "" @@ -4249,43 +5101,37 @@ msgstr "" msgid "Average of estimated hours" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:269 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:289 msgid "Base" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:318 msgid "Total dedication" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:689 -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/webapp/scenarios/transferOrders.zul:44 msgid "Select source" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:810 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:984 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:744 msgid "Select entity, please" msgstr "" -#: 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 +#: libreplan-webapp/src/main/webapp/profiles/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" +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:112 +msgid "total not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:48 +#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:38 +msgid "Last expense" msgstr "" #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:108 @@ -4293,26 +5139,30 @@ msgstr "" msgid "Day" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 -msgid "LibrePlan: Subcontracted Tasks" +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:71 +msgid "Timesheet summary" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:57 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:284 +msgid "description value:the timesheet have not assigned the description field" +msgstr "" + +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:65 msgid "Current password" msgstr "" -#: 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:915 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1175 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:274 msgid "Please, select an item" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1096 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1090 msgid "Cannot be higher than finish hour" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:201 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:220 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:240 msgid "Prefix" msgstr "" @@ -4320,14 +5170,25 @@ msgstr "" msgid "New Template element" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 msgid "Subcontracted code" 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" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:499 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:31 +msgid "Monthly timesheet" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:216 +msgid "The quality item positions must be unique and consecutive." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:361 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:144 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:60 +msgid "Timesheets" msgstr "" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94 @@ -4339,10 +5200,18 @@ msgstr "" msgid "From date" msgstr "" +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:108 +msgid "Task of project" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34 msgid "Reassigning type" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:232 +msgid "Number of Days / Days Interval" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22 msgid "LibrePlan: Virtual Workers Groups" msgstr "" @@ -4351,11 +5220,15 @@ msgstr "" msgid "{0} \"{1}\" can not be deleted because of it is being used" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:594 +msgid "Expense Sheets" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:772 msgid "The field name must be unique, not null and not empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:380 #: 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:84 @@ -4366,12 +5239,12 @@ msgstr "" msgid "Edit limiting resource element" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:108 -msgid "Incorrect authentication" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java:84 +msgid "maximum value not specified" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:112 -msgid "Edit work report" +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:109 +msgid "Incorrect authentication" msgstr "" #: libreplan-webapp/src/main/webapp/planner/editTask.zul:53 @@ -4380,15 +5253,36 @@ msgstr "" msgid "Edit task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:44 +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:406 +msgid "advance type should not be null if report advance" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:95 +msgid "Currency" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214 +msgid "End date is not valid, the new end date must be after the start date" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:444 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:31 +msgid "Timesheet Lines List" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:47 msgid "Limiting resources (project)" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 +msgid "Hours type for monthly timesheets" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:674 msgid "A description field of the same name already exists." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1190 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1221 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4397,12 +5291,18 @@ msgstr "" msgid "Current value" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:823 -msgid "Duplicate progress assignment for task " +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1589 +msgid "" +"It will only be possible to add a end date if all the exiting ones in the " +"table have already been sent to customer.." +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/ResourceCalendar.java:73 +msgid "Capacity must be a positive integer number" msgstr "" #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48 msgid "Save and Continue" msgstr "" @@ -4415,6 +5315,10 @@ msgstr "" msgid "Quality form" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419 +msgid "Calendar cannot be removed as it has other derived calendars from it" +msgstr "" + #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:97 msgid "Go!" msgstr "" @@ -4423,22 +5327,26 @@ msgstr "" msgid "Inherits up to date" msgstr "" +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:27 +msgid "Profile data" +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:27 -msgid "Profile data" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:369 +msgid "Starting date cannot be empty in forward mode" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:406 #: 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:247 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:267 msgid "Configuration" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:402 -msgid "Starting date cannot be empty in forward mode" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java:122 +msgid "cost category not specified" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:489 @@ -4446,32 +5354,49 @@ msgstr "" msgid "This date can not be empty" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:179 +msgid "Violated deadline" +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:567 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:719 msgid "Create Virtual Workers Group" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:100 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:116 msgid "Enable/Disable warning about new LibrePlan versions available" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:95 -msgid "Select type" +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:183 +msgid "" +"interaction fields are empty and company is marked as interact with " +"applications" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:988 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:686 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:174 +msgid "Timesheet templates" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1058 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:692 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:40 msgid "Hours invested" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:305 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:48 +msgid "Templates" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:343 msgid "Authorization" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:363 msgid "Project saved" msgstr "" @@ -4480,44 +5405,46 @@ msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50 msgid "task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:697 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:849 msgid "ALL" msgstr "" +#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:51 +msgid "Sorry for the inconvenience." +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:215 msgid "criterion satisfaction's resource not specified" msgstr "" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68 -msgid "Derived exception" +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:81 +msgid "quality form item position not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298 -msgid "Machines" -msgstr "" - -#: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:22 +#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:22 msgid "Unit Measures List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:148 -msgid "Couldn't find element: {0}" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:50 +msgid "Machines" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1234 +msgid "" +"Values are read only because they have already been sent to the customer " +"company." msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:148 msgid "You should select a destination scenario" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:185 -#: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:269 -msgid "unit type code not found" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:495 msgid "My account" msgstr "" @@ -4525,23 +5452,24 @@ msgstr "" msgid "Destination scenario" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:105 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:108 msgid "Company view" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 -msgid "Both" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:445 +msgid "currency symbol not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:898 -msgid "Not editable for containing more that an hours group." +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:116 +msgid "Both" msgstr "" #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 msgid "Filter by" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:80 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:83 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 msgid "Limiting resource" msgstr "" @@ -4555,18 +5483,14 @@ msgstr "" msgid "Calendar allocation" 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:84 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:113 msgid "Category" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:156 -msgid "must be greater than finish date" +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22 +msgid "LibrePlan: Progress Types" msgstr "" #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79 @@ -4582,10 +5506,18 @@ msgstr "" msgid "Search" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:490 +msgid "there are repeated description values in the timesheet lines" +msgstr "" + #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:254 msgid "Valid until" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ConfigurationRolesLDAP.java:51 +msgid "role ldap not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128 msgid "Add New Complementary Field" msgstr "" @@ -4606,8 +5538,8 @@ msgstr "" msgid "LibrePlan: Transfer Projects Between Scenarios" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:166 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:178 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:259 msgid "%" msgstr "" @@ -4616,37 +5548,60 @@ msgstr "" msgid "Remove calendar" msgstr "" -#: 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/planner/order/OrderPlanningController.java:338 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:274 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:633 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportQueryController.java:156 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:275 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:145 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:785 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:257 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:676 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1368 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:253 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:695 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1338 msgid "must be lower than finish date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:766 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 +msgid "Sum of direct expenses" +msgstr "" + +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:33 +msgid "Communications From Customers" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:760 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnumByResourceAndCriterion.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceBandboxFinder.java:46 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:95 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:151 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:171 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:185 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:41 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:70 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:135 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:45 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:100 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:145 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:64 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86 msgid "Resource" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/UserDashboardController.java:67 +msgid "Expense sheet \"{0}\" saved" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:71 msgid "Total task hours" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:51 +msgid "Virtual Workers" +msgstr "" + +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 msgid "Date last progress reported" msgstr "" @@ -4654,12 +5609,12 @@ msgstr "" msgid "Could not load any resource" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:462 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:39 msgid "Work And Progress Per Project" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:385 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:416 msgid "" "You must allow multiple active criteria for this type to use this assignment " "strategy" @@ -4669,6 +5624,10 @@ msgstr "" msgid "sub elements" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java:111 +msgid "total must be greater or equal than 0" +msgstr "" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:158 msgid "Default Label" msgstr "" @@ -4679,7 +5638,11 @@ msgstr "" msgid "Close" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:944 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 +msgid "LibrePlan: Timesheet Lines List" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945 msgid "Specific Allocations" msgstr "" @@ -4688,10 +5651,6 @@ msgstr "" msgid "error doing reassignation: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:425 -msgid "Time filter" -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 msgid "Move selected task up" msgstr "" @@ -4700,6 +5659,10 @@ msgstr "" msgid "Select criteria set or specific resources for allocation" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426 +msgid "criterion names must be unique inside a criteriontype" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:350 msgid "Create copy" msgstr "" @@ -4708,16 +5671,11 @@ msgstr "" msgid "Company data" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33 -msgid "Work Report Lines List" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151 msgid "Unit type code cannot be empty" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:248 msgid "Users" msgstr "" @@ -4729,16 +5687,21 @@ msgstr "" msgid "Hours Management" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:144 -msgid "" -"Please use some of the compatible browsers: Chrome, Firefox, Safari or " -"Epiphany." +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:170 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:321 +msgid "last hours group sequence code not specified" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:94 msgid "specific allocation" msgstr "" +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:145 +msgid "" +"Please use some of the compatible browsers: Chrome, Firefox, Safari or " +"Epiphany." +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:149 msgid "company name has to be unique. It is already used" msgstr "" @@ -4749,22 +5712,21 @@ msgid "" "completed." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:558 -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:614 -msgid "Task {0}: Task group is incompatible type with {1}" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:223 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:244 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:224 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:242 msgid "Template saved" msgstr "" -#: 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" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1622 +msgid "Please set a date" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:23 -msgid "LibrePlan: Configuration" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:96 +msgid "prefix not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:533 +msgid "last criterion sequence code not specified" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 @@ -4782,8 +5744,11 @@ msgstr "" msgid "Imputed hours calculation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:274 -msgid ": code not found" +#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:31 +#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:53 +#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:67 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:259 +msgid "Group" msgstr "" #: libreplan-webapp/src/main/webapp/common/error.zul:55 @@ -4791,41 +5756,52 @@ msgstr "" msgid "Exit session" msgstr "" -#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:31 -#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:53 -#: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineGroupTemplate.java:244 -msgid "Group" +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30 +msgid "Statistics list " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116 -msgid "Please, enter a valid effort" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 +msgid "Apply filter to" msgstr "" #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58 -#: 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:65 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:29 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:66 msgid "Enabled" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 -msgid "Apply filter to" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1110 +msgid "Please, enter a valid effort" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30 -msgid "Statistics list " +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:519 +msgid "resource has to be bound to a user in monthly timesheets" msgstr "" #: 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:527 -msgid "Filter by worker" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java:125 +msgid "external company not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:192 +msgid "Quality form name is already being used" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:950 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:366 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:61 +msgid "Timesheets Templates" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1136 +msgid "Confirm user edition" msgstr "" #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47 @@ -4836,44 +5812,53 @@ msgstr "" msgid "You are going to change the assignment function. Are you sure?" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionField.java:81 +msgid "length not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:114 +msgid "the items can not passes until the previous items are passed." +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:150 +msgid "number of digits is out of range" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MyTasksAreaController.java:163 +msgid "Track time" +msgstr "" + #: 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 "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 -msgid "Exception Days" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:296 -msgid "Incompatible update: stored resource is not of type: {0}" -msgstr "" - #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:182 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:234 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:72 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:146 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:187 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:127 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:127 +#: libreplan-webapp/src/main/webapp/profiles/_editProfile.zul:72 +#: libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul:42 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:186 #: 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/typeofworkhours/_editTypeOfWorkHours.zul:79 msgid "Save & Continue" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:92 -msgid "Scheduling mode" +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 +msgid "LibrePlan: Work And Progress Per Project" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:53 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:54 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:83 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34 @@ -4881,18 +5866,32 @@ msgstr "" msgid "Filter" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 -msgid "LibrePlan: Work And Progress Per Project" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:145 +msgid "Scheduling mode" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:945 -msgid "Work Report Type" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:127 +msgid "Total expenses" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:266 +msgid "the default max value must be greater than the precision value" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:291 +msgid "Stretch date must not be after task end date: " msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:26 msgid "Assigned locations" msgstr "" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:44 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 +msgid "Subcontracting date" +msgstr "" + #: 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 @@ -4904,37 +5903,49 @@ msgstr "" msgid "Report progress" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:123 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:248 msgid "ACWP" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:791 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:89 +msgid "Authentication type" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:450 +msgid "cannot be empty." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:827 msgid "The periods available depend on the resource's calendar." msgstr "" -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:86 -msgid "Authentication type" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266 +msgid "can not pass until the previous item is passed" msgstr "" #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:55 msgid "START" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 -msgid "Schedule from the deadline to start" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:71 msgid "generic machines allocation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:384 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:316 +msgid "Schedule from the deadline to start" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:274 +msgid "The start hour cannot be higher than finish hour" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:437 msgid "Non limiting resource assignation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:627 -msgid "Task {0}: Duplicate code in DB" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:53 +msgid "Subcontrated task" msgstr "" #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 @@ -4950,22 +5961,9 @@ msgid "Subcontractor" msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:41 -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:33 msgid "Administration" msgstr "" -#: 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/planner/order/OrderPlanningController.java:319 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:616 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:240 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:658 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1351 -msgid "must be greater than start date" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47 msgid "Cancel and return" msgstr "" @@ -4975,28 +5973,38 @@ msgstr "" msgid "Assign quality form" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 -msgid "Calculated budget" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:116 +msgid "Planning Configuration" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 msgid "Delete item {0}. Are you sure?" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:51 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:188 +msgid "Calculated budget" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:199 +msgid "last label sequence code not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:51 msgid "Unit measure name" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 -msgid "worked hours" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:865 +msgid "" +"You can not remove the project \"{0}\" because it has work reported on it or " +"any of its tasks" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:139 -msgid "cannot include a progress of the same progress type twice" +#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:31 +msgid "Available hours" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:476 -msgid "a work report line has not this label type assigned" +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:663 +msgid "Personal" msgstr "" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:52 @@ -5004,30 +6012,40 @@ msgstr "" msgid "Allocations" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/Configuration.java:136 +msgid "company code must not contain white spaces" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:137 msgid "Choosing Template" msgstr "" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66 -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -msgid "Capacity" -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:135 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49 msgid "Length" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 +msgid "Task code" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:338 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:66 +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 +msgid "Capacity" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceAssignment.java:75 +msgid "advance type not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:333 msgid "Create derived" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:302 +#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:298 msgid "Label Types" msgstr "" @@ -5039,20 +6057,40 @@ msgstr "" msgid "must be a real positive number" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122 -msgid "Total hours task" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java:195 +msgid "" +"The previous advance measurements must have a value less than the value of " +"the posterior advance measurements." msgstr "" #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33 msgid "No Allocations have been done" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:443 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122 +msgid "Total hours task" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:49 +msgid "" +"If you reached this page from another page of LibrePlan please notify us in " +"order to fix it as soon as possible." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442 msgid "Removed calendar \"{0}\"" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1108 +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:155 +msgid "expense sheet not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 +msgid "LibrePlan: Timesheets Templates" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1073 msgid "Create project" msgstr "" @@ -5060,66 +6098,80 @@ msgstr "" msgid "This date can not include the whole next work week" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:46 +msgid "Next" +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:1199 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1230 msgid "Consolidated progress measurement can not be removed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1301 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1340 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:412 +msgid "the code cannot be empty" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:369 +msgid "At least one HoursGroup is needed for each OrderElement" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:514 msgid "The code cannot be empty." msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java:237 +msgid "max value must be greater than zero" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 msgid "Human hours per machine working hour within configuration unit" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:113 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:109 msgid "" "Could not add those authorizations to user {0} because they were already " "present." msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:103 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47 -msgid "New work report" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:305 msgid "Root calendar" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:847 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1016 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "yes" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 -msgid "" -"Deleting this subcontracted project, you are going to lose the relation to " -"report progress. Are you sure?" -msgstr "" - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 msgid "Select gap" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:262 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 msgid "Port" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:63 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64 msgid "Date Finish" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:455 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:147 +msgid "From" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:556 +msgid "Resources or criteria" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:224 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95 msgid "Validate" @@ -5129,8 +6181,12 @@ msgstr "" msgid "This resource has already been added." msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:162 -msgid "Calendar exception types" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:111 +msgid "advance assignment not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:239 +msgid "There are repeated material category codes" msgstr "" #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36 @@ -5139,15 +6195,11 @@ msgstr "" msgid "Cost category assignment" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:150 -msgid "missing code in a hour cost" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:145 +msgid "number of digits not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:247 -msgid "Exception Day Type" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:940 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1010 msgid "All workers" msgstr "" @@ -5161,60 +6213,25 @@ msgstr "" msgid "Select required criteria set and press filter button" msgstr "" -#: 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:311 -#: 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/templates/TemplatesTreeController.java:110 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:131 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:994 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1184 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1441 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:171 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1528 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1552 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:740 -#: 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/excetiondays/_editExceptionDayType.zul:43 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:92 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:94 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.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/users/_editProfile.zul:43 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:49 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:89 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50 -#: 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/orders/_projectDetails.zul:38 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:51 -#: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 -msgid "cannot be null or empty" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:758 +msgid "" +"Advance assignment can not be removed because, it has advance measures that " +"have already been reported to customer." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:52 -msgid "New code" +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:112 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:116 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java:120 +msgid "%s h" +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217 +msgid "Timesheet lines" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:460 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:435 +msgid "last order element sequence code not specified" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java:91 @@ -5225,15 +6242,11 @@ msgstr "" msgid "Calculate Resources per Day" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:906 -msgid "The index fields and labels must be uniques and consecutives" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:255 msgid "Estimate To Complete" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:83 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:85 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 @@ -5244,12 +6257,19 @@ msgstr "" msgid "Load due to other assignments" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554 -msgid "This machine was already removed by other user" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:239 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:222 +msgid "End date is not valid, the new end date after the start date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300 -msgid "Work Reports" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:508 +msgid "Personal area" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:351 +msgid "" +"Last stretch should have one hundred percent forlength and amount of work " +"percentage" msgstr "" #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:26 @@ -5260,18 +6280,38 @@ msgstr "" msgid "Cost Categories List" msgstr "" +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:28 +msgid "Current state indicators" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:109 msgid "code is already used" msgstr "" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:20 +msgid "LibrePlan: Received From Subcontractors" +msgstr "" + #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:67 msgid "Labels list" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormItem.java:72 +msgid "quality form item name not specified or empty" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152 msgid "Criterion Requirements" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:188 +msgid "working hours not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:160 +msgid "format sequence code invalid. It must not contain '_'" +msgstr "" + #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:200 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:227 @@ -5286,6 +6326,10 @@ msgstr "" msgid "Move selected task down" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:101 +msgid "quality form type not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:32 msgid "Customer Reference" @@ -5296,6 +6340,10 @@ msgstr "" msgid "spread values are not valid, at least one value should be true" msgstr "" +#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:91 +msgid "Overtime ratio" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89 msgid "Create and assign label" msgstr "" @@ -5304,30 +6352,35 @@ msgstr "" msgid "Optimistic" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:250 msgid "SV" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:457 +msgid "template name is already being used" +msgstr "" + #: 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:1471 -msgid "Filter work reports" +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:119 +msgid "Add task" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:985 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:685 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:605 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1055 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:691 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:626 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:45 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:38 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul:58 msgid "Progress" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:429 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:428 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "the Configuration window before." @@ -5339,23 +6392,29 @@ msgid "" "or resources" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:321 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1068 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1129 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:330 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1097 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1160 msgid "" "This progress measurement cannot be deleted or changed because it is " "consolidated" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1247 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1286 msgid "All progress types have already been assigned." msgstr "" +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:37 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:37 +msgid "Show :" +msgstr "" + #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 msgid "Price per hour" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:52 msgid "Calendars" msgstr "" @@ -5363,31 +6422,27 @@ msgstr "" msgid "Project: {0} " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:360 -msgid "The date cannot be null" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceMeasurement.java:102 +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:93 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/valueobjects/DescriptionValue.java:80 +msgid "value not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:317 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:315 msgid "" "Another task in the same branch is already reporting progress for this " "quality form" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:457 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:148 +msgid "To" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 msgid "options" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 -msgid "LibrePlan: Work Reports" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:393 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 -msgid "Error on showing delete confirm" -msgstr "" - #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:32 msgid "Show only current satisfied criteria" msgstr "" @@ -5396,10 +6451,14 @@ msgstr "" msgid "Latest date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:421 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:388 msgid "Deadline cannot be empty in backwards mode" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:322 +msgid "the cost category name has to be unique. It is already used" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" msgstr "" @@ -5408,11 +6467,30 @@ msgstr "" msgid "Group by weeks" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:82 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/UserBandboxFinder.java:47 +msgid "Full name" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:122 +msgid "Default user \"admin\" cannot be removed as it is mandatory" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:380 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:154 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:64 +msgid "Hours Types" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:271 +msgid "Bound user has proper role" +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:112 msgid "Finish hour" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:196 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:200 msgid "Done {0} of {1}" msgstr "" @@ -5426,23 +6504,27 @@ msgid "" "percentage" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:60 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:96 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:62 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:62 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:73 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:98 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:43 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:77 msgid "Filter by projects" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:293 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:494 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:302 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:509 msgid "" "This progress assignment cannot be deleted or changed because it has some " "progress consolidation" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:730 +#: libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul:80 +msgid "VAC (Variance At Completion)" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:750 msgid "Consolidated progress can not be removed" msgstr "" @@ -5456,11 +6538,11 @@ msgstr "" #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:218 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 msgid "Active" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1266 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1305 msgid "This progress measurement can not be in " msgstr "" @@ -5468,12 +6550,12 @@ msgstr "" msgid "Inherited labels" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:939 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1406 -msgid "Value is not valid, the current value must be not empty" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:56 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:249 +msgid "Delivery date" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1079 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1150 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 msgid "Unindent" msgstr "" @@ -5482,15 +6564,21 @@ msgstr "" msgid "Direct labels" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/consolidations/ConsolidatedValue.java:70 +msgid "task end date not specified" +msgstr "" + #: 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 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:97 msgid "Log in" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:54 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 msgid "Project name" msgstr "" @@ -5498,8 +6586,8 @@ msgstr "" msgid "Precision" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:359 -msgid "missing code in a work report line" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ConfigurationRolesLDAP.java:56 +msgid "role libreplan not specified" msgstr "" #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:41 @@ -5510,30 +6598,44 @@ msgstr "" msgid "Efforts" msgstr "" -#: 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 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:1094 +msgid "" +"the work week: the dates should be corrects and sorted and could not overlap" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:103 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:122 msgid "Projects List" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:235 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java:388 +msgid "budget not specified" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java:110 +msgid "order element associated to a task group must be not null" +msgstr "" + #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:60 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:136 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:62 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:81 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:163 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 +#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:45 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:55 #: 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/orders/_projectDetails.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:82 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:53 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:88 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:46 msgid "Generate code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:488 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:497 msgid "The code sequence is already in use and it can not be updated." msgstr "" @@ -5541,11 +6643,11 @@ msgstr "" msgid "Scheduling state" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:389 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:391 msgid "This template can not be removed because it has applications." msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:43 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:44 msgid "Personal Data" msgstr "" @@ -5557,23 +6659,32 @@ msgstr "" msgid "LibrePlan: Hours Worked Per Resource" msgstr "" +#: libreplan-webapp/src/main/webapp/users/users.zul:23 +msgid "LibrePlan: User Accounts" +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/webapp/orders/_listOrderElementHours.zul:151 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:213 msgid "Budget in money" msgstr "" +#: libreplan-webapp/src/main/webapp/common/access_forbidden.zul:45 +#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:45 +msgid "Go to init" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:201 +msgid "timesheet not specified" +msgstr "" + #: libreplan-webapp/src/main/webapp/common/error.zul:54 #: libreplan-webapp/src/main/webapp/common/event_error.zul:50 msgid "Reload" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 -msgid "Virtual Workers Groups" -msgstr "" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 msgid "Profiles authorization" msgstr "" @@ -5582,10 +6693,14 @@ msgstr "" msgid "Assignation" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:95 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:98 msgid "Planning charts expanded" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:127 +msgid "label type name is already being used" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:341 msgid "Not deletable" msgstr "" @@ -5594,71 +6709,95 @@ msgstr "" msgid "Inh" msgstr "" -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28 -msgid "Administrator" +#: libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheetLine.java:92 +msgid "value must be greater or equal than 0" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:186 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:190 msgid "Doing {0} reassignations" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:192 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:212 msgid "Select entity" msgstr "" +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:114 +msgid "Go to worker edition window" +msgstr "" + +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 +msgid "Worked hours" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:587 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48 msgid "code not specified" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:249 +msgid "orderElement:the order element must be not null if is shared by lines" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_list.zul:22 msgid "Projects list" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159 -msgid "if the report is not opened automatically" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java:261 +msgid "" +"clockFinish:the clockStart must be not null if number of hours is calcultate " +"by clock" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:975 -msgid "" -"Cannot delete work report type. There are some work reports bound to it." +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:1201 +msgid "last sequence code not specified" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:183 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:184 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:223 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:212 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:91 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:164 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:191 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:161 +msgid "if the report is not opened automatically" msgstr "" #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:22 msgid "Criterion Type List" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:765 -msgid "Overall progress" -msgstr "" - #: 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:129 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java:122 +msgid "order element associated to a milestone must be null" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:157 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:256 msgid "All projects" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:64 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:283 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:67 +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:49 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:148 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:84 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:303 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:92 msgid "Observations" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:987 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:32 +msgid "Expense Sheet List" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 msgid "Edit project" msgstr "" @@ -5672,18 +6811,10 @@ msgstr "" msgid "Valid from" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:55 msgid "Month" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:206 -msgid "exception date already exists" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:308 -msgid "There exists other template with the same name." -msgstr "" - #: 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 "" @@ -5705,46 +6836,50 @@ msgstr "" msgid "criterion satisfaction's start date not specified" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:149 +msgid "You do not have permissions to edit the project" +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/java/org/libreplan/web/planner/allocation/AllocationRow.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:441 msgid "Only {0} resources per day were achieved for current allocation" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 #: libreplan-webapp/src/main/webapp/planner/main.zul:66 #: libreplan-webapp/src/main/webapp/planner/order.zul:128 #: libreplan-webapp/src/main/webapp/planner/order.zul:163 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:87 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:102 msgid "Accept" msgstr "" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:342 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:356 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:285 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:327 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:376 msgid "Example: {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:458 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:975 msgid "" -"Create new material assignment out of material assignment {0}. Are you sure?" +"Cannot delete timesheet template. There are some timesheets bound to it." msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:190 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:167 -msgid "Work report lines" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:459 +msgid "" +"Create new material assignment out of material assignment {0}. Are you sure?" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 @@ -5755,12 +6890,13 @@ msgstr "" msgid "Completed: {0}% " msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1194 -msgid "Calculated progress measurement can not be removed" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:288 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1293 +msgid "You do not have permissions to create templates" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:252 -msgid "Exception Day Types" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1225 +msgid "Calculated progress measurement can not be removed" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java:335 @@ -5768,7 +6904,7 @@ msgstr "" msgid " The " msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:55 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:56 msgid "Access to the system" msgstr "" @@ -5776,27 +6912,39 @@ msgstr "" msgid "Probability" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:112 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:139 msgid "Report data" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:184 +msgid "Material Unit" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:44 msgid "External load" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:206 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:641 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:650 +msgid "" +"There are unsaved changes in the current monthly timesheet, please save " +"before moving" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:207 msgid "Progress sent successfully" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:242 +msgid "" +"End date is not valid, the new end date must be after the current end date" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73 msgid "Priority" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46 -msgid "instance not found" -msgstr "" - #: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 msgid "Apply changes and continue edition" msgstr "" @@ -5806,21 +6954,17 @@ msgstr "" msgid "Infinitely Over Assignable" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:157 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:246 msgid "Money spent" 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:790 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:826 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:824 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:818 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 @@ -5828,44 +6972,52 @@ msgstr "" #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:59 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:80 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:131 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:61 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:82 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:52 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:76 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:173 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:67 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54 #: 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/costcategories/_editCostCategory.zul:40 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:86 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:26 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 +#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:31 +#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:29 +#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:37 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:201 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:276 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:48 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:83 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:26 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul:40 msgid "Code" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:193 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:606 +msgid "Monthly timesheet saved" +msgstr "" + #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40 msgid "Add stretch" msgstr "" @@ -5883,17 +7035,22 @@ msgid "Calculate Workable Days" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:241 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:216 msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:114 +msgid "unit name not specified" +msgstr "" + #: 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/hoursWorkedPerWorkerReport.zul:51 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:53 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:53 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:55 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 +#: libreplan-webapp/src/main/webapp/myaccount/_myTasksArea.zul:33 #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 msgid "Start date" msgstr "" @@ -5902,17 +7059,17 @@ msgstr "" msgid "Update exception" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:253 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:257 msgid "Operation cannot be done" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:91 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:90 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:80 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:108 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:82 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:55 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:65 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:168 msgid "Budget" msgstr "" @@ -5928,11 +7085,25 @@ msgstr "" msgid "Unit name" msgstr "" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:23 +msgid "LibrePlan: Main Settings" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:266 +msgid "" +"The quality form item porcentage must be unique if the quality form type is " +"by percentage." +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLabelTypeAssigment.java:64 +msgid "default label not specified" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 msgid "Project code" msgstr "" @@ -5949,10 +7120,12 @@ msgstr "" msgid "Assign element to queue automatically" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:92 -msgid "" -"Date which the task must start after (press enter in textbox to open " -"calendar popup or type in date directly)" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:396 +msgid "Confirm worker edition" +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 +msgid "type" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:600 @@ -5960,23 +7133,20 @@ msgstr "" msgid "Normal" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:317 -msgid "Date cannot be null" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:391 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:36 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:65 +msgid "Main Settings" msgstr "" -#: 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:768 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:106 msgid "Task Code" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:657 -msgid "This label type already is assigned to the work report type." +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:111 +msgid "Project view" msgstr "" #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51 @@ -5985,9 +7155,9 @@ msgstr "" msgid "Probability %" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:321 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:815 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:854 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" msgstr "" @@ -5997,19 +7167,22 @@ msgstr "" msgid "New criterion" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:690 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:81 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:696 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:83 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:54 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:87 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:103 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:32 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:77 +#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:31 +#: libreplan-webapp/src/main/webapp/myaccount/_expensesArea.zul:29 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:98 msgid "Description" msgstr "" @@ -6018,6 +7191,15 @@ msgstr "" msgid "Apply" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:976 +msgid "Do you want to remove bound user \"{0}\" too?" +msgstr "" + +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:52 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:52 +msgid "Communication Type" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48 msgid "Selected node" msgstr "" @@ -6026,12 +7208,11 @@ msgstr "" msgid "already exists an allocation for criteria {0}" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:303 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294 -msgid "Project Templates" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:216 +msgid "Project type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313 msgid "Forward" msgstr "" @@ -6049,21 +7230,30 @@ msgstr "" msgid "Unnasigned" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 msgid "At least one HoursGroup is needed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:243 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:116 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:75 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165 msgid "User" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/_monthlyTimesheetsArea.zul:35 +msgid "Number of tasks" +msgstr "" + #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71 msgid "Interacts with applications" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44 +msgid "Resource name (Resource code)" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:289 msgid "Virtual worker" msgstr "" @@ -6076,34 +7266,63 @@ msgstr "" msgid "Multiple values per resource" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:60 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 msgid "Split" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:436 +msgid "Communications" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:107 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:110 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100 msgid "please, select a project" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:122 +#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:200 +msgid "Cannot remove the predefined calendar exception day \"{0}\"" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:123 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java:176 +msgid "Task deadline violations" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:53 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:33 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:68 #: 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/resources/_criterions.zul:41 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:57 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:58 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:96 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:127 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30 msgid "Starting date" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144 +msgid "criterion satisfaction codes must be unique insidea resource" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:146 +msgid "the type of work hours for monthly timesheets cannot be disabled" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1076 +msgid "cost because of worked hours: {0}, cost because of expenses: {1}" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:631 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1267 +msgid "You should select an end date for the exception" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:62 msgid "Add materials" msgstr "" @@ -6112,56 +7331,73 @@ msgstr "" msgid "Load 100%" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:21 +msgid "LibrePlan: Monthly timesheet" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:943 #: 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:825 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:360 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:766 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:362 msgid "date in future" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:156 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:137 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420 +msgid "criterion codes must be unique inside a criteriontype" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/UnitType.java:85 +msgid "the measure has to be unique" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:158 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:159 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:196 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:189 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:139 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:137 msgid "Format" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:885 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:932 msgid "New project version" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:110 +msgid "label names must be unique inside a label type" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:79 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java:207 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java:249 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:488 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1271 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:504 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1236 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:81 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:134 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:41 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:48 +#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:46 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:35 +#: libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:45 msgid "Edit" msgstr "" @@ -6170,62 +7406,79 @@ msgstr "" msgid "Init date" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:106 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:93 msgid "Responsible" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:63 +#: libreplan-webapp/src/main/webapp/myaccount/changePassword.zul:71 msgid "New password" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:253 -msgid "percentage must be in range (0,100]" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:316 +msgid "Some stretch has lower or equal values than theprevious stretch" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:44 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:53 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:236 +msgid "resource:the resource must be not null if is shared by lines" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:159 +msgid "" +"The planning of this task is not in the current scenenario.\n" +"You should change to any of the following scenarios: {0}" +msgstr "" + +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:20 +msgid "LibrePlan: Received From Customers" +msgstr "" + +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:134 +msgid "New user" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:51 msgid "New Description" msgstr "" -#: 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 "" - -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:165 -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:161 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:166 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:184 msgid "XML" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:187 -msgid "" -"CriterionType is not valid, the criterionType overlap other " -"criterionSatisfaction whith same criterionType" -msgstr "" - -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:85 -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61 -msgid "Unable to convert {0} value to {1} type" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java:349 +msgid "the order must have a init date" msgstr "" #: 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:82 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:84 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:112 msgid "Unit price" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:109 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:126 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:250 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:278 +msgid "Communication date" +msgstr "" + +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:102 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:66 +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:55 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:55 msgid "Project Code" msgstr "" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 -msgid "Communication date" +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java:389 +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java:171 +msgid "report advance not specified" msgstr "" #: libreplan-webapp/src/main/webapp/planner/reassign.zul:30 @@ -6236,8 +7489,11 @@ msgstr "" 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java:28 +msgid "Not Reviewed" +msgstr "" + +#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:27 msgid "Unit Measure" msgstr "" @@ -6247,27 +7503,29 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java:44 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61 -#: 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:127 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:56 +#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:91 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:150 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174 -#: 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/workingArrangementsPerOrderReport.zul:103 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:144 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:25 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146 +#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:25 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:36 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47 @@ -6282,8 +7540,9 @@ msgstr "" msgid "Type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:348 -msgid "{0} projects reassignation remaining" +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:43 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:43 +msgid "Refresh" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:542 @@ -6292,79 +7551,106 @@ msgid "" "imputed hours" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:501 +msgid "Home" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "November" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:89 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 msgid "Enable/Disable" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1289 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1311 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1328 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1350 msgid "" "Value is not valid, the value must be greater than the value of the previous " "progress." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:122 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:247 msgid "BCWS" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java:343 -msgid " in the specified directory." +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1520 +msgid "must be before finish date" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144 -msgid "criterion satisfaction codes must be unique inside a resource" +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:253 +msgid "percentage should be between 1 and 100" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:847 +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:57 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul:57 +msgid "Communication Date" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:1016 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "no" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:347 -msgid "missing code in a work report." +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java:45 +msgid "Task name (Task code)" msgstr "" #: 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/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnumByResourceAndCriterion.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.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/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:118 msgid "Criterion" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:624 +msgid "Edit Timesheet" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:103 msgid "unl" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:289 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1628 +msgid "Please select a worker" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:309 msgid "Test LDAP connection" msgstr "" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 msgid "Generate code for" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103 -#: 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 -msgid "missing code in a label" +#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/Label.java:44 +#: libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java:50 +#: libreplan-business/src/main/java/org/libreplan/business/scenarios/entities/Scenario.java:114 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:193 +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java:94 +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java:365 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java:160 +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:99 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:519 +msgid "name not specified" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:123 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:248 msgid "Actual Cost Work Performed" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:176 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:140 msgid "Create project from Template" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:422 +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:42 +msgid "Previous" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:436 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" @@ -6375,15 +7661,15 @@ msgstr "" msgid "an authorization type must be set" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:101 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:100 msgid "Must start after (days since beginning project)" msgstr "" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:134 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:194 msgid "Percentage of estimated budget in money / money spent" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:884 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:931 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6391,27 +7677,29 @@ msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156 #: 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:47 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:97 #: 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/workingProgressPerTaskReport.zul:84 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 -#: 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/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/schedulingProgressPerOrderReport.zul:105 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:92 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:133 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:127 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:127 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:82 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:165 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:75 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:156 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:107 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:94 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:135 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:86 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:268 msgid "Add" msgstr "" @@ -6420,38 +7708,43 @@ msgstr "" msgid "Stacktrace" msgstr "" -#: libreplan-webapp/src/main/webapp/materials/materials.zul:48 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:50 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:79 msgid "Unselect" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:1103 +msgid "Hours Group at {0}" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:613 msgid "You should select the type of exception" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:103 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:63 +#: libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul:54 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:64 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:132 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31 msgid "Deadline" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:234 +msgid "Some sequences to be removed does not exist" +msgstr "" + +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:115 msgid "Tasks" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:118 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120 msgid "Filter by categories or materials" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 -msgid "Subcontracted Tasks" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:389 msgid "Amount work percentage should be between 0 and 100" msgstr "" @@ -6460,7 +7753,7 @@ msgstr "" msgid "Machine data" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:128 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:253 msgid "VAC" msgstr "" @@ -6470,10 +7763,6 @@ msgstr "" msgid "Label type" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 -msgid "Administration / Management" -msgstr "" - #: 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" @@ -6483,7 +7772,11 @@ msgstr "" msgid "Number of iterations" msgstr "" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:61 +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:262 +msgid "label type:the timesheet have not assigned this label type" +msgstr "" + +#: libreplan-webapp/src/main/webapp/templates/_editTemplate.zul:42 msgid "Template Tree" msgstr "" @@ -6496,16 +7789,15 @@ msgstr "" msgid "Criterion has subelements" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:204 -msgid "inconsistent parent code." +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +msgid "Last communication" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:430 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:427 msgid "effort is not properly calculated based on clock" msgstr "" -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:63 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:65 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 msgid "Status" msgstr "" @@ -6514,19 +7806,19 @@ msgstr "" msgid "from {0}" msgstr "" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:111 +#: libreplan-webapp/src/main/webapp/myaccount/settings.zul:114 msgid "Resource load view" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:813 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:754 msgid "the date must be inside the visualization area" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:81 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:84 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:114 #: 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/_taskInformation.zul:34 @@ -6549,14 +7841,6 @@ msgstr "" msgid "{0} \"{1}\" deleted" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523 -msgid "date not specified." -msgstr "" - -#: 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:1201 msgid "Limiting assignment" msgstr "" @@ -6565,9 +7849,8 @@ msgstr "" msgid " hours" msgstr "" -#: 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 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:135 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:156 msgid "Limiting Resources Planning" msgstr "" @@ -6579,21 +7862,16 @@ msgstr "" msgid "New label" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:137 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:144 msgid "Worker ID cannot be empty" 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 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:303 msgid "All project tasks" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343 -msgid "The start date cannot be null" -msgstr "" - -#: libreplan-webapp/src/main/webapp/common/configuration.zul:370 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:390 msgid "LDAP Roles (separated by ;)" msgstr "" @@ -6602,44 +7880,65 @@ msgstr "" msgid "Allocation configuration" msgstr "" -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:209 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:189 -msgid "Save & New work report" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:350 +msgid "Database" msgstr "" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:52 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:61 msgid "Subcontract price" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:799 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:427 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:71 +msgid "Send To Customers" +msgstr "" + +#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:40 +msgid "The page that you are requesting does not exist." +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:835 msgid "Resources per day are zero" msgstr "" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:38 +msgid "Timesheets List" +msgstr "" + +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:95 +msgid "Total extra per day" +msgstr "" + #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 msgid "Assigned criteria" msgstr "" -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:57 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58 msgid "Help on authentication (opens a new window)" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 -msgid "Not a valid effort duration" -msgstr "" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:780 msgid "The length must be greater than 0, and not null." msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:200 -msgid "Cannot remove the predefined Exception Day Type \"{0}\"" +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java:189 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 +msgid "Not a valid effort duration" +msgstr "" + +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:52 +msgid "Timesheet data" msgstr "" #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 msgid "Base calendar type" msgstr "" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:78 +msgid "Imputed expenses" +msgstr "" + #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:606 msgid "Could not save new calendar" msgstr "" @@ -6656,20 +7955,30 @@ msgstr "" msgid "Couldn't find criterion {0}" msgstr "" +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java:317 +msgid "Already exists other template with the same name" +msgstr "" + #: 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:347 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150 +msgid "" +"resources cost category assignment codes must beunique inside a resource" +msgstr "" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:485 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:39 msgid "Task Scheduling Status In Project" msgstr "" #: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:162 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:376 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/ExpensesAreaController.java:92 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:378 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:873 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "" @@ -6678,24 +7987,23 @@ msgstr "" #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 -#: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:54 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:36 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:49 +#: libreplan-webapp/src/main/webapp/unittypes/_listUnitTypes.zul:32 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 #: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:58 msgid "Create" msgstr "" -#: 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" +#: libreplan-business/src/main/java/org/libreplan/business/requirements/entities/IndirectCriterionRequirement.java:77 +msgid "parent not specified" msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 @@ -6703,10 +8011,14 @@ msgstr "" msgid "Permissions" msgstr "" -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:487 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:491 msgid "List of materials for category: {0}" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java:307 +msgid "There are repeated description values in the timesheet" +msgstr "" + #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36 msgid "Cancel edition" msgstr "" @@ -6716,60 +8028,70 @@ msgstr "" msgid "Total price" msgstr "" +#: libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul:36 +msgid "Warning: Not editing from home page of bound users" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/VirtualWorker.java:97 +msgid "Virtual worker group name must be unique" +msgstr "" + #: 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/workreports/WorkReportCRUDController.java:1214 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:212 +#: libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java:412 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1208 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1220 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:346 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1117 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1123 -#: 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/tree/TreeController.java:1188 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1194 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:456 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:162 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java:223 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:890 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1210 #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1457 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:453 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:803 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:966 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1230 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1269 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:389 #: 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/orders/OrderCRUDController.java:1287 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:404 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1252 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1655 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:107 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:87 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 -#: 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/hoursWorkedPerWorkerReport.zul:133 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:53 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:107 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:148 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:148 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:104 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:145 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:186 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:135 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:177 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:129 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:115 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:156 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:108 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:170 +#: libreplan-webapp/src/main/webapp/templates/_listTemplates.zul:51 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:57 +#: libreplan-webapp/src/main/webapp/profiles/_listProfiles.zul:40 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 @@ -6780,9 +8102,10 @@ msgstr "" #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:54 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:56 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 +#: libreplan-webapp/src/main/webapp/typeofworkhours/_listTypesOfWorkHours.zul:50 msgid "Delete" msgstr "" @@ -6790,6 +8113,22 @@ msgstr "" msgid "Labels without inheritance" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31 +msgid "New project" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:31 +msgid "Progress Update" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32 +msgid "Update Delivering Date" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/CommunicationType.java:32 +msgid "End date update" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32 msgid "RECEIVED" msgstr "" @@ -6830,18 +8169,6 @@ msgstr "" msgid "Number of assigned hours and the time" msgstr "" -#: 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:118 -msgid "Init date cannot be empty or null" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123 -msgid "End date cannot be empty or null" -msgstr "" - #: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29 msgid "by percentage" msgstr "" @@ -6875,15 +8202,22 @@ msgid "Sigmoid" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30 -msgid "Pending" -msgstr "" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 -msgid "Failed sent" +msgid "Pending initial send" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:33 +msgid "Pending update delivering date" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:34 +msgid "Failed sent" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:34 +msgid "Failed update" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:35 msgid "Success sent" msgstr "" @@ -6908,15 +8242,11 @@ msgid "Maybe the criteria are not satisfied in those days." msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 -msgid "" -"The resource's calendar has no available days starting from the start of the " -"task." +msgid "Resource is not available from task's start" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:180 -msgid "" -"There are no days available at resource's calendar in the days marked " -"available by the task's calendar." +msgid "Resource is not available according to task's calendar" msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28 @@ -6927,10 +8257,22 @@ msgstr "" msgid "In progress" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30 +msgid "Pending" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31 msgid "Blocked" msgstr "" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:32 +msgid "Ready to start" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java:35 +msgid "Deadline violated" +msgstr "" + #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:31 msgid "as soon as possible" msgstr "" @@ -6967,27 +8309,67 @@ msgstr "" msgid "Write authorization" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:34 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37 msgid "Web service reader" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:38 msgid "Web service writer" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:36 -msgid "All projects read allowed" +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:39 +msgid "Web service subcontractor operations" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37 -msgid "All projects edition allowed" +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:41 +msgid "Read all projects" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:38 -msgid "Project creation allowed" +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:42 +msgid "Edit all projects" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:132 +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:43 +msgid "Create projects" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:73 +msgid "Timesheet Lines List Report" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:74 +msgid "Hours Worked Per Resource Report" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:75 +msgid "Total Worked Hours By Resource In A Month Report" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:76 +msgid "Work And Progress Per Project Report" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:77 +msgid "Work And Progress Per Task Report" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:78 +msgid "Estimated/Planned Hours Per Task Report" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:79 +msgid "Project Costs Report" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:80 +msgid "Task Scheduling Status In Project Report" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:81 +msgid "Materials Needs At Date Report" +msgstr "" + +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:156 msgid "Line" msgstr "" @@ -7059,14 +8441,6 @@ msgstr "" msgid "Sunday" 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:139 -msgid "No" -msgstr "" - #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207 msgid "[generic all machines]" msgstr "" @@ -7155,23 +8529,23 @@ msgstr "" msgid "U" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:629 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:662 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:728 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:761 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:995 msgid "Cannot spread two progress in the same task" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:752 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:778 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:785 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:811 msgid "Duplicate Progress Assignment For Task" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1105 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1133 msgid "Quality form already exists" msgstr "" @@ -7209,10 +8583,6 @@ msgstr "" msgid "The criterion already exist into other task" msgstr "" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36 -msgid "Spreading progress" -msgstr "" - #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37 msgid "Progress with all tasks by hours" msgstr ""