From c17f868a41ff5c749eab40621912bed88b6f2fc8 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 18 Jul 2011 11:29:27 +0200 Subject: [PATCH] [i18n] Update keys.pot files. FEA: ItEr75S03CommunityMaterial --- ganttzk/src/main/resources/i18n/keys.pot | 62 +- .../src/main/resources/i18n/keys.pot | 3057 +++++++++-------- 2 files changed, 1571 insertions(+), 1548 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot index f04e9367c..f6cb8e0d9 100644 --- a/ganttzk/src/main/resources/i18n/keys.pot +++ b/ganttzk/src/main/resources/i18n/keys.pot @@ -10,9 +10,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.1.1\n" +"Project-Id-Version: 1.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-06 22:45+0200\n" +"POT-Creation-Date: 2011-07-18 11:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,8 +50,8 @@ msgstr "" msgid "Show/Hide reported hours" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46 msgid "Zoom" msgstr "" @@ -71,14 +71,14 @@ msgstr "" msgid "Show/Hide progress" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 -msgid "Task" -msgstr "" - #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91 msgid "by resources" msgstr "" +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 +msgid "Task" +msgstr "" + #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64 msgid "Criterion" msgstr "" @@ -95,14 +95,14 @@ msgstr "" msgid "Week" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:111 -msgid "See scheduling" -msgstr "" - #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489 msgid "filtering by name" msgstr "" +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:111 +msgid "See scheduling" +msgstr "" + #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30 msgid "End" msgstr "" @@ -123,25 +123,25 @@ msgstr "" msgid "None" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 -msgid "Filter" -msgstr "" - #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69 msgid "Flatten/Unflatten tree" msgstr "" +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 +msgid "Filter" +msgstr "" + #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Project" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50 -msgid "Name filter" +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68 +#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 +msgid "Name" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28 -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68 -msgid "Name" +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50 +msgid "Name filter" msgstr "" #: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572 @@ -188,22 +188,22 @@ msgstr "" msgid "Hide critical path" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599 -msgid "Hide reported hours" -msgstr "" - #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84 msgid "Day" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142 -msgid "showing resources" +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599 +msgid "Hide reported hours" msgstr "" #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:184 msgid "Load: {0}%" msgstr "" +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142 +msgid "showing resources" +msgstr "" + #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60 msgid "Show/Hide labels" msgstr "" @@ -212,8 +212,8 @@ msgstr "" msgid "Hour" msgstr "" -#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91 +#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116 msgid "Graphics" msgstr "" @@ -241,10 +241,10 @@ msgstr "" msgid "Refresh" msgstr "" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577 -msgid "Hide progress" -msgstr "" - #: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554 msgid "Show critical path" msgstr "" + +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577 +msgid "Hide progress" +msgstr "" diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index bc9d9e8b0..54d2fd683 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -10,9 +10,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 1.1.1\n" +"Project-Id-Version: 1.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-06 22:45+0200\n" +"POT-Creation-Date: 2011-07-18 11:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,9 +34,9 @@ msgid "No authorizations were added because you did not select any." msgstr "" #: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:88 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:59 #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:45 #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:54 -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:59 #: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:71 msgid "en" msgstr "" @@ -65,80 +65,80 @@ msgstr "" msgid "Create Virtual Worker" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:98 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:820 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:98 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:269 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:40 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:77 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:61 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 +#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:69 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:39 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:231 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:77 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:29 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:61 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87 -#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:28 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:269 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:34 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:39 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:69 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:28 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:231 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 msgid "Operations" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:135 -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:195 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:150 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:195 msgid "There is no type of work hours with this code" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107 #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107 msgid "Select" msgstr "" @@ -148,13 +148,13 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:315 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:33 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:53 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:145 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:55 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:66 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 msgid "Materials" msgstr "" @@ -203,8 +203,8 @@ msgid "Summary" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:316 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:67 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "" @@ -212,6 +212,12 @@ msgstr "" msgid "Reports" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:337 +msgid "" +"The original workable days value {0}, is prevented because consolidated " +"values cannot be modified" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:163 msgid "The {0} sequence prefixes can not be repeated" msgstr "" @@ -228,29 +234,29 @@ msgstr "" msgid "Dedication chart" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:748 -msgid "Not the same hours group, impossible to update" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:701 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:728 msgid "Progress that are reported by quality forms can not be modified" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:748 +msgid "Not the same hours group, impossible to update" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:520 msgid "Cannot delete that material because it is assigned to a project." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:141 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:155 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 -msgid "Resource Usage" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:475 msgid "Remove limiting resource element" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:155 +msgid "Resource Usage" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39 msgid "Active period from" msgstr "" @@ -275,8 +281,8 @@ msgstr "" msgid "Quality form items list" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:218 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:240 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:218 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" @@ -285,18 +291,18 @@ msgstr "" msgid "generic workers allocation" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:914 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:516 +msgid "The project has no scheduled elements" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:796 msgid "Hour start" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:516 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:916 -msgid "The project has no scheduled elements" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/main.zul:53 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36 #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:53 msgid "Start" msgstr "" @@ -333,15 +339,15 @@ msgstr "" msgid "Filter quality forms by :" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:106 +msgid "changing perspective" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:305 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:32 msgid "Transfer Projects Between Scenarios" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:106 -msgid "changing perspective" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:124 msgid "" "Could not add those authorizations to profile {0} because they were already " @@ -352,12 +358,16 @@ msgstr "" msgid "Default calendar" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:296 +msgid "Cannot delete user: it does not exist anymore" +msgstr "" + #: navalplanner-webapp/src/main/webapp/users/profiles.zul:23 msgid "NavalPlan: Profiles" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Project Name" msgstr "" @@ -429,9 +439,9 @@ msgid "" "applicable to this resource" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:50 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:53 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 msgid "Criterion Requirement" msgstr "" @@ -468,8 +478,8 @@ msgstr "" msgid "Client" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:651 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:614 msgid "" "there are no resources for required criteria: {0}. So the generic allocation " "can't be added" @@ -487,9 +497,9 @@ msgstr "" msgid "material category name has to be unique. It is already used" msgstr "" +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:44 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 msgid "Imputed hours" msgstr "" @@ -529,7 +539,7 @@ msgstr "" msgid "Work Report Lines" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1466 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1514 msgid "Configure" msgstr "" @@ -543,7 +553,7 @@ msgstr "" msgid "First name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:252 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:256 msgid "Could not execute print command" msgstr "" @@ -551,16 +561,16 @@ msgstr "" msgid "Complementary text fields" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:137 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:291 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:141 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:418 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:853 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:208 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:418 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:137 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:291 #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:851 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 msgid "Confirm deleting {0}. Are you sure?" msgstr "" @@ -584,9 +594,9 @@ msgstr "" msgid "View" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88 -#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88 msgid "Limiting" msgstr "" @@ -594,12 +604,12 @@ msgstr "" msgid "Required materials" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:312 -msgid "Backwards" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:666 +msgid "resources per day must be not empty and bigger than zero" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:629 -msgid "resources per day must be not empty and bigger than zero" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:312 +msgid "Backwards" msgstr "" #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:68 @@ -644,25 +654,25 @@ msgstr "" msgid "Predecessor" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:55 -msgid "Please select a task" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:189 msgid "Some stretch has higher or equal values than the previous stretch" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:55 +msgid "Please select a task" +msgstr "" + #: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:23 msgid "NavalPlan: Cost Categories" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 #: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:58 #: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:75 #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 msgid "End date" msgstr "" @@ -695,23 +705,23 @@ msgid "Prefix:" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:107 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:110 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:110 msgid "This project has already been added." msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:381 +msgid "The task code cannot be null" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:580 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:320 #: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 msgid "Criteria" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:381 -msgid "The task code cannot be null" -msgstr "" - #: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 msgid "Resource / Criteria" msgstr "" @@ -724,14 +734,14 @@ msgstr "" msgid "Error setting up creation form." msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:29 -msgid "Add new progress assignment" -msgstr "" - #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "" +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:29 +msgid "Add new progress assignment" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:193 msgid "Error on showing warning message removing workReportType: " msgstr "" @@ -752,21 +762,16 @@ msgstr "" msgid "Personal data" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:299 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:162 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:158 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:199 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:200 -msgid "please, select a Criterion" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:732 msgid "Calculated progress can not be removed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 -msgid "June" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:299 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:199 +msgid "please, select a Criterion" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127 @@ -777,6 +782,11 @@ msgstr "" msgid "{0} annotation required on {1}" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66 +msgid "June" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:1031 msgid "Modified" msgstr "" @@ -793,8 +803,8 @@ msgstr "" msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:334 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:89 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:334 msgid "MessagesContainer is needed" msgstr "" @@ -802,11 +812,11 @@ msgstr "" msgid "Project element code" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:69 #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 #: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:69 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:42 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 msgid "Ending date" msgstr "" @@ -818,14 +828,14 @@ msgstr "" msgid "Export options" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:34 -msgid "Subcontracted Tasks List" -msgstr "" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:229 msgid "Last value" msgstr "" +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:34 +msgid "Subcontracted Tasks List" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:705 msgid "Calculated progress can not be modified" msgstr "" @@ -834,9 +844,9 @@ msgstr "" msgid "Statistics log" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 -#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 msgid "Edit Calendar" msgstr "" @@ -886,20 +896,20 @@ msgstr "" msgid "Time period saved" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:305 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:206 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:205 +msgid "This Criterion has already been added." +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250 msgid "" "Are you sure of changing the resource type? You will lose the criteria with " "different resource type." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:305 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:168 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:164 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:205 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:206 -msgid "This Criterion has already been added." -msgstr "" - #: navalplanner-webapp/src/main/webapp/common/configuration.zul:215 msgid "add" msgstr "" @@ -908,19 +918,19 @@ msgstr "" msgid "Unsaved changes will be lost. Would you like to continue?" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:35 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:35 msgid "Filter work report by :" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:290 -msgid "Workers" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ResourceAllocationBehaviour.java:38 msgid "NON_LIMITING" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:290 +msgid "Workers" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeModel.java:102 msgid "Cannot remove {0}, since it is being used by some Exception Day" msgstr "" @@ -954,10 +964,10 @@ msgstr "" msgid "From Chosen" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/order.zul:109 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:109 msgid "Value" msgstr "" @@ -969,8 +979,8 @@ msgstr "" msgid "there are no valid periods for this calendar" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76 msgid "Add role" msgstr "" @@ -1046,6 +1056,7 @@ msgid "Non limiting resource allocation" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:297 msgid "Error removing element: " msgstr "" @@ -1061,8 +1072,8 @@ msgstr "" msgid "Split new assignment" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:53 #: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:53 msgid "Pagination" msgstr "" @@ -1081,16 +1092,16 @@ msgstr "" msgid "Change scenario" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:344 -msgid "" -"Deleting this item, it will disable the report progress option. Are you sure?" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java:84 #: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:69 msgid "Critical path" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:344 +msgid "" +"Deleting this item, it will disable the report progress option. Are you sure?" +msgstr "" + #: navalplanner-webapp/src/main/webapp/materials/materials.zul:38 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83 @@ -1102,8 +1113,8 @@ msgstr "" msgid "Status code:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 msgid "Project Details" msgstr "" @@ -1111,14 +1122,14 @@ msgstr "" msgid "Create Criterion Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 msgid " to go to output directly" msgstr "" @@ -1132,10 +1143,10 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:110 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:110 msgid "Percentage" msgstr "" @@ -1159,8 +1170,8 @@ msgstr "" msgid "Task not found" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:39 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:39 msgid "Total capability" msgstr "" @@ -1176,45 +1187,45 @@ msgstr "" msgid "NavalPlan: User access" msgstr "" +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:21 +msgid "NavalPlan: Materials" +msgstr "" + #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:183 msgid "Exception Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:21 -msgid "NavalPlan: Materials" -msgstr "" - #: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:22 msgid "Profiles List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:278 -msgid "both {0} of category {1} and {2} of category {3} have the same code" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:236 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:869 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:567 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:896 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:236 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:322 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:869 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 msgid "Labels" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:278 +msgid "both {0} of category {1} and {2} of category {3} have the same code" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:318 msgid "Data Types" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:155 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:155 msgid "Total hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:342 msgid "Reassigning {0} projects" msgstr "" @@ -1226,8 +1237,8 @@ msgstr "" msgid "Filter by task status" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:532 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:434 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:533 msgid "Select date:" msgstr "" @@ -1271,12 +1282,12 @@ msgstr "" msgid "already assigned" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:155 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:68 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:131 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:119 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:155 msgid "Calendar" msgstr "" @@ -1290,14 +1301,14 @@ msgstr "" msgid "Resources" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:230 -msgid "CriterionType and its criteria saved" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:153 msgid "Source and destination scenarios should be different" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:230 +msgid "CriterionType and its criteria saved" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:137 msgid "The browser you are using" msgstr "" @@ -1306,12 +1317,12 @@ msgstr "" msgid "scenario" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:50 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:248 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41 #: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:29 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:50 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51 msgid "to" msgstr "" @@ -1331,9 +1342,9 @@ msgstr "" msgid "Select type :" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:263 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:259 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:269 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:263 msgid "Projects Planning" msgstr "" @@ -1362,8 +1373,12 @@ msgstr "" msgid "SPI" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:245 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1334 +msgid "Task contains consolidated progress. Cannot apply sigmoid function." +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:245 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" @@ -1377,7 +1392,7 @@ msgstr "" msgid "Create New Project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1357 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1420 msgid "Stretches list" msgstr "" @@ -1390,48 +1405,48 @@ msgid "Zoom" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:608 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:106 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:95 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:117 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:38 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:42 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:185 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:211 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:185 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:95 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:41 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:106 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:117 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:241 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:38 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:42 #: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:241 msgid "Save" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:109 -msgid "Material categories" -msgstr "" - #: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:61 #: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33 msgid "Standard Effort" msgstr "" +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:109 +msgid "Material categories" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22 msgid "Criteria Requirement" msgstr "" @@ -1460,14 +1475,14 @@ msgstr "" msgid "Assigned load" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 -msgid "Filter by workers" -msgstr "" - #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:139 msgid "End Date" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 +msgid "Filter by workers" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:374 msgid "Some allocations needed" msgstr "" @@ -1494,6 +1509,10 @@ msgstr "" msgid "Overload due to current project" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:857 +msgid "Name: {0}" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:867 msgid "Move down" msgstr "" @@ -1504,10 +1523,6 @@ msgstr "" msgid "Please, select a project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:857 -msgid "Name: {0}" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69 msgid "September" @@ -1521,9 +1536,9 @@ msgstr "" msgid "password not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:42 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:118 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 msgid "General data" msgstr "" @@ -1535,9 +1550,9 @@ msgstr "" msgid "Calculate Number of Hours" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 msgid "Assign" msgstr "" @@ -1545,13 +1560,13 @@ msgstr "" msgid "missing code in a criterion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1298 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1296 msgid "Create Template" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:23 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:23 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:23 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:23 msgid "NavalPlan: Work Reports" msgstr "" @@ -1559,16 +1574,16 @@ msgstr "" msgid "Edit Company" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67 #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67 msgid "Advanced search" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 msgid "Filter by labels" msgstr "" @@ -1594,19 +1609,19 @@ msgstr "" msgid "Service does not manage resource of type: {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:191 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:442 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1302 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:210 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:506 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:544 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:575 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:191 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1365 msgid "Warning" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:35 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:35 msgid "Select parent calendar" msgstr "" @@ -1617,8 +1632,8 @@ msgstr "" msgid "There is no task with this code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:214 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:433 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:214 msgid "The type of hours cannot be null" msgstr "" @@ -1626,15 +1641,15 @@ msgstr "" msgid "criterion satisfaction with end date less than start date" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170 msgid "Show" msgstr "" @@ -1647,13 +1662,13 @@ msgid "Assignment Type" msgstr "" #: navalplanner-webapp/src/main/webapp/templates/templates.zul:22 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:22 -#: navalplanner-webapp/src/main/webapp/planner/index.zul:22 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:22 #: navalplanner-webapp/src/main/webapp/planner/order.zul:22 #: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:22 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/index.zul:22 #: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:22 #: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:22 msgid "NavalPlan: Scheduling" msgstr "" @@ -1671,26 +1686,26 @@ msgstr "" msgid "Planned start :" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 -msgid "Node without children" -msgstr "" - #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 msgid "Company" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66 +msgid "Node without children" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:118 msgid "There is no label with this code " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:138 -msgid "Profile saved" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:210 msgid "Task: {0} " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:138 +msgid "Profile saved" +msgstr "" + #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "" @@ -1708,7 +1723,7 @@ msgstr "" msgid "Surname" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1301 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1364 msgid "You need to select some function to configure" msgstr "" @@ -1720,21 +1735,21 @@ msgstr "" msgid "the name must be not null or not empty" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:741 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:157 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:131 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:68 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:131 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:157 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 msgid "Date" msgstr "" @@ -1764,8 +1779,8 @@ msgstr "" msgid "Filter by month" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:361 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:351 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:361 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320 msgid "The criterion and its type cannot be null" msgstr "" @@ -1796,14 +1811,14 @@ msgstr "" msgid "January" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54 -msgid "Select queue" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:64 msgid "Cannot calculate charts for current data" msgstr "" +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54 +msgid "Select queue" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:582 msgid "The cost category had already been removed." msgstr "" @@ -1812,34 +1827,34 @@ msgstr "" msgid "Work description" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:63 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 msgid "Split assignment" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:118 -msgid "You can not remove the default scenario called \"{0}\"" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:519 msgid "There are not any assigned progress to current task" msgstr "" -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110 -msgid "Down" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:118 +msgid "You can not remove the default scenario called \"{0}\"" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165 msgid "direct link" msgstr "" +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110 +msgid "Down" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:934 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 @@ -1856,8 +1871,8 @@ msgstr "" msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:72 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:48 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:72 msgid "Association with roles" msgstr "" @@ -1873,8 +1888,8 @@ msgstr "" msgid "Hours group" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:30 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:96 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:30 msgid "Days from Beginning to Deadline" msgstr "" @@ -1882,10 +1897,10 @@ msgstr "" msgid "Estimate At Completion" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 msgid "Delete item. Are you sure?" msgstr "" @@ -1893,12 +1908,12 @@ msgstr "" msgid "cost assignment's start date not specified" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178 msgid "Output format:" msgstr "" @@ -1911,21 +1926,21 @@ msgstr "" #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:189 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:268 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:289 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:52 #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 msgid "Op." msgstr "" -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44 -msgid "Pessimistic" -msgstr "" - #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 msgid "Reference date:" msgstr "" +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44 +msgid "Pessimistic" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:373 msgid "Limiting resource assignation" msgstr "" @@ -1957,8 +1972,8 @@ msgstr "" msgid "Entity sequences" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:28 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:91 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:28 msgid "Delay from beginning (days)" msgstr "" @@ -1991,25 +2006,26 @@ msgstr "" msgid "WBS (tasks)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:690 -msgid "Deleting sequence" -msgstr "" - +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1250 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:423 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:299 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:538 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:552 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:299 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:423 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:861 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:896 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1250 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:227 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:310 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:859 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:894 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207 msgid "Error on showing removing element: " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:690 +msgid "Deleting sequence" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:87 msgid "Select scenario" msgstr "" @@ -2034,19 +2050,19 @@ msgstr "" msgid "Only the last activation period allows to delete end date." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:189 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:189 msgid "Scheduling saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:197 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 msgid "Add new row" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:784 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:782 msgid "incorrect initialization of the progress assignment controller." msgstr "" @@ -2058,25 +2074,25 @@ msgstr "" msgid "missing code in the resource calendar" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:29 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:34 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:29 msgid "Overload" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:68 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 msgid "Assignment log" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:45 +msgid "CutycaptTimeout thread exception" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:325 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 msgid "Work Report Models" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:45 -msgid "CutycaptTimeout thread exception" -msgstr "" - #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Date last progress measurement" msgstr "" @@ -2127,36 +2143,36 @@ msgstr "" msgid "External company" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:66 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:66 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:29 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:27 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Actions" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:80 -msgid "Start hour" -msgstr "" - #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:115 msgid "Exceptions" msgstr "" -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 -msgid "Over assignable" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:80 +msgid "Start hour" msgstr "" #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139 msgid "Assign materials" msgstr "" +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 +msgid "Over assignable" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226 msgid "format filters are not valid" msgstr "" @@ -2183,9 +2199,9 @@ msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:275 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:172 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:130 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:171 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:172 msgid "This label has already been added." msgstr "" @@ -2225,10 +2241,10 @@ msgid "Subcontract communication date" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:281 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:129 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:132 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:262 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:354 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:132 msgid "Scheduling" msgstr "" @@ -2260,12 +2276,12 @@ msgstr "" msgid "Work done from starting date:" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:865 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:865 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:159 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 msgid "State" msgstr "" @@ -2273,11 +2289,11 @@ msgstr "" msgid "Must start after" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1287 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1345 msgid "Confirm change" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:866 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:864 msgid "You don't have permissions to edit this project" msgstr "" @@ -2289,8 +2305,8 @@ msgstr "" msgid "missing date in a calendar exception" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:213 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:432 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:213 msgid "" "Type of hours is empty. Please, create some type of hours before proceeding" msgstr "" @@ -2319,7 +2335,7 @@ msgstr "" msgid "New task" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:132 msgid "The password for a new user cannot be empty" msgstr "" @@ -2331,18 +2347,18 @@ msgstr "" msgid "Type name" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 +msgid "Progress assignment" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:31 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:182 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:205 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:31 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:440 #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 msgid "All" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 -msgid "Progress assignment" -msgstr "" - #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 msgid "Edit Progress Type" msgstr "" @@ -2367,16 +2383,12 @@ msgstr "" msgid "Create activation period" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31 -msgid "Personal details" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:22 msgid "Workers List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:355 -msgid "Delete project template. Are you sure?" +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31 +msgid "Personal details" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1027 @@ -2385,8 +2397,8 @@ msgstr "" msgid "Inherited" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:217 -msgid "Criterion must be not-null" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:355 +msgid "Delete project template. Are you sure?" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:255 @@ -2400,6 +2412,10 @@ msgid "" "resource allocation criteria at any interval of time" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:217 +msgid "Criterion must be not-null" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:161 #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:299 msgid "criterion name not specified" @@ -2448,14 +2464,14 @@ msgstr "" msgid "At least one {0} sequence must be active" msgstr "" +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 msgid "Profile name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:252 msgid "Could open generated PDF" msgstr "" @@ -2517,20 +2533,20 @@ msgstr "" msgid "Type of work hours saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:113 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:113 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:46 msgid "Projects" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:64 -msgid "Not found converter for {0}" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:150 msgid "Create Quality Form" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:64 +msgid "Not found converter for {0}" +msgstr "" + #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "" @@ -2577,16 +2593,16 @@ msgstr "" msgid "Subcontratation" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:535 -msgid "{0} cannot be fulfilled" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:198 msgid "" "The meausure name is not valid. There is another unit type with the same " "measure name" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:535 +msgid "{0} cannot be fulfilled" +msgstr "" + #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68 msgid "Extended view" msgstr "" @@ -2599,8 +2615,8 @@ msgstr "" msgid "Error setting up edition form." msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151 msgid "Output format" msgstr "" @@ -2612,14 +2628,14 @@ msgstr "" msgid "NavalPlan: Calendars" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:179 -msgid "{0} not found type for criterion " -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:412 msgid "Hours cannot be null" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:179 +msgid "{0} not found type for criterion " +msgstr "" + #: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:68 msgid "Page down" msgstr "" @@ -2634,42 +2650,42 @@ msgid "NavalPlan: Runtime Error" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:52 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:112 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:92 -#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:101 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:49 -#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:55 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:134 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 -#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:44 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:85 -#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:81 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:41 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:72 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:135 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:170 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:50 -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:81 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:191 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:43 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:217 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:243 -#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:99 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:191 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:34 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:49 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:101 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:92 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:46 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:112 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:40 +#: navalplanner-webapp/src/main/webapp/scenarios/scenarios.zul:44 #: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:86 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:81 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:134 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:99 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:243 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:72 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:135 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:170 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:41 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:81 msgid "Cancel" msgstr "" @@ -2693,33 +2709,33 @@ msgstr "" msgid "Machines List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:526 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:662 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:925 -msgid "You don't have read access to this project" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 msgid "CPI" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:660 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:923 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:526 +msgid "You don't have read access to this project" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:180 msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" msgstr "" +#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 +msgid "Units" +msgstr "" + #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 msgid "Dates" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 -msgid "Units" -msgstr "" - #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:45 msgid "Create Calendar" msgstr "" @@ -2736,17 +2752,17 @@ msgstr "" msgid "Task Properties" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:192 -msgid "Cost category saved" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:214 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:237 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:229 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:214 msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:192 +msgid "Cost category saved" +msgstr "" + #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 #: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33 msgid "name" @@ -2785,8 +2801,8 @@ msgstr "" msgid "Edit task {0}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:236 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:236 msgid "Start date cannot be null" msgstr "" @@ -2810,15 +2826,15 @@ msgstr "" msgid "Planned workable days :" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36 -msgid "Add criterion requirement" -msgstr "" - #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47 msgid "Default max value" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:881 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36 +msgid "Add criterion requirement" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:879 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 " @@ -2829,18 +2845,18 @@ msgstr "" msgid "Percentage of estimated budget hours / hours consumed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:498 -msgid "Automatic" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44 msgid "Criterion Name" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:498 +msgid "Automatic" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:52 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 msgid "Task" msgstr "" @@ -2848,12 +2864,12 @@ msgstr "" msgid "Planned end :" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:85 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:270 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:167 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:124 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:165 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:167 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:85 msgid "please, select a label" msgstr "" @@ -2870,8 +2886,8 @@ msgid "missing code in a calendar data version" msgstr "" #: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 msgid "Criterion name" msgstr "" @@ -2879,9 +2895,9 @@ msgstr "" msgid "values are not valid, the values must not be null" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:78 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 msgid "Task name" msgstr "" @@ -2900,38 +2916,38 @@ msgstr "" msgid "Unassigned" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101 -msgid "Add new criterion requirement" -msgstr "" - #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:25 msgid "Select the date from which the new version will be valid" msgstr "" +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101 +msgid "Add new criterion requirement" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:124 msgid "Budgeted Cost Work Performed" msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:95 -msgid "Work report" -msgstr "" - #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:135 msgid "Change the password" msgstr "" +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:95 +msgid "Work report" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:302 msgid "the name must be not empty" msgstr "" #: navalplanner-webapp/src/main/webapp/materials/materials.zul:86 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27 msgid "Disabled" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:735 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:351 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:736 msgid "Earned value" msgstr "" @@ -2945,6 +2961,10 @@ msgstr "" msgid "Normal Effort" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:137 +msgid "{0} reassignations finished" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:250 msgid "" "Templates can only be created out of existent tasks.You are trying to create " @@ -2952,10 +2972,6 @@ msgid "" "Please save your project before proceeding." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:137 -msgid "{0} reassignations finished" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:92 msgid "Edit Work Hours Type" msgstr "" @@ -2973,16 +2989,16 @@ msgstr "" msgid "New entry" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:211 +msgid "Some sequences to remove not existed" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:105 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:114 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:212 msgid "Resources Load" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:211 -msgid "Some sequences to remove not existed" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:211 msgid "Changes have been canceled" msgstr "" @@ -3009,16 +3025,16 @@ msgstr "" msgid "Assigned criterion requirements" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127 msgid "Filter by criteria" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 msgid "Max value" msgstr "" @@ -3042,8 +3058,8 @@ msgstr "" msgid "Period" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 msgid "Spread" msgstr "" @@ -3051,32 +3067,32 @@ msgstr "" msgid "Select start date" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:151 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:153 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:903 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:189 -msgid "Removed {0}" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:188 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:214 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:151 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:901 +msgid "Removed {0}" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818 msgid "Confirm deleting this worker. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 -msgid "Start date:" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:62 msgid "Group name" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 +msgid "Start date:" +msgstr "" + #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81 msgid "Role name" msgstr "" @@ -3084,11 +3100,6 @@ msgstr "" msgid "This worker was already removed by other user" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:488 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:826 -msgid "h" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:611 msgid "Create Work Report" msgstr "" @@ -3097,6 +3108,11 @@ msgstr "" msgid "Value is not valid, the precision value must not be empty" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:825 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:488 +msgid "h" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:359 msgid "Workable capacity for this period " msgstr "" @@ -3134,19 +3150,19 @@ msgstr "" msgid "Select for automatic queuing" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:192 -msgid "Project {0} transfered" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:304 msgid "Scenarios Management" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java:192 +msgid "Project {0} transfered" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:96 msgid "Create & Assign" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:148 msgid "Edit User" msgstr "" @@ -3188,8 +3204,8 @@ msgid "Customer" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:810 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:86 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 msgid "Hours type" msgstr "" @@ -3208,20 +3224,20 @@ msgstr "" msgid "cannot be empty" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:121 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:147 -msgid "Heading Fields" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1468 +msgid "Sigmoid function" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:48 #: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:48 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49 msgid "from" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1405 -msgid "Sigmoid function" +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:147 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:121 +msgid "Heading Fields" msgstr "" #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74 @@ -3275,79 +3291,79 @@ msgid "" "time period" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:88 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:977 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:493 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:46 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:46 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java:46 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:493 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:978 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:88 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 +#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:41 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:67 +#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:50 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:80 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:49 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:41 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:38 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:58 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:40 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:80 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:67 -#: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:77 -#: navalplanner-webapp/src/main/webapp/scenarios/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:31 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:50 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 -#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30 msgid "Name" msgstr "" @@ -3367,15 +3383,15 @@ msgstr "" msgid "Time Start cannot be null" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22 -msgid "Companies List" -msgstr "" - #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:208 msgid "Day of week" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1380 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22 +msgid "Companies List" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1443 msgid "Stretches with Interpolation" msgstr "" @@ -3392,23 +3408,23 @@ msgstr "" msgid "cost assignment with end date less than start date" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 -msgid "Category name" -msgstr "" - #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:63 msgid "Maximum/minimum of the worked hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:766 -msgid "Not the same material, impossible to update" +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +msgid "Category name" msgstr "" #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 msgid "NavalPlan: Work And Progress Per Task" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:766 +msgid "Not the same material, impossible to update" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:65 msgid "Main menu" msgstr "" @@ -3447,8 +3463,8 @@ msgstr "" msgid "Unexpected: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/main.zul:61 #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:61 msgid "Notes" msgstr "" @@ -3472,12 +3488,12 @@ msgstr "" msgid "Changes saved" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1281 msgid "See scheduling" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:107 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:338 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:107 msgid "Progress measurements" msgstr "" @@ -3485,14 +3501,18 @@ msgstr "" msgid "Add measure" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:253 +msgid "Work report saved" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:374 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:68 msgid "Subcontract" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:253 -msgid "Work report saved" +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 +msgid "Found resources" msgstr "" #: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27 @@ -3500,13 +3520,9 @@ msgstr "" msgid "Relationship" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 -msgid "Found resources" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/planner/main.zul:57 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41 #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:57 msgid "End" msgstr "" @@ -3526,15 +3542,15 @@ msgstr "" msgid "criterion type not specified" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:143 +msgid "must be not empty" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 msgid "April" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:143 -msgid "must be not empty" -msgstr "" - #: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23 msgid "NavalPlan: Companies" msgstr "" @@ -3586,16 +3602,12 @@ msgstr "" msgid "Unindent selected task" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 -msgid "Constraint" -msgstr "" - #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 msgid "Customer reference code" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 -msgid "Add New Label Type Field" +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 +msgid "Constraint" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155 @@ -3607,6 +3619,10 @@ msgstr "" msgid "Hours Worked Per Resource In A Month" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 +msgid "Add New Label Type Field" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:402 msgid "Time finish cannot be null" msgstr "" @@ -3615,23 +3631,23 @@ msgstr "" msgid "Customer reference" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:461 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:189 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:661 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:740 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:865 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:915 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:924 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:947 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:759 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:517 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:527 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:663 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:742 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:867 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:917 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:926 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:949 msgid "Information" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:948 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:946 msgid "Sorry, you do not have permissions to access this project" msgstr "" @@ -3659,26 +3675,26 @@ msgstr "" msgid "Assign element to queue manually" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:463 -msgid "percentage cannot be duplicated" +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:55 +msgid "Edit Template" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:216 msgid "Resource: {0} " msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:55 -msgid "Edit Template" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:27 -msgid "Heading" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:463 +msgid "percentage cannot be duplicated" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:324 msgid "Work Hours" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:27 +msgid "Heading" +msgstr "" + #: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:164 msgid "Company ID already used. It has to be be unique" msgstr "" @@ -3719,13 +3735,13 @@ msgstr "" msgid "Worker assignments" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:541 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:402 #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:147 #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:174 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:402 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:173 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:409 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:431 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:541 #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioModel.java:221 #: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1053 #, java-format @@ -3757,8 +3773,8 @@ msgstr "" msgid "Unit Measures" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:39 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:39 msgid "Show progress" msgstr "" @@ -3772,9 +3788,10 @@ msgid "" "to change the resource allocation type " msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:121 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:626 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1335 msgid "Error" msgstr "" @@ -3873,8 +3890,8 @@ msgstr "" msgid "Name cannot be null or empty" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:110 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:341 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:110 msgid "Progress measurements: " msgstr "" @@ -3902,9 +3919,9 @@ msgstr "" msgid "criterion type does not allow resource hierarchy" msgstr "" +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:150 #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89 #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:150 msgid "Total" msgstr "" @@ -3925,8 +3942,8 @@ msgstr "" msgid "Select destination" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529 msgid "must be greater than the previous date." msgstr "" @@ -3939,20 +3956,20 @@ msgstr "" msgid "Show all" msgstr "" +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +msgid "Estimated hours" +msgstr "" + #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 msgid "Default price" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 -msgid "Estimated hours" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116 msgid "Apply tab changes" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:246 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:274 msgid "passwords don't match" msgstr "" @@ -3988,7 +4005,7 @@ msgstr "" msgid "Unit {0} cannot be removed because it is used in materials" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:133 msgid "Create User" msgstr "" @@ -4010,30 +4027,30 @@ msgstr "" msgid "Selected node:" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 -msgid "Progress Evolution" +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 +msgid "NavalPlan: Task Scheduling Status In Project" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:253 msgid "Create new project from template" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21 -msgid "NavalPlan: Task Scheduling Status In Project" +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 +msgid "Progress Evolution" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:112 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 -msgid "CV" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88 msgid "Original" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 +msgid "CV" +msgstr "" + #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:31 msgid "Stretches function configuration" msgstr "" @@ -4081,21 +4098,21 @@ msgstr "" msgid "Error on removing workReportType: " msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:48 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:48 msgid "Save changes" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:192 -msgid "Total dedication" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:669 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 "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:192 +msgid "Total dedication" +msgstr "" + #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:45 msgid "Select source" msgstr "" @@ -4112,13 +4129,13 @@ msgstr "" msgid "Stretch date must not be greater than the task's end date: " msgstr "" -#: navalplanner-webapp/src/main/webapp/common/configuration.zul:212 -msgid "Number of digits:" +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +msgid "Subcontratation date" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38 -msgid "Subcontratation date" +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:212 +msgid "Number of digits:" msgstr "" #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 @@ -4130,9 +4147,9 @@ msgstr "" msgid "Edit Label Type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:349 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:911 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:349 msgid "Please, select an item" msgstr "" @@ -4148,13 +4165,13 @@ msgstr "" msgid "Prefix" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:64 -msgid "New Template element" +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +msgid "Subcontracted code" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56 -msgid "Subcontracted code" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:64 +msgid "New Template element" msgstr "" #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21 @@ -4183,44 +4200,44 @@ msgstr "" msgid "Edit limiting resource element" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 -msgid "Position" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:862 msgid "The field name must be unique, not null and not empty" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 +msgid "Position" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/layout/login.zul:104 msgid "Incorrect authentication" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:112 -msgid "Edit work report" -msgstr "" - +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42 #: navalplanner-webapp/src/main/webapp/planner/editTask.zul:53 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35 msgid "Edit task" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:112 +msgid "Edit work report" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:45 msgid "Limiting resources (project)" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:764 +msgid "A description field of the same name already exists." +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1174 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:764 -msgid "A description field of the same name already exists." -msgstr "" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 msgid "Current value" msgstr "" @@ -4252,14 +4269,14 @@ msgstr "" msgid "Go!" msgstr "" -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:26 -msgid "Profile data" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:271 msgid "The name of the label is empty." msgstr "" +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:26 +msgid "Profile data" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:31 msgid "Configuration" @@ -4273,20 +4290,20 @@ msgstr "" msgid "Create Virtual Workers Group" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:861 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:885 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:861 msgid "Hours invested" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:742 -msgid "Project saved" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:160 msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:740 +msgid "Project saved" +msgstr "" + #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:45 msgid "task :" msgstr "" @@ -4311,14 +4328,14 @@ msgstr "" msgid "Unit Measures List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:153 -msgid "Couldn't find element: {0}" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:222 msgid "Confirm deleting this profile. Are you sure?" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:153 +msgid "Couldn't find element: {0}" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java:148 msgid "You should select a destination scenario" msgstr "" @@ -4328,14 +4345,14 @@ msgstr "" msgid "unit type code not found" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:42 -msgid "Resource :" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180 msgid "Calendar Exception Type saved" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:42 +msgid "Resource :" +msgstr "" + #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:40 msgid "Destination scenario" msgstr "" @@ -4352,15 +4369,15 @@ msgstr "" msgid "Not editable for containing more that an hours group." msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:76 -#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 -msgid "Limiting resource" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25 msgid "Filter by" msgstr "" +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:76 +msgid "Limiting resource" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:58 #: navalplanner-webapp/src/main/webapp/planner/order.zul:147 msgid "Calendar allocation" @@ -4371,9 +4388,9 @@ msgid "Duplicate value true report global progress for task" msgstr "" #: navalplanner-webapp/src/main/webapp/materials/materials.zul:85 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "" @@ -4385,15 +4402,15 @@ msgstr "" msgid "NavalPlan: Materials Needs At Date" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 -msgid "Category data" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:79 #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:202 msgid "[generic all workers]" msgstr "" +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 +msgid "Category data" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:103 msgid "Search" msgstr "" @@ -4414,46 +4431,46 @@ msgstr "" msgid "%" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:50 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:43 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:50 msgid "Remove calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:512 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:256 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:312 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:228 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1348 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:656 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1548 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1712 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:512 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:648 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1346 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:656 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:312 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:256 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 msgid "must be lower than finish date" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:757 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:161 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:135 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 +msgid "Resource" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:71 msgid "Total task hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:757 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:135 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:161 -msgid "Resource" +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +msgid "Date last progress reported" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:123 msgid "Could not load any resource" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 -msgid "Date last progress reported" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:334 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Work And Progress Per Project" @@ -4473,9 +4490,9 @@ msgstr "" msgid "Default Label" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108 msgid "Close" msgstr "" @@ -4492,22 +4509,22 @@ msgstr "" msgid "Time filter" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:61 -msgid "Move selected task up" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:27 msgid "Select criteria set or specific resources for allocation" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 -msgid "Work Report Lines List" +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:61 +msgid "Move selected task up" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:316 msgid "Create copy" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 +msgid "Work Report Lines List" +msgstr "" + #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27 msgid "Company data" msgstr "" @@ -4529,14 +4546,14 @@ msgstr "" msgid "Create Unit Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 -msgid "Label Type fields" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:311 msgid "Users" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143 +msgid "Label Type fields" +msgstr "" + #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103 msgid "Hours Management" msgstr "" @@ -4570,11 +4587,15 @@ msgstr "" msgid "Template saved" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:305 +msgid "Confirm deleting this User. Are you sure?" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:577 msgid "work report have not any description value with this field name" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:179 msgid "User saved" msgstr "" @@ -4609,20 +4630,20 @@ msgstr "" msgid "Group" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:30 +msgid "Statistics list " +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:28 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:59 #: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56 msgid "Enabled" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:30 -msgid "Statistics list " -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143 msgid "Edit Exception Day Type" msgstr "" @@ -4643,40 +4664,40 @@ msgstr "" msgid "Load due to current project" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1286 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1344 msgid "You are going to change the assignment function. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:200 -msgid "There must be at least 2 stretches for doing interpolation" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:321 msgid "Exception Days" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:200 +msgid "There must be at least 2 stretches for doing interpolation" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:296 msgid "Incompatible update: stored resource is not of type: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:109 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:114 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:98 -#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:132 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:187 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:213 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:187 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:98 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:114 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:109 +#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:132 msgid "Save & Continue" msgstr "" @@ -4684,12 +4705,12 @@ msgstr "" msgid "Scheduling mode" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:53 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:55 #: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 #: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:23 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:55 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:53 msgid "Filter" msgstr "" @@ -4740,9 +4761,9 @@ msgstr "" msgid "Non limiting resource assignation" msgstr "" +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:87 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 #: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:82 -#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:87 msgid "Back" msgstr "" @@ -4756,15 +4777,15 @@ msgstr "" msgid "Administration" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:631 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:495 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:239 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:293 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:211 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1331 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:638 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1531 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1694 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:495 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:631 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1329 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:638 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:211 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:293 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:239 msgid "must be greater than start date" msgstr "" @@ -4776,8 +4797,8 @@ msgstr "" msgid "Cancel and return" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34 msgid "Assign quality form" msgstr "" @@ -4786,15 +4807,15 @@ msgstr "" msgid "Delete item {0}. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:50 -msgid "Unit measure name" -msgstr "" - #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 msgid "worked hours" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:774 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:50 +msgid "Unit measure name" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:772 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:144 msgid "cannot include a progress of the same progress type twice" msgstr "" @@ -4803,13 +4824,13 @@ msgstr "" msgid "a work report line has not this label type assigned" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:59 #: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:59 msgid "Allocations" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:32 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:32 msgid "Choosing Template" msgstr "" @@ -4817,14 +4838,14 @@ msgstr "" msgid "Task code" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:85 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -msgid "Capacity" +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 +msgid "Length" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133 -msgid "Length" +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:85 +msgid "Capacity" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:299 @@ -4832,7 +4853,7 @@ msgstr "" msgid "Create derived" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:590 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:627 msgid "it must be greater than zero" msgstr "" @@ -4840,20 +4861,20 @@ msgstr "" msgid "must be a real positive number" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:33 +msgid "No Allocations have been done" +msgstr "" + #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122 msgid "Total hours task" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:33 -msgid "No Allocations have been done" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:409 msgid "Removed calendar \"{0}\"" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1085 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1083 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:23 msgid "Create project" msgstr "" @@ -4886,26 +4907,26 @@ msgid "" "present." msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:103 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:47 msgid "New work report" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 msgid "yes" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:886 +msgid "" +"Deleting this subcontracted project, you are going to lose the relation to " +"report progress. Are you sure?" +msgstr "" + #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 msgid "Select gap" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:888 -msgid "" -"Deleting this subcontracted project, you are going to lose the relation to " -"report progress. Are you sure?" -msgstr "" - #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Finish" msgstr "" @@ -4923,9 +4944,9 @@ msgstr "" msgid "Calendar exception types" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:35 -#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:35 msgid "Cost category assignment" msgstr "" @@ -4951,46 +4972,46 @@ msgstr "" msgid "Select required criteria set and press filter button" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1018 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1279 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:135 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:229 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:231 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:233 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:311 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:280 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:380 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:135 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:311 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1018 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1279 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:115 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java:147 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:732 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:43 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:63 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:49 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:44 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:50 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:84 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:33 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 #: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:72 -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:47 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:43 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:63 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 -#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:33 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:44 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:39 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 +#: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 msgid "cannot be null or empty" msgstr "" @@ -5019,18 +5040,18 @@ msgstr "" msgid "The index fields and labels must be uniques and consecutives" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 -msgid "Estimate To Complete" -msgstr "" - #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21 msgid "NavalPlan: Estimated/Planned Hours Per Task" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130 +msgid "Estimate To Complete" +msgstr "" + #: navalplanner-webapp/src/main/webapp/materials/materials.zul:84 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "" @@ -5078,58 +5099,58 @@ msgstr "" msgid "Extra Effort" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:57 -msgid "Move selected task down" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:260 msgid "Already exists other label with the same name" msgstr "" +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:57 +msgid "Move selected task down" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:32 msgid "Customer Reference" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:779 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:777 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:134 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:147 msgid "spread values are not valid, at least one value should be true" msgstr "" -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89 -msgid "Create and assign label" -msgstr "" - #: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:42 msgid "Optimistic" msgstr "" +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:89 +msgid "Create and assign label" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:125 msgid "SV" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483 -msgid "Filter work reports" -msgstr "" - #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83 msgid "Our company login" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483 +msgid "Filter work reports" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:395 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "the Configuration window before." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:858 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:587 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:884 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:319 -#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:858 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:46 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 msgid "Progress" msgstr "" @@ -5147,14 +5168,14 @@ msgstr "" msgid "Price per hour" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:314 -msgid "Calendars" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:209 msgid "Project: {0} " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:314 +msgid "Calendars" +msgstr "" + #: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:21 msgid "NavalPlan: Page not found" msgstr "" @@ -5169,20 +5190,20 @@ msgid "" "quality form" msgstr "" +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 +msgid "Latest date" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:32 msgid "Show only current satisfied criteria" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:373 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:393 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:373 msgid "Error on showing delete confirm" msgstr "" -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 -msgid "Latest date" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:671 msgid "Sum of all rows" msgstr "" @@ -5213,23 +5234,23 @@ msgid "" "percentage" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 msgid "Filter by projects" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 -msgid "Each worker configuration unit name" -msgstr "" - #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:23 msgid "Criteria of selected type " msgstr "" +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 +msgid "Each worker configuration unit name" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:224 @@ -5280,11 +5301,7 @@ msgstr "" msgid "missing code in a work report line" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 -msgid "NavalPlan: Subcontracted Tasks" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:984 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:985 msgid "Efforts" msgstr "" @@ -5292,31 +5309,31 @@ msgstr "" msgid "Show all reported hours" msgstr "" +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 +msgid "NavalPlan: Subcontracted Tasks" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:102 msgid "Projects List" msgstr "" -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:52 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:137 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:65 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:49 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:74 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:51 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:49 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:52 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:60 #: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:44 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:65 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:45 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:80 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:137 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 msgid "Generate code" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:483 -msgid "The code sequence is already in use and it can not be updated." -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:110 msgid "Scheduling state" msgstr "" @@ -5325,6 +5342,10 @@ msgstr "" msgid "This template can not be removed because it has applications." msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:483 +msgid "The code sequence is already in use and it can not be updated." +msgstr "" + #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 msgid "NavalPlan: Project Costs Per Resource" msgstr "" @@ -5351,22 +5372,22 @@ msgstr "" msgid "Task {0} : Task group is incompatible type with {1}" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:292 -msgid "Virtual Workers Groups" -msgstr "" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 msgid "Profiles authorization" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 -msgid "Assignation" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:292 +msgid "Virtual Workers Groups" msgstr "" #: navalplanner-webapp/src/main/webapp/common/configuration.zul:144 msgid "Planning charts expanded" msgstr "" +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 +msgid "Assignation" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:431 msgid "Not deletable" msgstr "" @@ -5392,7 +5413,7 @@ msgstr "" msgid "Criterion Type List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:737 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:736 msgid "Overall progress" msgstr "" @@ -5409,17 +5430,17 @@ msgstr "" msgid "Password" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:89 #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:89 msgid "Observations" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:964 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:962 msgid "Edit project" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:27 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:27 msgid "Progress assignments" msgstr "" @@ -5430,10 +5451,6 @@ msgstr "" msgid "Valid from" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59 -msgid "Month" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:206 msgid "exception date already exists" msgstr "" @@ -5442,12 +5459,12 @@ msgstr "" msgid "There exists other template with the same name." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:863 -msgid "{0} could not be allocated. Cannot allocate more than one resource" +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59 +msgid "Month" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:758 -msgid "Advanced assignment saved" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:900 +msgid "{0} could not be allocated. Cannot allocate more than one resource" msgstr "" #: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:55 @@ -5455,6 +5472,10 @@ msgstr "" msgid "Color" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:759 +msgid "Advanced assignment saved" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" @@ -5468,18 +5489,18 @@ msgid "Only {0} resources per day were achieved for current allocation" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:83 -#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:79 -#: navalplanner-webapp/src/main/webapp/planner/main.zul:66 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:39 -#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:43 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:69 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:132 -#: navalplanner-webapp/src/main/webapp/planner/order.zul:167 -#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:48 #: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:79 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:97 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:69 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:132 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:167 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:83 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/editTask.zul:79 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:66 msgid "Accept" msgstr "" @@ -5498,8 +5519,8 @@ msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:167 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:193 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:167 msgid "Work report lines" msgstr "" @@ -5507,14 +5528,14 @@ msgstr "" msgid "Calculated" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:118 -msgid "Error setting up edition form for Criterion Type with id: {0}" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:211 msgid "Completed: {0}% " msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:118 +msgid "Error setting up edition form for Criterion Type with id: {0}" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1178 msgid "Calculated progress measurement can not be removed" msgstr "" @@ -5532,19 +5553,19 @@ msgstr "" msgid "Probability" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163 msgid "Click on " msgstr "" -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:112 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 msgid "Report data" msgstr "" @@ -5579,48 +5600,48 @@ msgid "" "resources and their calendars." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:79 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:47 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:76 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76 -#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:79 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:59 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:186 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:287 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:26 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:69 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:44 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:47 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:76 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:59 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:81 #: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:36 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:59 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:186 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:287 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 -#: navalplanner-webapp/src/main/webapp/templates/templates.zul:85 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:66 #: navalplanner-webapp/src/main/webapp/scenarios/transferOrders.zul:76 #: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:49 -#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:40 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:65 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:132 #: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76 +#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:40 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:85 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120 msgid "Code" msgstr "" @@ -5628,30 +5649,30 @@ msgstr "" msgid "Add stretch" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70 -msgid "Assignation type" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:33 msgid "Show resource assignments" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:241 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:214 -msgid "" -"Start date is not valid, the new start date must be lower than the end date" +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70 +msgid "Assignation type" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:387 msgid "Calculate Workable Days" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:241 +msgid "" +"Start date is not valid, the new start date must be lower than the end date" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:55 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 -#: navalplanner-webapp/src/main/webapp/planner/montecarlo_function.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 msgid "Start date" msgstr "" @@ -5659,17 +5680,13 @@ msgstr "" msgid "Update exception" msgstr "" -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:138 -msgid "Budget" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:330 -msgid "Already exists other criterion with the same name" +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:138 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +msgid "Budget" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java:43 @@ -5677,35 +5694,39 @@ msgstr "" msgid "May" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:330 +msgid "Already exists other criterion with the same name" +msgstr "" + #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37 msgid "Unit name" msgstr "" -#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:21 -msgid "NavalPlan: Labels" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:44 -#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 -#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 -#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 -msgid "Project code" -msgstr "" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 msgid "Write" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:39 -msgid "Number of applications" +#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:21 +msgid "NavalPlan: Labels" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java:44 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:51 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +msgid "Project code" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:499 msgid "Assign element to queue automatically" msgstr "" +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:39 +msgid "Number of applications" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:82 msgid "" "Date which the task must start after (press enter in textbox to open " @@ -5723,11 +5744,11 @@ msgid "Date cannot be null" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:765 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:169 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:76 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:142 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:169 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49 msgid "Task Code" msgstr "" @@ -5739,40 +5760,40 @@ msgstr "" msgid "Create Profile" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:747 +msgid "This label type already is assigned to the work report type." +msgstr "" + #: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:51 #: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:53 #: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:55 msgid "Probability %" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:747 -msgid "This label type already is assigned to the work report type." -msgstr "" - -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28 #: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28 msgid "New criterion" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:734 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:350 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:735 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:542 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 msgid "Load" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:889 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:65 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:60 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:65 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:82 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:120 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:32 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 -#: navalplanner-webapp/src/main/webapp/scenarios/_edition.zul:41 -#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:120 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 msgid "Description" msgstr "" @@ -5784,27 +5805,27 @@ msgstr "" msgid "Go to advanced Allocation" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:660 +msgid "already exists an allocation for criteria {0}" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:283 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:287 msgid "Project Templates" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:623 -msgid "already exists an allocation for criteria {0}" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:310 msgid "Forward" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:43 -msgid "Number of finished applications" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:465 msgid "Invalid queue element" msgstr "" +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:43 +msgid "Number of finished applications" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:575 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:584 #: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java:592 @@ -5841,14 +5862,14 @@ msgstr "" msgid "Hours:" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:62 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 msgid "Split" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:101 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:105 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:106 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:105 msgid "please, select a project" msgstr "" @@ -5856,16 +5877,16 @@ msgstr "" msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 -#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:33 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:50 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:94 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 msgid "Starting date" msgstr "" @@ -5877,66 +5898,66 @@ msgstr "" msgid "Load 100%" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:990 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:991 msgid "Function" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:779 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:398 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:780 msgid "date in future" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 -msgid "Format" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:630 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:606 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:630 msgid "New project version" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:332 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:77 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:474 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1251 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:472 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:532 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:40 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:33 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 -#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:24 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:48 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:104 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:78 -#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:39 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:35 -#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49 -msgid "Edit" +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141 +msgid "Format" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:174 msgid "Edit Unit Type" msgstr "" -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:332 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:474 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1249 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:472 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:77 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:532 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:78 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:104 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:24 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25 +#: navalplanner-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:35 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:39 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:48 +msgid "Edit" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 msgid "Init date" msgstr "" @@ -5978,21 +5999,21 @@ msgid "Tree {0} sucessfully flattened" msgstr "" #: navalplanner-webapp/src/main/webapp/materials/materials.zul:83 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "" +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 +msgid "Project Code" +msgstr "" + #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 msgid "Communication date" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72 -msgid "Project Code" -msgstr "" - #: navalplanner-webapp/src/main/webapp/planner/reassign.zul:30 msgid "Reassigning" msgstr "" @@ -6002,7 +6023,7 @@ msgid "" "Cannot delete that cost category because there are resources assigned to it." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:596 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:633 msgid "{0} already assigned to resource allocation list" msgstr "" @@ -6014,48 +6035,48 @@ msgstr "" msgid "Label Types List" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:347 -msgid "{0} projects reassignation remaining" -msgstr "" - -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java:44 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:52 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119 -#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 -#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 -#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 -#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:42 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:46 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:98 -#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:232 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 -#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 -#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:42 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:128 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:98 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:232 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:42 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148 msgid "Type" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java:346 +msgid "{0} projects reassignation remaining" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:637 msgid "" "This machine cannot be deleted because it has assignments to projects or " @@ -6067,10 +6088,6 @@ msgstr "" msgid "November" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 -msgid "BCWS" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1288 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1310 msgid "" @@ -6078,7 +6095,11 @@ msgid "" "progress." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:347 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:122 +msgid "BCWS" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:351 msgid " in the specified directory." msgstr "" @@ -6086,8 +6107,8 @@ msgstr "" msgid "criterion satisfaction codes must be unique inside a resource" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:668 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:862 msgid "no" msgstr "" @@ -6095,9 +6116,9 @@ msgstr "" msgid "missing code in a work report." msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:29 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:30 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:29 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:29 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:36 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:85 msgid "Criterion" @@ -6111,9 +6132,9 @@ msgstr "" msgid "Generate code for" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:103 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:397 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:481 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:103 msgid "missing code in a label" msgstr "" @@ -6133,10 +6154,6 @@ msgstr "" msgid "NavalPlan Configuration" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 -msgid "Average of the worked hours" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:406 msgid "" "Value is not valid.\n" @@ -6144,6 +6161,10 @@ msgid "" " and should not be empty" msgstr "" +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 +msgid "Average of the worked hours" +msgstr "" + #: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:43 msgid "an authorization type must be set" msgstr "" @@ -6152,44 +6173,44 @@ msgstr "" msgid "Must start after (days since beginning project)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:629 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:605 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:629 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:150 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:68 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:44 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:68 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:29 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:44 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 msgid "Add" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 #: navalplanner-webapp/src/main/webapp/materials/materials.zul:47 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124 msgid "Unselect" msgstr "" @@ -6198,22 +6219,22 @@ msgid "You should select the type of exception" msgstr "" #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:93 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 #: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:56 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:99 -#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 msgid "Deadline" msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122 -msgid "Filter by categories or materials" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:298 msgid "Subcontracted Tasks" msgstr "" +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122 +msgid "Filter by categories or materials" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:389 msgid "Amount work percentage should be between 0 and 100" msgstr "" @@ -6232,16 +6253,16 @@ msgstr "" msgid "Label type" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:309 -msgid "Administration / Management" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:246 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:319 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:243 msgid "Advanced Allocation" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:309 +msgid "Administration / Management" +msgstr "" + #: navalplanner-webapp/src/main/webapp/montecarlo/_montecarlo.zul:93 msgid "Number of iterations" msgstr "" @@ -6250,22 +6271,22 @@ msgstr "" msgid "Template Tree" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:329 -msgid "Criterion has subelements" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:499 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 msgid "Alpha" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:329 +msgid "Criterion has subelements" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:163 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:204 msgid "inconsistent parent code." msgstr "" -#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 msgid "Status" msgstr "" @@ -6273,26 +6294,26 @@ msgstr "" msgid "Resource load view" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:806 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:62 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:69 -#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:76 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37 -#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:84 -msgid "Hours" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:767 +msgid "the date must be inside the visualization area" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:768 -msgid "the date must be inside the visualization area" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:806 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/EffortDurationPicker.java:62 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:84 +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:69 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:76 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 +msgid "Hours" msgstr "" #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54 @@ -6303,7 +6324,7 @@ msgstr "" msgid "work report has not this label type assigned" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1229 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1230 msgid "Limiting assignment" msgstr "" @@ -6311,20 +6332,20 @@ msgstr "" msgid "date not specified." msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:360 +msgid " hours" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:344 msgid "The name of the criterion is empty." msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:281 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:134 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:147 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:281 msgid "Limiting Resources Planning" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:360 -msgid " hours" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:770 msgid "The max value must be not empty" msgstr "" @@ -6341,22 +6362,22 @@ msgstr "" msgid "All project tasks" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:352 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:343 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:352 msgid "The start date cannot be null" msgstr "" +#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 +#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 +msgid "Allocation configuration" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/ScenarioCRUDController.java:125 msgid "Scenario \"{0}\" saved" msgstr "" -#: navalplanner-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 -#: navalplanner-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 -msgid "Allocation configuration" -msgstr "" - -#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:189 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:215 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:189 msgid "Save & New work report" msgstr "" @@ -6368,8 +6389,8 @@ msgstr "" msgid "Resources per day are zero" msgstr "" -#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 msgid "Assigned criteria" msgstr "" @@ -6377,19 +6398,19 @@ msgstr "" msgid "Help on authentication (opens a new window)" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/EffortDurationBox.java:39 -msgid "Not a valid effort duration" -msgstr "" - #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:870 msgid "The length must be greater than 0, and not null." msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/EffortDurationBox.java:39 +msgid "Not a valid effort duration" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:544 msgid "Could not save new calendar" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1404 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1467 msgid "Sigmoid function applied to current resource" msgstr "" @@ -6416,214 +6437,156 @@ msgstr "" msgid "Task Scheduling Status In Project" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200 #: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:421 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:345 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:373 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:194 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:887 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:356 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:889 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:200 msgid "Confirm" msgstr "" -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:32 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:51 #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 #: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 -#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:32 -#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:32 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 #: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 -#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:47 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:49 #: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:49 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:52 msgid "Create" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1728 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1734 -msgid "please, select a work report type" -msgstr "" - #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 msgid "Permissions" msgstr "" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1728 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1734 +msgid "please, select a work report type" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:486 msgid "List of materials for category: {0}" msgstr "" -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 msgid "Total price" msgstr "" -#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:232 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:436 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1230 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:786 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1044 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1295 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:419 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:324 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:138 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:271 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:362 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:530 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:544 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:818 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:625 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:138 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:324 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:948 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:954 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:271 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:292 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:786 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1044 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1295 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:419 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:694 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1267 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:306 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1265 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:388 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1204 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1204 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1230 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1242 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:436 -#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:223 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 -#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158 -#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 -#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:694 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:408 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:948 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:954 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:232 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:84 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132 +#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:92 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:104 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 +#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:40 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:53 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150 -#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 -#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:92 -#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 -#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 -#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 -#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:45 -#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 -#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 -#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:88 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117 -#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132 -#: navalplanner-webapp/src/main/webapp/materials/materials.zul:104 -#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 -#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115 -#: navalplanner-webapp/src/main/webapp/templates/_list.zul:53 -#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 -#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 -#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 -#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:59 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 -#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213 -#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 -#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:84 -#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:90 -#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:120 -#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:66 -#: navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 msgid "Delete" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:107 -msgid "Hours cost type cannot be empty or null" +#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 +msgid "Number of assigned hours" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:116 -msgid "Init date cannot be empty or null" +#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 +msgid "Number of hours calculated by clock" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:121 -msgid "End date cannot be empty or null" +#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:33 +msgid "Number of assigned hours and the time" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 -msgid "WORKER" +#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:34 +msgid "heading" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33 -msgid "MACHINE" +#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:34 +msgid "line" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceType.java:35 -msgid "STRATEGIC RESOURCE" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:37 -msgid "WORK_RELATIONSHIP" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:43 -msgid "LOCATION_GROUP" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:50 -msgid "MACHINE LOCATION_GROUP" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:58 -msgid "LEAVE" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:64 -msgid "TRAINING" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:70 -msgid "JOB" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:76 -msgid "CATEGORY" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:206 -msgid "[generic all machines]" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:32 -msgid "RECEIVED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:33 -msgid "PENDING" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:34 -msgid "ORDERED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:35 -msgid "PROCESSING" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:36 -msgid "CANCELED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:29 -msgid "by percentage" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:29 -msgid "by items" +#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java:150 +msgid "unlimited" msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java:83 @@ -6662,12 +6625,76 @@ msgstr "" msgid "No" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/Capacity.java:150 -msgid "unlimited" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceType.java:35 +msgid "STRATEGIC RESOURCE" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:122 -msgid "Line" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:37 +msgid "WORK_RELATIONSHIP" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:43 +msgid "LOCATION_GROUP" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:50 +msgid "MACHINE LOCATION_GROUP" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:58 +msgid "LEAVE" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:64 +msgid "TRAINING" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:70 +msgid "JOB" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/PredefinedCriterionTypes.java:76 +msgid "CATEGORY" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:206 +msgid "[generic all machines]" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 +msgid "WORKER" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33 +msgid "MACHINE" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:32 +msgid "RECEIVED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:33 +msgid "PENDING" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:34 +msgid "ORDERED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:35 +msgid "PROCESSING" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialStatusEnum.java:36 +msgid "CANCELED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:29 +msgid "by percentage" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormType.java:29 +msgid "by items" msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java:176 @@ -6675,12 +6702,204 @@ msgstr "" msgid "Derived from {0}" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:53 -msgid "Hour should be a value between 0 and 23" +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:107 +msgid "Hours cost type cannot be empty or null" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:170 -msgid "A queue dependency has to have an origin different from destiny" +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:116 +msgid "Init date cannot be empty or null" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:121 +msgid "End date cannot be empty or null" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 +msgid "Web service reader" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 +msgid "Web service writer" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 +msgid "All projects read allowed" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 +msgid "All projects edition allowed" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:38 +msgid "Project creation allowed" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 +msgid "Read authorization" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:34 +msgid "Write authorization" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:260 +msgid "workHours should be greater or equals to 0" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:272 +msgid "" +"\"workHours\" value is not valid, taking into account the current list of " +"HoursGroup" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:577 +msgid "" +"Some ancestor has the same label assigned, so this element is already " +"inheriting this label" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:676 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:963 +msgid "Cannot spread two progress in the same task" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:700 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:726 +msgid "Duplicate Progress Assignment For Task" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1346 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1356 +#, java-format +msgid "Repeated Project code {0} in Project {1}" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:181 +msgid "Working hours shouldn't be negative" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:210 +msgid "Total percentage should be less than 100%" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:259 +#, java-format +msgid "" +" The criterion {0} can not be assigned to this hoursGroup because its " +"resource type is diferent." +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:265 +#, java-format +msgid "" +" The criterion {0} can not be assigned to this hoursGroup because it " +"already exist into the hoursGroup." +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:421 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:431 +#, java-format +msgid "Repeated Hours Group code {0} in Project {1}" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:540 +#, java-format +msgid " The {0} already exist into other task" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "OFFERED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "ACCEPTED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "STARTED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "FINISHED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "CANCELLED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:35 +msgid "SUBCONTRACTED PENDING PROJECT" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:35 +msgid "STORED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:169 +#, java-format +msgid "{0} is already child of another {1}" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:215 +msgid "it's already somewhat scheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:229 +msgid "it can't be unscheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:367 +msgid "Completely scheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:369 +msgid "Partially scheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:371 +msgid "Unscheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:377 +msgid "C" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:379 +msgid "P" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:381 +msgid "U" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:122 +msgid "Line" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:90 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:131 +msgid "You can not modifiy this entity sequence, it is already in use" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:140 +#, java-format +msgid "number of digits must be between {0} and {1}" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:36 +msgid "Progress with all tasks by hours" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:37 +msgid "Progress with critical path tasks by hours" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:38 +msgid "Progress with critical path tasks by duration" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java:82 +msgid "You can not remove this entity sequence, it is already in use" msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 @@ -6744,8 +6963,16 @@ msgid "" "available by the task's calendar." msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java:416 -msgid "Stretches must sum 100%" +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 +msgid "Finished" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 +msgid "In progress" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:31 +msgid "Blocked" msgstr "" #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/PositionConstraintType.java:29 @@ -6768,218 +6995,14 @@ msgstr "" msgid "finish not later than" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 -msgid "Finished" +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java:416 +msgid "Stretches must sum 100%" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 -msgid "In progress" +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/QueuePosition.java:53 +msgid "Hour should be a value between 0 and 23" msgstr "" -#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:31 -msgid "Blocked" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:963 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:676 -msgid "Cannot spread two progress in the same task" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:577 -msgid "" -"Some ancestor has the same label assigned, so this element is already " -"inheriting this label" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:700 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:726 -msgid "Duplicate Progress Assignment For Task" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1346 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:1356 -#, java-format -msgid "Repeated Project code {0} in Project {1}" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "OFFERED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "ACCEPTED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 -msgid "STARTED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "FINISHED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 -msgid "CANCELLED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:35 -msgid "SUBCONTRACTED PENDING PROJECT" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:35 -msgid "STORED" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:540 -#, java-format -msgid " The {0} already exist into other task" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:169 -#, java-format -msgid "{0} is already child of another {1}" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:215 -msgid "it's already somewhat scheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:229 -msgid "it can't be unscheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:367 -msgid "Completely scheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:369 -msgid "Partially scheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:371 -msgid "Unscheduled" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:377 -msgid "C" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:379 -msgid "P" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:381 -msgid "U" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:181 -msgid "Working hours shouldn't be negative" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:210 -msgid "Total percentage should be less than 100%" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:259 -#, java-format -msgid "" -" The criterion {0} can not be assigned to this hoursGroup because its " -"resource type is diferent." -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:265 -#, java-format -msgid "" -" The criterion {0} can not be assigned to this hoursGroup because it " -"already exist into the hoursGroup." -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:421 -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:431 -#, java-format -msgid "Repeated Hours Group code {0} in Project {1}" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:260 -msgid "workHours should be greater or equals to 0" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:272 -msgid "" -"\"workHours\" value is not valid, taking into account the current list of " -"HoursGroup" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:34 -msgid "heading" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:34 -msgid "line" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31 -msgid "Number of assigned hours" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32 -msgid "Number of hours calculated by clock" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:33 -msgid "Number of assigned hours and the time" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 -msgid "Read authorization" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:34 -msgid "Write authorization" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 -msgid "Web service reader" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 -msgid "Web service writer" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 -msgid "All projects read allowed" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 -msgid "All projects edition allowed" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:38 -msgid "Project creation allowed" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/EntitySequenceDAO.java:82 -msgid "You can not remove this entity sequence, it is already in use" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:36 -msgid "Progress with all tasks by hours" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:37 -msgid "Progress with critical path tasks by hours" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/ProgressType.java:38 -msgid "Progress with critical path tasks by duration" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:90 -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:131 -msgid "You can not modifiy this entity sequence, it is already in use" -msgstr "" - -#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntitySequence.java:140 -#, java-format -msgid "number of digits must be between {0} and {1}" +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueDependency.java:170 +msgid "A queue dependency has to have an origin different from destiny" msgstr ""