diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot index 4fb836df2..901a5fd68 100644 --- a/ganttzk/src/main/resources/i18n/keys.pot +++ b/ganttzk/src/main/resources/i18n/keys.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-03 13:36+0100\n" +"POT-Creation-Date: 2010-03-08 19:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,11 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35 -#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21 -msgid "Zoom" -msgstr "Zoom" - #: ./ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:195 msgid "Erase" msgstr "" @@ -29,11 +24,19 @@ msgstr "" msgid "0% - 100%" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:30 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:303 +msgid "Add Dependency" +msgstr "" + +#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37 +msgid "Expand/Collapse all" +msgstr "" + +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32 msgid "Year" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:46 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58 msgid "Month" msgstr "" @@ -41,6 +44,11 @@ msgstr "" msgid "Show/Hide resources" msgstr "" +#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35 +#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21 +msgid "Zoom" +msgstr "" + #: ./ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:206 msgid "Set End-Start" msgstr "" @@ -49,11 +57,11 @@ msgstr "" msgid "Set End-End" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:225 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:232 msgid "decreasing zoom" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:409 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:443 msgid "Hide critical path" msgstr "" @@ -61,7 +69,7 @@ msgstr "" msgid "+ 100%" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:62 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84 msgid "Day" msgstr "" @@ -81,27 +89,27 @@ msgstr "" msgid "Print" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:210 -msgid "Set Start-Start" -msgstr "" - #: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:101 msgid "Assignation percentage" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:54 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:210 +msgid "Set Start-Start" +msgstr "" + +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71 msgid "Week" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:208 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:215 msgid "increasing zoom" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:188 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:221 msgid "changing zoom" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:38 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45 msgid "Quarter" msgstr "" @@ -109,6 +117,6 @@ msgstr "" msgid "Refresh" msgstr "" -#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:404 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:438 msgid "Show critical path" msgstr "" diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index 935649fc6..7ad373bb0 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-03 13:36+0100\n" +"POT-Creation-Date: 2010-03-08 19:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,4478 +16,4868 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:210 msgid "Work report types" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:338 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:332 msgid "The resource cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:236 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:236 msgid "Completed estimated hours" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:89 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31 msgid "Customer" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:95 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:381 +msgid "criterion codes must be unique inside a criterion type" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:93 msgid "No authorizations were added because you did not select any." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:698 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:80 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:711 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74 msgid "Hours type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:57 -#: ./navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:67 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:63 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:73 msgid "en" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:143 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:147 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:186 msgid "criterion type name not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230 msgid "Manage user accounts" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:134 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:134 msgid "Create exception" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:302 +msgid "Up to company view" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 msgid "Select report data" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:194 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216 msgid "Add Exception" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editProfile.zul:23 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:23 msgid "Edit profile" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:189 +msgid "there exist multiple resource calendars with name {0}" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:54 msgid "Create Virtual Worker" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:702 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:93 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 -#: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 -#: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:124 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:148 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:23 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:26 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:28 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:23 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:28 -#: ./navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:17 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:25 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:28 -#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:63 -#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69 -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:82 -#: ./navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: ./navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 -#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:33 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:188 -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 -#: ./navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:35 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:39 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:128 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:172 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:218 -#: ./navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:715 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:97 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:124 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:148 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:17 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:63 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:82 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:33 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:189 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:39 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:80 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:128 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:172 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:218 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27 msgid "Operations" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:385 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:407 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:431 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:385 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:407 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:431 msgid "cannot be empty" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:71 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:71 msgid "New order sequence" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:7 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:9 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:7 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:9 msgid "Add criterion" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 msgid "Completed estimated hours per task" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:32 -msgid "Heading Fields" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:34 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:53 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:6 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:6 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:6 msgid "from" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:199 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:114 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:105 +msgid "Heading Fields" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/order.zul:200 msgid "Select" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:320 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:329 msgid "there must be {0} hours instead of {1}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:41 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:78 -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:1 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:57 -#: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:32 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:125 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:40 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:35 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:41 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:78 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:1 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:90 msgid "Materials" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:78 -msgid "Partially scheduled" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:154 msgid "" "Time period contains non valid data. Ending data must be older than starting " "date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:196 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:271 msgid "Reassign" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:181 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:181 msgid "A type must be selected" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55 msgid "Description cannot be null or empty" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:92 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:92 msgid "Percentage of consumed budget hours / hours consumed" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:75 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:75 msgid "login name not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:505 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:946 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:505 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:946 msgid "You should select a start date for the exception" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 msgid "Variance At Completion" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:58 -#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:41 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:64 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:47 msgid "Help" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:305 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:337 msgid "Please, select a calendar" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 msgid "Managing fields and labels" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:58 -#: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:33 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 +#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161 +msgid "Predefined" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 msgid "Quality Forms" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:171 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:171 msgid "Summary" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:68 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:68 msgid "Order sequences" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:254 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:255 msgid "Exportation options" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:234 msgid "Reports" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159 msgid "" "Could not save time period. Time period overlaps with another non-compatible " "time period" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:83 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:32 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:562 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:309 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 -#: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 -#: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:40 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:121 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:36 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:23 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:24 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:25 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:26 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25 -#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:25 -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:61 -#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:73 -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:78 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:54 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:73 -#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:26 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:71 -#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:48 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:64 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:182 -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:56 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:26 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:72 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:167 -#: ./navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 -#: ./navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:87 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:732 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:354 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:40 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:121 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:61 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:73 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:78 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:54 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:73 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:76 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:64 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:183 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:167 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39 msgid "Name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:80 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:80 msgid "START_NOT_EARLIER_THAN" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:80 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:80 msgid "Criterion requirements" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:180 msgid "" "The default calendar can not be removed. Please, change the default calendar " "in the Configuration window before." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:107 msgid "please, select an item" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:358 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:352 msgid "Time Start cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65 msgid "Dedication chart" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:157 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:157 msgid "Day of week" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:470 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:477 msgid "It not could remove the order element " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:588 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:588 msgid "Not the same hours group, impossible to update" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:913 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1095 msgid "Stretches with Interpolation" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:120 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:120 msgid "The end date cannot be before the init date" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:132 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:143 msgid "cost assignment with end date less than start date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:14 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:14 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:25 msgid "Category name" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:62 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:62 msgid "Maximum/minimum of the worked hours" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:8 +msgid "Active period from" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:51 msgid "hours type :" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:605 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:605 msgid "Not the same material, impossible to update" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:63 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:67 msgid "Quality form items list" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 msgid "Name/Code" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:585 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:743 msgid "Create order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:189 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:229 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:39 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:46 msgid "Main menu" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:130 msgid "cannot include an Advance of the same Advance type twice" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:684 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:697 msgid "Hour start" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:40 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39 -msgid "Create From Template" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63 msgid "Select print visualization options" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:52 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:68 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:149 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42 +msgid "Create From Template" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/main.zul:52 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:68 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:149 msgid "Start" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:366 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:366 msgid "There exists other workReportType with the same name." msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:107 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118 msgid "cost assignment's category not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:71 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:71 msgid "Delete Template element" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:121 -#: ./navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:122 +#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28 msgid "Schedule" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:163 msgid "Unexpected: {0}" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:113 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:128 msgid "worker's NIF not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:65 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:111 +msgid "" +"Complete, Partially or Not Scheduled. (Drag and drop to move order elements)" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:65 msgid "User with login name '{0}': not found" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36 msgid "Resources capability" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:60 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:78 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:60 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:78 msgid "Notes" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:149 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:153 msgid "The first stretch must be after the first day for doing interpolation" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:94 msgid "changing perspective" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 msgid "Filter quality forms by :" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:123 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:121 msgid "" "Could not add those authorizations to profile {0} because they were already " "present." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:57 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:57 msgid "Default calendar" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:76 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70 msgid "Order Element Code" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:104 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:104 msgid "Changes saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:766 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:931 msgid "See scheduling" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:140 msgid "" "Some order was created during the configuration process, it is impossible to " "update order sequence table. Please, try again later" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:238 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:233 msgid "Work report saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:56 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:56 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:101 msgid "Subcontract" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: ./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/_editWorkRelationship.zul:26 msgid "Relationship" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:56 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:73 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:153 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:56 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:153 msgid "End" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:967 +msgid "The date is not valid, the date must be not empty" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:25 msgid "User login name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41 msgid "Materials needs at date" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:134 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:156 msgid "criterion type not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:275 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:522 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:275 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:539 msgid "Indent" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:144 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142 msgid "must be not empty" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69 msgid "Show all resource assignments" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:50 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:50 msgid "New template" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java:97 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java:97 msgid "type code has to be unique. It is already used" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:44 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51 msgid "Task quality forms" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127 msgid "Base calendar \"{0}\" saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:465 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:465 msgid "Not working day" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:29 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:29 msgid "Create Order Element" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:88 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:88 msgid "The advanceType cannot be modified" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 msgid "Locations" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70 msgid "New quality form item" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:67 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:54 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:111 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:67 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:54 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:111 msgid "Resource allocation" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:200 -#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:20 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:200 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20 msgid "Templates list" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:170 msgid "please, select a quality form" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:385 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:385 msgid "Exist other workReportType with the same code." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:143 msgid "For interpolation at least two stretches are needed" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:660 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:673 msgid "Order Code" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:41 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:41 msgid "Login name" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:90 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:90 msgid "Constraint" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 msgid "Customer reference code" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:139 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:139 msgid "Add New Label Type Field" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:12 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:14 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:14 msgid "Current" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:366 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:360 msgid "Time finish cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:96 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:108 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:32 msgid "Customer reference" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:76 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:76 msgid "Dependencies" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:102 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:491 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:511 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:520 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:541 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:474 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:606 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:637 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:646 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:681 msgid "Information" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java:78 msgid "Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:174 msgid "Worker saved" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:931 -msgid "there exist criterion satisfactions referring to " -"criterion types not applicable to this resource" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1008 +msgid "" +"there exist criterion satisfactions referring to criterion types not " +"applicable to this resource" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 msgid "Create new advance type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:251 msgid "can not pass until the previous item is passed." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:41 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:39 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47 msgid "Criterion Requirement" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java:320 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205 msgid "New hours group " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54 msgid "Company Scheduling" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 msgid "Filter by orders" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:21 -msgid "Navalpro: Configuration" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:443 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:443 msgid "percentage cannot be duplicated" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:21 +msgid "Navalpro: Configuration" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26 msgid "Heading" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22 msgid "Create new version" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:189 msgid "Derived" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:181 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:226 msgid "a disabled resource has enabled subresources" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51 msgid "Client" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28 msgid "Add new advance assignment" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:130 -msgid "there exist multiple calendars with name {0}" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:266 msgid "Could not save machine" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:81 msgid "Unable to convert value to {0} type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:179 msgid "Worker must be not-null" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:846 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:460 +msgid "" +"there are no resources for required criteria: {0}. So the generic allocation " +"can't be added" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:923 msgid "Some criterion satisfactions overlap in time" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:120 +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:120 msgid "material category name has to be unique. It is already used" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:115 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:115 msgid "Imputed hours" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:42 msgid "Worker assignments" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:384 msgid "Confirm deleting this hour cost. Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:133 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:96 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:101 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:128 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:307 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:389 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:411 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:458 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:116 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:307 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:389 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:411 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:466 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:752 +#, java-format msgid "{0} already exists" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:250 msgid "Create Worker" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58 msgid "Delete Milestone" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:510 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:636 msgid "The order has no scheduled elements" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47 msgid "Non-assigned locations" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:17 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:17 msgid "Code " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:380 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:405 msgid "" "The {0} is not valid, criterionType overlaps with other " "criterionSatisfaction from the same criterionType" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:74 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75 msgid "Application URI" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 msgid "Paper size" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52 msgid "Password confirmation" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:851 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1033 msgid "None" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:81 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:75 msgid "Work Report" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:239 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:239 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Scheduling progress per order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:952 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1137 msgid "Configure" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:120 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:132 msgid "Work" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:32 msgid "First name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:201 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:221 msgid "Could not execute print command" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:108 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:108 msgid "Complementary text fields" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:408 -#: ./navalplanner-webapp/src/main/webapp/common/event_error.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:92 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:389 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:21 msgid "Error" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 msgid "Cost Performance Index" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:161 msgid "" "Criterion is not valid, the criterion overlap other criterionSatisfaction " "whith same criterion" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:194 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:204 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:195 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:477 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1080 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:204 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:592 msgid "Confirm deleting {0}. Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 msgid "ETC" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:52 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:59 msgid "Log out" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:69 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53 +msgid "Edit template" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:81 msgid "External code" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23 msgid "Add new configuration unit" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:40 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:40 msgid "Main preferences" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:161 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " "same criterion" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:214 -msgid "The order {0} must be scheduled" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:165 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:165 msgid "Label type saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:45 msgid "Add new worker assignment" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:46 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:46 msgid "View" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:475 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:482 msgid "resources per day must be not empty and bigger than zero" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86 msgid "Show dependencies:" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:128 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:130 msgid "Hours Group at " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:267 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:94 -msgid "Up" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:23 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:23 msgid "Edit type of work hour" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:158 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:98 +msgid "Up" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:165 msgid "" "CriterionType is not valid, it overlaps other criterionSatisfaction with the " "same criterionType" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 msgid "Work Report types" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:134 +#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:26 +msgid "Your session has expired after inactivity period. Please log in again." +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/order.zul:134 msgid "Total Estimated hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:139 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:164 msgid "SPREAD" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 msgid "Budgeted Cost Work Scheduled" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 msgid "EAC" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21 msgid "Virtual workers list" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:50 msgid "Name cannot be null or empty" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:129 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:133 msgid "Some stretch has higher or equal values than the previous stretch" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:16 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:250 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:107 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:118 +msgid "Total hours order element" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140 +msgid "" +"Value is not valid, the default max value must be greater than the precision " +"value " +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:16 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:251 msgid "End date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:102 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:102 msgid "Start Date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:30 msgid "Create Order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 msgid "Cost Variance" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:343 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:432 msgid "criterion type does not allow resource hierarchy" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:130 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:53 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:79 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:142 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:53 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:79 msgid "Total" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:47 msgid "A1" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87 msgid "profile name is already being used by another profile" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:103 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:109 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:99 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:103 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:99 msgid "Please, select an order" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:63 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:63 msgid "E-mail" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:198 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:86 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:198 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95 msgid "Invalidate" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21 msgid "List quality forms" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46 msgid "Order Details" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:511 -#: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:610 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:120 msgid "Criteria" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 msgid "User data" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 msgid "Budget hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:69 msgid "AS_SOON_AS_POSSIBLE" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:130 msgid "Edit task: {0}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43 msgid "Lines" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:44 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:44 msgid "Orders List" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1221 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1542 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1487 msgid "OrderElement not found" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189 msgid "Error on showing warning message removing workReportType: " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:461 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:304 +msgid "" +"Another order element in the same branch is already reporting advance for " +"this quality form" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:506 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:259 msgid "must be greater than the previous date." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:21 +msgid "NavalPlan: Advanced allocation" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29 msgid "Personal data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:498 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1375 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:498 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1317 msgid "Show all" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:209 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:209 msgid "Work reports" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44 msgid "A4" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41 +msgid "Save Order" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92 msgid "{0} annotation required on {1}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 msgid "Default price" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Estimated hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:597 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:624 msgid "Modified" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:38 msgid "Edit virtual resource" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:208 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:209 msgid "Apply tab changes" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:190 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 msgid "Add Criterion" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:196 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:201 msgid "Fattened Tree {0}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:10 -msgid "include order elements" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:249 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:268 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:67 msgid "MessagesContainer is needed" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:234 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:234 msgid "passwords don't match" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60 msgid "Ending date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:262 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:263 msgid "Hours groups" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:201 -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:201 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33 msgid "Subcontracted tasks list" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225 msgid "Manage cost categories" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:81 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:81 msgid "Last value" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Create new order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:198 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:198 msgid "General resource allocation" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:60 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65 msgid "Statistics log" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39 -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:43 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:43 msgid "Edit Calendar" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:214 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:214 msgid "Work report query" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:54 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:14 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:20 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:54 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:14 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:20 msgid "Cannot be empty or null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:229 +msgid "filtering" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33 msgid "Total Budget" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:50 msgid "Hierarchy" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65 msgid "Reference date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:21 -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:25 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:25 msgid "Print configuration" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:66 -msgid "C" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:26 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:26 msgid "Overload due to other assignments" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148 msgid "Time period saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 msgid "CV" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:264 -msgid "Not Unindent" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30 msgid "Stretches function configuration" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:57 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:57 msgid "Week" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:25 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:22 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:39 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34 msgid "Filter work report by :" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:86 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:264 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:278 +msgid "Not indentable" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:92 msgid "User disabled" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:11 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:11 msgid "Order element name" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:100 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:100 msgid "Association with profiles" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:103 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:103 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:41 msgid "Workers" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:908 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:42 -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 -msgid "Order element code" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:468 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:475 msgid "end date: {0} must be after start date: {1}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +msgid "Order element code" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:222 msgid "Advance measurements: " msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:100 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:115 msgid "worker's surname not specified" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 -msgid "Save changes" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:207 msgid "Error on removing workReportType: " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:171 -msgid "code is used by another machine being imported" +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +msgid "Save changes" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:114 msgid "Total dedication" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54 msgid "Year" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:102 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:102 msgid "Is subcontracted" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 msgid "profile name not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:842 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:924 msgid "Value is not valid, the current value must be less than max value" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:228 -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42 -msgid "Subcontratation date" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:47 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:60 msgid "Date Start" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:229 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42 +msgid "Subcontratation date" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23 msgid "Edit external company" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:125 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:125 msgid "Day" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3 -msgid "Filter by label:" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202 -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33 msgid "Report advances" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:54 msgid "From Chosen" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53 msgid "Hour costs" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55 msgid "Value" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:798 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1081 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1053 msgid "Please, select an item" 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 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52 msgid "Add role" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:527 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:968 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:527 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:968 msgid "Exception end date should be greater or equals than start date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:176 msgid "Work report type saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1003 +msgid "Cannot be higher than finish hour" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:79 msgid "Prefix" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:63 msgid "New Template element" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:246 -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:247 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 msgid "Subcontracted code" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:377 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:402 msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66 msgid "Work done until ending date:" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63 msgid "Schedule Performance Index" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223 msgid "Label types" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:449 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:481 msgid "Create virtual resource" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26 msgid "Type data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:343 msgid "The order element code cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/reassign.zul:33 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:33 msgid "Reassigning type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:688 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:701 msgid "Hour finish" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:62 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:69 msgid "Perspectives" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:902 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:114 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:39 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:117 +#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:66 msgid "Order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:856 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:856 msgid "The field name must be unique, not null and not empty" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:315 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:123 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:146 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:360 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:123 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:146 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:77 msgid "Position" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:189 msgid "Error removing element: " msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39 msgid "Company name" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:105 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96 msgid "Edit work report" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:91 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:97 msgid "Incorrect authentication" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:99 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:99 msgid "All order tasks" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:48 msgid "Value last advance measurement" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:758 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:714 +msgid "{0}" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:758 msgid "A description field of the same name already exists." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:456 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:458 msgid "Split new assignment" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 msgid "Current value" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:36 -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51 msgid "Zoom level" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27 +#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:159 msgid "Quality form" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:170 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:217 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:170 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:217 msgid "Expiry date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editProfile.zul:26 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:26 msgid "Profile data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:34 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:34 msgid "Configuration" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:48 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:48 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73 msgid "Categories" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:80 -msgid "Unscheduled" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:110 -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:125 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:143 -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:146 -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:120 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:110 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:110 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:125 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:143 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:146 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:120 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:110 msgid " to go to output directly" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:144 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:163 msgid "Add new hours group" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:319 -#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:364 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:79 msgid "Percentage" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:221 msgid "Manage criteria" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70 msgid "Total order element hours" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:160 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:160 msgid "Calculation type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:136 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134 msgid "Updated" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:116 -msgid "" -"Value is not valid, the Precision value must be less than the defalt max " -"value and not null" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:130 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:130 msgid "No worker selected" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:80 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:80 msgid "Number of digits" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38 -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28 msgid "Total capability" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:635 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:476 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:640 msgid "Hours invested" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21 msgid "Navalpro: Calendars" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:467 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:634 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:517 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:472 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:639 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:617 msgid "Advance" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:233 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:237 msgid "Problems connecting with client web service" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:21 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21 msgid "Templates" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 msgid "Amount work percentage" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 msgid "Date last advance reported" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:126 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:126 msgid "Exception Type" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:206 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220 msgid "criterion satisfaction's resource not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202 +msgid "Advances sent successfully" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:461 msgid "Derived exception" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:224 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:476 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:646 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:501 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:56 -#: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:31 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:258 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:38 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:481 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:651 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:597 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:259 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45 msgid "Labels" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:186 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:206 msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:112 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:112 msgid "Resources search" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:139 msgid "Couldn't find element: {0}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 msgid "Confirm deleting this profile. Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 msgid "Navalpro: AdvanceTypes" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:135 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147 msgid "Total hours" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:29 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:41 msgid "Resource :" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:66 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:66 msgid "Filter by task status" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:906 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48 msgid "Order element" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:289 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:378 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:298 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:450 msgid "Select date:" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:155 -msgid "Doing Reassignation" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197 msgid "Company view" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29 msgid "Integrated user" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:513 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:954 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:513 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:954 msgid "You should select a end date for the exception" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 msgid "Value last advance reported" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:127 msgid "Just one order sequence must be active" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:51 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:51 msgid "Company code" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109 msgid "Unknown attribute '{0}' in class {1}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:2 msgid "Filter by" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:281 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:282 msgid "Calendar allocation" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:83 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96 msgid "machine name not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:136 +msgid "Choose a order element from which create a template from" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174 msgid "already assigned" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:323 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:368 msgid "Passed" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:93 -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:12 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:13 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:113 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:12 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:13 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:113 msgid "Category" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:23 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:23 msgid "Edit cost category" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:117 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:117 msgid "Order Element Information" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:77 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:77 msgid "Activation periods" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154 msgid "must be greater than finish date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:111 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:123 msgid "Calendar" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:204 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:204 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:21 msgid "Resources" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:283 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:404 msgid "[generic all workers]" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 msgid "Category data" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 msgid "Read" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 msgid "Search" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:227 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:232 msgid "CriterionType and its criteria saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115 msgid "Add New Complementary Field" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:36 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:55 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:8 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:195 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:10 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:9 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:8 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:195 msgid "to" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42 msgid "Remove calendar" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:124 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:124 msgid "%" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1442 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1604 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:831 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1548 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:562 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:483 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:180 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:266 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:676 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:996 msgid "must be lower than finish date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:82 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:82 msgid "Order Element" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:91 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:106 msgid "worker's first name not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:653 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:239 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:46 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:71 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:75 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:666 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:239 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:128 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:69 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:119 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:71 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:122 msgid "Could not load any resource" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:254 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266 msgid "date not specified" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:36 msgid "Material search" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:78 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:91 msgid "Select type :" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:342 msgid "" "You must allow multiple active criteria for this type to use this assignment " "strategy" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:55 -#: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:30 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:39 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:37 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:43 msgid "Advances" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:10 +msgid "sub elements" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73 msgid "Shrink to fit page width" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:147 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:147 msgid "Default Label" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:176 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:76 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:200 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:176 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:77 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:201 msgid "Close" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:55 msgid "Last name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:548 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:386 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:548 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:386 msgid "Remove" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:354 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:215 +msgid "cost category name not specified" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:354 msgid "Create copy" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27 msgid "Company data" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21 msgid "Criterions Requirement" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46 msgid "Average of the estimated hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 msgid "SPI" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:176 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:243 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:176 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:243 msgid "Quality form saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 msgid "Length percentage" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 msgid "Label Type fields" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47 msgid "Name name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163 msgid "Edit quality form" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:127 -msgid "{0}: calendar not found" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 msgid "Hours Management" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:928 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1110 msgid "Interpolation" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21 msgid "Subcontracted tasks" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:292 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:292 msgid "{0} must not be before {1}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:453 -msgid "" -"there are no workers for required criteria: {0}. So the generic allocation " -"can't be added" -msgstr "" - -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:146 msgid "company name has to be unique. It is already used" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java:213 +msgid "Template saved" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375 msgid "the code must be not null or not empty" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:213 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:221 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:206 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:62 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:62 msgid "Type of day" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:890 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1072 msgid "Stretches list" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:160 msgid "User saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:46 msgid "Task quality form name" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:876 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:953 msgid "Some cost category assignments overlap in time" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:242 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReport.zul:37 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:37 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:72 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:36 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:38 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:38 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:77 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:99 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:128 -#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 -#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:69 -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:92 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:117 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:174 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:120 -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40 -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 -#: ./navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:242 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:179 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:73 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:36 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:38 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:77 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:128 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:69 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:92 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:126 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:124 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80 msgid "Save" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66 +#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java:281 msgid "Group" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/error.zul:36 -#: ./navalplanner-webapp/src/main/webapp/common/event_error.zul:30 +#: navalplanner-webapp/src/main/webapp/common/error.zul:36 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30 msgid "Exit session" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:54 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:25 -#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:25 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 msgid "Enabled" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:29 msgid "Statistics list " msgstr "" -#: ./navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 +#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21 msgid "Navalpro: QualityForms" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39 msgid "Edit advance type data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131 msgid "Pending update" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59 msgid "End date:" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:159 msgid "Criterion previously selected" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:76 -msgid "Completely scheduled" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:938 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:985 +msgid "" +"Value is not valid, the value must be greater than the value of the previous " +"advances." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:301 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:295 msgid "Order Element code cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:38 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:41 msgid "Assigned hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 msgid "Task scheduling status for an order" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:62 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:62 msgid "Users authorization" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:827 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1009 msgid "You are going to change the assignment function. Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:170 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:170 msgid "Problems connecting with subcontractor web service" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:144 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:148 msgid "There must be at least 2 stretches for doing interpolation" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:67 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:67 msgid "Show all labels" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:257 +msgid "Incompatible update: stored resource is not of type: {0}" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38 msgid "Assigned load" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 msgid "Filter by workers" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:108 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:108 msgid "End Date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:38 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:60 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:7 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:13 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:12 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:2 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 msgid "Filter" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:186 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:187 msgid "Resources Per Day" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:187 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167 msgid "ResourceType must be not-null" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionServiceREST.java:103 -msgid "criterion type name is used by another criterion type being imported" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:94 +msgid "" +"Estimated end date for the task (press enter in textbox to open calendar " +"popup or type in date directly)" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:413 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519 msgid "Order saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:458 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:475 msgid "Move down" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471 +msgid "Name: {0}" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26 msgid "Report structure" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:84 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:84 msgid "password not specified" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49 -#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:50 -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56 msgid "Yes" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:25 msgid "Assigned locations" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:53 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:57 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39 msgid "General data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:235 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:235 msgid "Hours worked per worker" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 msgid "BAC" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:301 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:13 +msgid "Apply filtering to machines satisfying required criteria" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:301 msgid "Calculate Number of Hours" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:294 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:295 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80 msgid "Assign" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:121 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:121 msgid "Two hour costs with the same type overlap in time" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:430 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:129 +msgid "missing code in a criterion" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:500 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:946 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39 msgid "Create Template" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:70 -msgid "U" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:63 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:63 msgid "Ok" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 msgid "ACWP" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:164 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168 msgid "Advance type saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:42 +#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:48 msgid "START" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:68 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:74 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:81 msgid "Back" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57 msgid "Schedule Variance" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56 msgid "Subcontractor" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:219 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:219 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32 msgid "Administration" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:74 -msgid "machine code not specified" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1425 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1586 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:814 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1367 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1530 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:545 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:466 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:163 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:658 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:979 msgid "must be greater than start date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:63 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:161 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:177 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:371 msgid "Service does not manage resource of type: {0}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:21 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:35 msgid "Work report listing" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46 msgid "Cancel and return" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:33 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:30 msgid "Assign quality form" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39 msgid "Edit worker" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:380 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:382 msgid "Delete item {0}. Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:843 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:57 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1025 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:57 msgid "Warning" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:29 msgid "Select parent calendar" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67 msgid "Hours of day" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37 msgid "worked hours" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:283 -msgid "criterion satisfaction with end date less than start " -"date" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297 +msgid "criterion satisfaction with end date less than start date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:905 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1087 msgid "Stretches" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:175 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:175 msgid "Allocations" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 msgid "Show" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:86 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:86 msgid "Duration (days)" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:30 msgid "Assignment Type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122 -msgid "Length" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:26 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:64 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:64 msgid "Capacity" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:337 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122 +msgid "Length" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:337 msgid "Create derived" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:430 +#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:28 +msgid "Back to log in" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:437 msgid "it must be greater than zero" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:473 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:475 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:475 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:477 msgid "Error on splitting" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 msgid "must be a real positive number" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 -#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:21 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 -#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:21 -#: ./navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 -#: ./navalplanner-webapp/src/main/webapp/planner/index.zul:21 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:32 +msgid "No Allocations have been done" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/index.zul:21 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:21 msgid "Navalpro: Scheduling" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:187 msgid "Removed calendar \"{0}\"" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:256 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:257 msgid "Node without children" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43 -#: ./navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:43 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43 +#: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:43 msgid "<<" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:91 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:91 msgid "START_IN_FIXED_DATE" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:134 msgid "Profile saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:53 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:53 msgid "Task properties" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:842 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:620 +msgid "" +"You can not remove the order element \"{0}\" because of any of its order " +"elements are already in use in some work reports" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1024 msgid "You need to select some function to configure" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:64 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:64 msgid "as soon as possible" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:33 msgid "Surname" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:636 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:327 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:42 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:73 -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:8 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 -#: ./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/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:649 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:124 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:8 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 +#: 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 msgid "Date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:360 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:360 msgid "the name must be not null or not empty" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 +#: navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/entities/ExternalCompany.java:163 msgid "company NIF has to be unique. It is already used" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34 msgid "Human hours per machine working hour within configuration unit" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:110 msgid "" "Could not add those authorizations to user {0} because they were already " "present." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:86 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:99 msgid "New work report" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:64 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:74 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:64 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:74 msgid "Order lines imputation" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_advances.zul:26 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:23 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:23 msgid "Advance assignments" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 msgid "A3" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:48 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:61 msgid "Date Finish" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:32 -msgid "Save order" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:25 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:30 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:33 msgid "Edit order element" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:329 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:333 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:314 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:337 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:340 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:306 msgid "The criterion and its type cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:200 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:200 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 msgid "Validate" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:110 -msgid "Value is not valid, the default max value must not be null" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:204 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:199 msgid "Error on removing element: " msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 -#: ./navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:3 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:3 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 msgid "Cost category assignment" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63 msgid "Cannot calculate charts for current data" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57 msgid "Found workers" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:458 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:462 msgid "All workers" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:238 -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:239 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 msgid "Work description" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:224 msgid "Label saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:36 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:41 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:41 msgid "Split assignment" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:3 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:3 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:3 msgid "Select required criteria set and press filter button" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java:77 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java:77 msgid "" "As you are subcontracting this task, all the resource allocations related " "with this task will be removed." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:100 -msgid "Down" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:142 -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:145 -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:119 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 -msgid "direct link" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:74 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:80 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:101 -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:91 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:71 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:119 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:176 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:123 -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 -#: ./navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:181 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:75 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:80 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:91 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:71 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82 msgid "Save & Continue" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:928 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:40 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:124 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:142 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:145 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109 +msgid "direct link" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104 +msgid "Down" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:928 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47 msgid "Label" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238 msgid "Order costs per resource" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:163 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:164 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:165 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:224 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:237 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:218 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:247 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:100 -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43 -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:70 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:42 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:49 -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:18 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:20 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 -#: ./navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:175 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:237 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:218 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:247 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:42 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:100 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:70 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:42 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:49 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:18 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:20 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:39 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:44 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:42 msgid "cannot be null or empty" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:378 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:448 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:51 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:61 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:51 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:61 msgid "New code" 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 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:48 msgid "Association with roles" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:228 -#: ./navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:29 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:228 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:29 msgid "Quality forms" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:326 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:326 msgid "Calculate Resources per Day" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:121 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:140 msgid "Hours group" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:29 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:86 -msgid "Days from Beginning to Deadline" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:990 -msgid "The index fields and labels must be uniques and consecutives" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 msgid "Estimate At Completion" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:990 +msgid "The index fields and labels must be uniques and consecutives" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:92 +msgid "Days from Beginning to Deadline" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27 msgid "Indirect" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:233 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:237 msgid "" "Are you sure of changing the resource type? You will lose the criterions " "with different resource type." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 msgid "Estimate To Complete" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:175 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:207 msgid "Edit machine" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:328 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 msgid "Delete item. Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:29 -msgid "Assigned Criterion Requirements" -msgstr "" - -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:90 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101 msgid "cost assignment's start date not specified" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:92 -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:9 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:10 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:92 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:9 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:10 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111 msgid "Unit type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:904 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:40 -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42 msgid "Order code" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java:122 +#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java:122 msgid "materialcode has to be unique. It is already used" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25 msgid "Direct" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:108 -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:108 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 msgid "Output format:" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41 msgid "Load due to other assignments" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 +#: 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/calendars/_edition.zul:76 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:76 msgid "Work week" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:126 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:126 msgid "You will lose the changes. Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:199 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:21 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:199 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:21 msgid "Orders list" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:130 -msgid "Value is not valid, the Precision value must not be null " -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207 msgid "Virtual worker groups" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25 msgid "Calendar data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:294 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:288 msgid "Resource cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:27 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:81 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:87 msgid "Delay from beginning (days)" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:137 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:137 msgid "login name is already being used by another user" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34 msgid "Total Hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:102 +msgid "code is already used" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71 msgid "All orders" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:128 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:148 msgid "Criterion Requirements" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:127 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:127 msgid "Confirm cancel" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21 msgid "External companies listing" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:186 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:187 msgid "Order from client" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:53 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:136 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:126 msgid "OrderElement Code" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:50 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:50 msgid "Label list" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:229 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:229 msgid "Manage user profiles" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:120 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:133 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:120 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:133 msgid "spread values are not valid, at least one value should be true" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:88 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:88 msgid "Create and assign label" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56 msgid "SV" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:75 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:75 msgid "start not earlier than" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1121 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:212 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:147 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:392 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:246 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:203 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:485 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1088 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:212 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:147 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:392 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:249 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:600 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:185 msgid "Error on showing removing element: " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1377 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1319 msgid "Filter work reports" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:82 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83 msgid "Our company login" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 msgid "Cost categories listing" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26 msgid "Direct imputation" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34 +#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +msgid "Criterion requirement" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:148 +msgid "" +"Still not saved changes would be lost. Are you sure you want to go to create " +"a template?" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34 msgid "PDF" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66 msgid "Price per hour" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 msgid "Orders" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:222 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:222 msgid "Calendars" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:102 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:102 msgid "Scheduling saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:327 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:321 msgid "The date cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:78 -#: ./navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:6 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:57 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:165 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155 +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:6 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:57 msgid "Add new row" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:386 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:388 msgid "Error on showing delete confirm" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:10 +msgid "Show only current satisfied criteria" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138 msgid "Could not save new criterion" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:32 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:44 msgid "order element :" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:526 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:528 msgid "Sum of all rows" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33 -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33 msgid "Overload" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21 msgid "Users listing" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:278 -msgid "Not indent" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:78 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72 msgid "Finish hour" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:59 +#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64 msgid "Assignment log" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:162 +msgid "Done {0} of {1}" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46 msgid "Load due to current order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:93 msgid "Deadline (days since beggining project)" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:225 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:225 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/OrderSequenceDAO.java:72 msgid "You can not remove this order sequence, it is already in use" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:152 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:152 msgid "Edit label type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:134 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:138 msgid "" "Last stretch should have one hundred percent for length and amount of work " "percentage" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:376 +msgid "number of hours is not properly calculated based on clock" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31 msgid "Each worker configuration unit name" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:39 -#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:40 -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:78 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:39 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:41 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:78 msgid "Active" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:317 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:718 +msgid "Value is not valid, the type must be not empty" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:406 msgid "criterion type name is already being used" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:386 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:393 msgid "Could not get order code, please try again later" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:261 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:502 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:732 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:918 +msgid "Value is not valid, the current value must be not empty" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:261 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:518 msgid "Unindent" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:49 msgid "Direct labels" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:151 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:157 msgid "Delete order element" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:79 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:85 msgid "Log in" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:50 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 -#: ./navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 -#: ./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/_listUsers.zul:27 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26 +#: 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/_listUsers.zul:27 msgid "Actions" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:56 msgid "Order Scheduling" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:217 -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:218 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 msgid "External company" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:139 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 msgid "New order element" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:52 msgid "Precision" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 msgid "Date last advance measurement" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:77 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71 msgid "Start hour" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75 msgid "Exceptions" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:173 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:690 +msgid "" +"You can not remove the order element \"{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/common/components/bandboxsearch/BandboxMultipleSearch.java:173 msgid "format filters are not valid" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28 msgid "Indirect labels" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:540 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:473 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:645 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:680 msgid "You don't have read access to this order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:105 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:109 msgid "Scheduling state" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:276 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:276 msgid "The init date cannot be empty" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:172 msgid "" "The calendar was not removed because it still has children. Some other " "calendar is derived from this one." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:87 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88 msgid "Our company password" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:27 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:27 msgid "Select print page properties" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:197 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:211 msgid "criterion satisfaction's criterion not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:182 msgid "Create machine" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46 msgid "A2" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:241 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:241 msgid "Machine" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:136 -msgid "" -"Value is not valid, the Precision value must be less than the defalt max " -"value " -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/common/error.zul:35 -#: ./navalplanner-webapp/src/main/webapp/common/event_error.zul:29 +#: navalplanner-webapp/src/main/webapp/common/error.zul:35 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:29 msgid "Reload" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:21 msgid "Criterion type list" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:379 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:379 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_'." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25 msgid "Profiles authorization" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:137 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:157 msgid "Hours Group" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:909 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:909 msgid "Unallocated name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:479 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:496 msgid "Move up" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:425 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:43 -#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:425 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:43 msgid "Not deletable" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:58 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:58 msgid "Add new advance measurement" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:148 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:148 msgid "Create quality form" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:60 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:27 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:60 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77 msgid "NIF" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:862 -msgid "Order element not found" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:166 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:187 msgid "" "Templates can only be created from already existent order elements.\n" "Newly order elements cannot be used." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:152 +msgid "Doing {0} reassignations" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 msgid "BCWP" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:40 -msgid "Not editable" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:196 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:256 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:72 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:196 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:256 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:117 msgid "Scheduling" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:233 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:234 msgid "Subcontract communication date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:106 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:118 msgid "Dependencies have priority" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:43 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45 msgid "code not specified" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:48 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:48 msgid "Confirmation" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 msgid "Budget At Completion" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52 msgid "Nif" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:76 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:76 msgid "Assign Label" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:186 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:186 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21 msgid "Type of work hours listing" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21 msgid "List label types" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:22 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:24 -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 -#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:139 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:24 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 +#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35 msgid "State" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62 msgid "Work done from starting date:" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:79 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:79 msgid "Must start after" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:66 -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:47 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:72 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47 msgid "Password" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:27 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:68 msgid "Observations" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:828 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1010 msgid "Confirm change" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37 msgid "Single image" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:169 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:192 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:216 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:169 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:192 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:216 msgid "Valid from" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:278 +msgid "There exists other template with the same name." +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56 msgid "Month" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:463 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:463 msgid "Exception" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:122 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:122 msgid "At least one order sequence is needed" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:552 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:676 msgid "Edit order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:196 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194 msgid "Send" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:280 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:280 msgid "Cannot insert material in general view. Please, select a category" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:51 +#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:58 msgid "user" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:180 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:194 msgid "criterion satisfaction's start date not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:115 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:115 msgid "The password for a new user cannot be empty" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:155 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:185 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:11 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:155 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:185 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13 +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26 msgid "All" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 msgid "Type name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50 -#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:33 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82 -#: ./navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 -#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:65 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:272 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:38 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:42 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47 +#: navalplanner-webapp/src/main/webapp/planner/main.zul:65 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:273 msgid "Accept" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:21 msgid "Calendars List" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:78 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79 msgid "Example: {0}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:451 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:453 msgid "" "Create new material assignment out of material assignment {0}. Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:197 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:220 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:216 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:239 msgid "Edit Worker" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:183 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:183 msgid "Cannot be higher than Ending date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:74 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:161 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151 msgid "Work report lines" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 msgid "Calculated" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:221 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:221 msgid "Create activation period" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205 +#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:6 +msgid "Personal details" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205 msgid "Workers List" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:188 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168 -msgid "Criterion must be not-null" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:243 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:243 msgid "Worker" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168 +msgid "Criterion must be not-null" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:152 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:147 msgid "criterion name not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:309 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:315 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:309 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:315 msgid " The " msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:38 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:134 +msgid "Value is not valid, the default max value must not be empty " +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:199 +msgid "the " +msgstr "" + +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:44 msgid "Access to the system" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:140 -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:143 -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:140 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:143 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:107 msgid "Click on " msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 msgid "Advance Progress" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:28 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:28 msgid "External overload" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:26 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:108 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:99 msgid "Report data" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:69 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:69 msgid "Authorize" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:43 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:43 msgid "External load" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:41 msgid "Order elements" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:59 +msgid "Report advance" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:45 +msgid "instance not found" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:36 msgid "Landscape" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:298 -msgid "criterion names must be unique inside a criterion " -"type" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:387 +msgid "criterion names must be unique inside a criterion type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:161 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:168 msgid "Create order from Template" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:74 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:25 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:89 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:85 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:89 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:110 -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:7 -#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:25 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:75 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:7 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:60 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:27 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51 +#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:33 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:89 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:85 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:89 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:110 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:7 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:25 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:81 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:7 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:28 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109 msgid "Code" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:8 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10 msgid "Filters" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:289 msgid "Materials saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:40 msgid "Add stretch" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:55 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:55 msgid "Quarter" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:209 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:195 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:217 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:202 msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:539 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:980 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:539 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:980 msgid "Hours for an exception day should be greater or equal than zero" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:86 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:86 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57 msgid "Start date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:138 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:138 msgid "Update exception" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:168 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:189 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:202 msgid "Operation cannot be done" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:118 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:130 msgid "Budget" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:320 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:320 msgid "Already exists other criterion with the same name" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:36 msgid "Unit name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:197 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:217 msgid "Could open generated PDF" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 msgid "Code cannot be null or empty" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:40 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:77 -#: ./navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:40 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:77 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:25 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:111 msgid "Profile name" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:103 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:106 msgid "Disable Delete" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Write" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38 msgid "Number of applications" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:41 msgid "Filter type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:81 +msgid "" +"Date which the task must start after (press enter in textbox to open " +"calendar popup or type in date directly)" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67 msgid "Assigned" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:191 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:468 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:468 msgid "Normal" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:39 msgid "Details" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:287 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:281 msgid "Date cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:158 msgid "" "The name is not valid, there is another advance type with the same name. " msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84 msgid "Advance type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:235 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:239 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172 msgid "Error: {0}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:135 msgid "Company saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:741 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:741 msgid "This label type already is assigned to the work report type." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52 msgid "Do you want to delete "{0}"?" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27 msgid "New criterion" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:215 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:321 -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:224 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:393 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 msgid "Load" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168 msgid "Parent" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:639 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:60 -#: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:53 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:27 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:90 -#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:31 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:100 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:46 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:644 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:61 +#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:53 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:90 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:112 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:46 msgid "Description" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:112 msgid "Type of work hours saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:212 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:212 msgid "Work report list" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:71 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:71 msgid "Expand all taskgroups" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63 msgid "Not found converter for {0}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:86 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:86 msgid "start in fixed date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:209 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:210 msgid "Go to advanced Allocation" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:260 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:261 msgid "Material assignments" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:459 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:466 msgid "already exists an allocation for criteria {0}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42 msgid "Number of finished applications" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:916 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:916 msgid "Text field" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:100 -msgid "code is already being used" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:120 +msgid "" +"Value is not valid, the Precision value must be less than the defalt max " +"value." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:408 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:389 msgid "At least one HoursGroup is needed" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 -#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:57 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:63 +#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156 msgid "User" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:68 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69 msgid "Interacts with applications" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:46 msgid "Multiple values per resource" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:33 msgid "Hours:" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:35 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:40 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:35 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:40 msgid "Split" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:201 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:201 msgid "Create new work week" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:21 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33 msgid "Work report lines listing" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:136 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:136 msgid "Create label type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32 msgid "Work record" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:286 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:287 msgid "Select the calendar" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174 msgid "Criterion saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:129 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:129 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131 msgid "Output format" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:22 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:74 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:24 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:28 -msgid "Starting date" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:132 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:132 msgid "Order sequence prefixes can not be repeated" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:77 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:18 +#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:22 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:86 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:24 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29 +msgid "Starting date" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:77 msgid "Print" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:153 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:113 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:153 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:113 msgid "{0} not found type for criterion " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:374 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:368 msgid "Hours cannot be null" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:358 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:447 msgid "resource type does not allow enabled criteria" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:65 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:83 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:103 -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:94 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:94 -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:121 -#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:34 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 -#: ./navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:274 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:296 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:178 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:126 -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42 -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 -#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33 -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 -#: ./navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:185 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:65 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:83 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:94 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84 +#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73 +#: navalplanner-webapp/src/main/webapp/common/configuration.zul:94 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130 +#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:275 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:297 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84 msgid "Cancel" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:575 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:745 msgid "Function" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:31 +#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:31 msgid "Unschedule" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:32 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:32 msgid "General user data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200 msgid "Subcontracted task sent successfully" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72 msgid "Accumulated hours chart" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 -msgid "Virtual resources" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206 msgid "Machines List" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 +#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21 +msgid "Virtual resources" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61 msgid "CPI" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:85 -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:98 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:119 -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 -#: ./navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 -#: ./navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:95 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:85 +#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:85 +#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:98 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:119 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89 +#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121 +#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:95 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:85 msgid "Format" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:77 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:417 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:734 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:370 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:61 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:94 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:25 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:37 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:39 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:35 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:38 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42 -#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:37 -#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 -#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:34 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:40 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:36 -#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:47 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:48 -#: ./navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 -#: ./navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:68 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:487 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:899 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:370 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:74 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:25 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:39 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:46 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:34 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:40 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:36 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:47 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:48 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:34 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:36 msgid "Edit" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21 msgid "Workers list" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:91 +msgid "" +"Some lines have not allocation periods.\n" +"Below it shows the load all company resources" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67 msgid "Init date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:84 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:96 msgid "Responsible" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47 -#: ./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 +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45 msgid "Dates" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:8 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:9 -#: ./navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:17 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:8 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:9 +#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:17 msgid "Units" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:159 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:159 msgid "By default" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:39 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:39 msgid "Create Calendar" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:125 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:129 msgid "At least one stretch is needed" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelServiceREST.java:92 -msgid "label type name is used by another label type being imported" +#: navalplanner-webapp/src/main/webapp/planner/order.zul:182 +msgid "Satisfied" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:437 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:437 msgid "percentage must be in range (0,100]" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:214 msgid "Stretch date should be greater or equals than task start date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:52 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:62 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:52 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:62 msgid "New Description" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:159 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:164 +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1028 +msgid "" +"resources cost category assignment codes must be unique inside a resource" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:159 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:162 msgid "XML" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60 msgid "Task Properties" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:158 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:166 msgid "" "CriterionType is not valid, the criterionType overlap other " "criterionSatisfaction whith same criterionType" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 +#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 msgid "Create new Work Report Type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:185 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:219 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:193 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:226 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228 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:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:140 msgid "Cost category saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:12 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 msgid "name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:61 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:61 msgid "Unable to convert {0} value to {1} type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:91 -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:10 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:11 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:112 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:91 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:10 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:11 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:112 msgid "Unit price" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:43 msgid "Communication date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:114 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:114 msgid "{0} (max: {1})" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/reassign.zul:29 +#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:29 msgid "Reassigning" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:435 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:388 +msgid "end" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:442 msgid "{0} already assigned to resource allocation list" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:62 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:62 msgid "Log" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:382 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:384 msgid "The type of hours cannot be null." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56 msgid "Authorizations" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/event_error.zul:28 -#: ./navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:35 +#: navalplanner-webapp/src/main/webapp/common/event_error.zul:28 +#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:35 msgid "Continue" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:191 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:198 msgid "Start date cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:32 -#: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 -#: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:26 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:49 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:40 -#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:54 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65 -#: ./navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: ./navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 -#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:24 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:121 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:44 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:129 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40 -#: ./navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:179 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 +#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:40 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58 +#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65 +#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35 +#: navalplanner-webapp/src/main/webapp/templates/_list.zul:24 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:121 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:149 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:179 msgid "Type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:97 -msgid "Total Hours OrderElement" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:21 msgid "Associated Criteria" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:848 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:930 msgid "Value is not valid, the Precision value must be exact " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49 msgid "Generic" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53 msgid "BCWS" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:68 -msgid "P" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:520 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:961 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:520 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:961 msgid "Exception start date should be greater than current date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:251 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:271 msgid " in the specified directory." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:107 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127 msgid "Order does not exist" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:64 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76 msgid "Autogenerated" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:110 -msgid "machine code has to be unique. It is already used" +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1022 +msgid "criterion satisfaction codes must be unique inside a resource" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42 -#: ./navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42 +#: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:45 msgid ">>" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 +#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:46 msgid "Default max value" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 msgid "Add criterion requirement" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 -#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237 +#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 msgid "Working progress per task" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30 +#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30 msgid "New order element name:" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37 +msgid "Criterion" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231 msgid "Manage external companies" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84 msgid "please, select a label" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:313 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:313 msgid "Calculate End Date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226 msgid "Manage types of work hours" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:106 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:106 msgid "Add profile" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:162 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:162 msgid "filter already exists" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:43 -#: ./navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:17 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26 msgid "Criterion name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:117 +#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102 +msgid "missing code in a label" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:117 msgid "values are not valid, the values must not be null" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 msgid "Actual Cost Work Performed" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 +#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47 msgid "Task name" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:116 +#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127 msgid "cost assignment's resource not specified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:295 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:336 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" " and should not be empty" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50 msgid "Average of the worked hours" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42 msgid "an authorization type must be set" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78 msgid "Unassigned" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:141 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:141 msgid "Task information" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100 msgid "Add new criterion requirement" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24 msgid "Select the date from which the new version will be valid" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:90 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82 msgid "Must start after (days since beginning project)" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55 msgid "Budgeted Cost Work Performed" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:123 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:54 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:82 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:123 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:54 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:82 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:34 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:162 msgid "Add" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:94 -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 -#: ./navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:272 +msgid "the name must be not empty" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:94 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26 msgid "Disabled" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:216 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:322 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:225 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:394 msgid "Earned value" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:59 -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:104 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:45 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:75 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:59 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:104 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:45 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:75 msgid "Unselect" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:495 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:495 msgid "You should select the type of exception" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:89 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:79 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:29 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:92 +#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:91 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:31 +#: navalplanner-webapp/src/main/webapp/orders/_list.zul:30 msgid "Deadline" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:14 -msgid "Apply filtering to order elements satisfying required criteria" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:490 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:605 msgid "You don't have permissions to edit this order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:213 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:219 msgid "Advance measurements" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:102 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:102 msgid "Filter by categories or materials" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:348 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:354 msgid "Amount work percentage should be between 0 and 100" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:28 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:28 msgid "Machine data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42 msgid "From Today" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59 msgid "VAC" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:578 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:591 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:590 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:603 msgid "{0} not supported yet" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:178 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:177 msgid "Advanced Allocation" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:33 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:54 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:33 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:54 msgid "Label type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:54 +#: navalplanner-webapp/src/main/webapp/templates/templates.zul:58 msgid "Template Tree" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52 msgid "New entry" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 msgid "Alpha" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:47 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:47 msgid "Resources Load" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:31 msgid "Overload due to current order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:45 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:45 msgid "Overall Resources Load" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:118 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:118 msgid "Changes have been canceled" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:216 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:231 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:248 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:263 msgid "Machine saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:170 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:170 msgid "Recommended Allocation" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 msgid "Advance type list" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:14 +#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:14 msgid "Status" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:694 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:569 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:68 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:79 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:82 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:122 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:184 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:130 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:113 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:127 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:158 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:30 +msgid "Assigned criterion requirements" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:507 +msgid "the date must be inside the visualization area" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:707 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:739 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69 +#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:73 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68 +#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:82 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:122 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:185 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:150 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:113 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:127 +#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:158 msgid "Hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:454 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:499 msgid "date not specified." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:52 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:52 msgid "Quality form type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:334 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:334 msgid "The name of the criterion is empty." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:55 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:580 +msgid "The max value must be not empty" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:55 msgid "New label" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:320 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:325 +#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:16 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12 +#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:14 +msgid "Apply filtering to order elements satisfying required criteria" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:332 msgid "The start date cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:41 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:41 msgid "Max value" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:51 -#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:52 -#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:58 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:51 +#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:58 msgid "No" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:150 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154 msgid "The name is not valid, the name must not be null " msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:242 +#: navalplanner-webapp/src/main/webapp/planner/order.zul:243 msgid "Subcontract price" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:112 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:112 msgid "A category must be selected" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 +#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 msgid "Spread" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:210 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:229 msgid "Edit virtual worker groups" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:140 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:206 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:501 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:145 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:625 msgid "Removed {0}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:1 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:3 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:1 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:3 +#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29 msgid "Assigned criteria" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:40 +#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:46 msgid "Help on authentication (opens a new window)" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 -msgid "Group name" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:864 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:864 msgid "The length must be greater than 0, and not null." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 +msgid "Group name" +msgstr "" + +#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 msgid "Start date:" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:81 -#: ./navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81 +#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57 msgid "Role name" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21 msgid "Machines list" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:461 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:469 msgid "Could not save new calendar" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:340 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:446 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:555 msgid "h" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114 +msgid "Value is not valid, the precision value must not be empty" +msgstr "" + +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188 msgid "Cannot delete profile: it does not exist anymore" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135 msgid "Couldn't find criterion {0}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95 msgid "Create & Assign" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99 msgid "Add Milestone" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:173 -msgid "first name, surname, and nif are used by another worker being imported" +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:367 +msgid "init" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:328 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java:78 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:40 -#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:328 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java:78 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:40 msgid "Confirm" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:35 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:49 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:47 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:47 -#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50 -#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:54 -#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:45 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:49 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:45 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:38 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:59 -#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 -#: ./navalplanner-webapp/src/main/webapp/calendars/_list.zul:31 -#: ./navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:48 -#: ./navalplanner-webapp/src/main/webapp/users/_listUsers.zul:44 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:35 +#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:49 +#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:54 +#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:55 +#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50 +#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:45 +#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:49 +#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:45 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:59 +#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31 +#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:31 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:48 +#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:44 msgid "Create" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1620 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1626 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1564 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1570 msgid "please, select a work report type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78 msgid "Permissions" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 +#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 msgid "Print layout" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:23 +#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:23 msgid "Edit User" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54 +#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54 msgid "Maximum/minimum of the estimated hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:101 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:41 msgid "Filter pattern" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:11 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:12 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:11 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:12 msgid "Total price" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:220 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:220 msgid "Manage advance types" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:873 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:974 msgid "" "The date is not valid, the date must be unique for this advanced assignment" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1101 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:430 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:184 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:205 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:160 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:219 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:384 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:530 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:360 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:543 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:381 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:196 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:339 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:911 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:750 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:685 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:895 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1108 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:67 -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:40 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:64 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:66 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:110 -#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:44 -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 -#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:39 -#: ./navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:53 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:90 -#: ./navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:37 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:78 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:187 -#: ./navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:98 -#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53 -#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 -#: ./navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 -#: ./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/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1068 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1080 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:430 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:184 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:205 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:160 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:219 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:556 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:562 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:366 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:545 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:383 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1024 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:915 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:685 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:895 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1108 +#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177 +#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42 +#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:80 +#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:40 +#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45 +#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:62 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:66 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116 +#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131 +#: navalplanner-webapp/src/main/webapp/materials/materials.zul:110 +#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74 +#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:39 +#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:53 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:90 +#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:37 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:87 +#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:209 +#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101 +#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66 +#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53 +#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:109 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:39 +#: 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 msgid "Delete" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 +#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 msgid "Profiles listing" msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32 +msgid "RESOURCE" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:33 +msgid "WORKER" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:34 +msgid "MACHINE" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:71 +#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:112 +msgid "You can not modifiy this order sequence, it is already in use" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:121 +#, java-format +msgid "number of digits must be between {0} and {1}" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java:129 +msgid "Line" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29 +msgid "Pending" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31 +msgid "Failed sent" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:32 +msgid "Success sent" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27 +msgid "Finished" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:28 +msgid "In progress" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:30 +msgid "Blocked" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:185 +msgid "the resource type should be Worker or Machine" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:194 +msgid "Working hours shouldn't be negative" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:221 +msgid "Total percentage should be less than 100%" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:270 +#, 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:276 +#, 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/SchedulingState.java:164 +#, java-format +msgid "{0} is already child of another {1}" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:210 +msgid "it's already somewhat scheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:224 +msgid "it can't be unscheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:357 +msgid "Completely scheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:359 +msgid "Partially scheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:361 +msgid "Unscheduled" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:367 +msgid "C" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:369 +msgid "P" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:371 +msgid "U" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:412 +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:461 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:774 +msgid "Cannot spread two advances in the same order element" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:483 +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:509 +msgid "Duplicate Advance Assignment For Order Element" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java:536 +#, java-format +msgid " The {0} already exist into other order element" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "OFFERED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "ACCEPTED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:32 +msgid "STARTED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "FINISHED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:33 +msgid "CANCELLED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "SUBCONTRACTED PENDING ORDER" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java:34 +msgid "STORED" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:259 +msgid "workHours should be greater or equals to 0" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroupHandler.java:271 +msgid "" +"\"workHours\" value is not valid, taking into account the current list of " +"HoursGroup" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:32 +msgid "Read authorization" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorizationType.java:33 +msgid "Write authorization" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:33 +msgid "Web service reader" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:34 +msgid "Web service writer" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:35 +msgid "All orders read allowed" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:36 +msgid "All orders edition allowed" +msgstr "" + +#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:37 +msgid "Order creation allowed" +msgstr ""