From f85984df505c873937a48422cd402a425361db21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Thu, 28 Jan 2010 12:13:23 +0100 Subject: [PATCH] ItEr45S21DocumentacionFormacionItEr38S18: Updated files keys.pot. --- ganttzk/src/main/resources/i18n/keys.pot | 93 +- .../src/main/resources/i18n/keys.pot | 3056 ++++++++++++----- 2 files changed, 2326 insertions(+), 823 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot index a08a8f305..35eba51e8 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: 2009-12-09 12:30+0100\n" +"POT-Creation-Date: 2010-01-28 11:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,56 +16,99 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:35 +#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36 msgid "Show all labels" msgstr "" -#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:38 -#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:14 -msgid "Zoom decrease" +#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35 +#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:11 +msgid "Zoom level" msgstr "" -#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:109 -msgid "100%" +#: ./ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:195 +msgid "Erase" msgstr "" -#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:104 +#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:106 msgid "0% - 100%" msgstr "" -#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:16 +#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:17 msgid "Filter" msgstr "" -#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:36 -#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:12 -msgid "Zoom increase" -msgstr "" - -#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:99 -msgid "Assignation percentage" -msgstr "" - -#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:32 +#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:33 msgid "Critical path" msgstr "" -#: /home/jaragunde/projects/xestion-producion/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:147 -msgid "increasing zoom" +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:30 +msgid "Year" msgstr "" -#: /home/jaragunde/projects/xestion-producion/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:164 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:46 +msgid "Month" +msgstr "" + +#: ./ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:206 +msgid "Set End-Start" +msgstr "" + +#: ./ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:214 +msgid "Set End-End" +msgstr "" + +#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:225 msgid "decreasing zoom" msgstr "" -#: /home/jaragunde/projects/xestion-producion/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:345 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:409 msgid "Hide critical path" msgstr "" -#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:114 +#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39 +msgid "Show all resources" +msgstr "" + +#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:116 msgid "+ 100%" msgstr "" -#: /home/jaragunde/projects/xestion-producion/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:340 +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:62 +msgid "Day" +msgstr "" + +#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:111 +msgid "100%" +msgstr "" + +#: ./ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:42 +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 +msgid "Week" +msgstr "" + +#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:208 +msgid "increasing zoom" +msgstr "" + +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:188 +msgid "changing zoom" +msgstr "" + +#: ./ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:38 +msgid "Quarter" +msgstr "" + +#: ./ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:404 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 9d411f8de..1ab63538f 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: 2009-12-09 12:30+0100\n" +"POT-Creation-Date: 2010-01-28 11:13+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,33 +16,68 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:195 +#: ./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:275 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:338 msgid "The resource cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:74 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:33 +#: ./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 msgid "Customer" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:546 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:95 +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 msgid "Hours type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:131 +#: ./navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:57 +#: ./navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:67 +msgid "en" +msgstr "" + +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:143 +msgid "criterion type name not specified" +msgstr "" + +#: ./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 msgid "Create exception" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:188 +#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45 +msgid "Select report data" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:194 msgid "Add Exception" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:549 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26 +#: ./navalplanner-webapp/src/main/webapp/users/_editProfile.zul:23 +msgid "Edit profile" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 +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 @@ -51,11 +86,12 @@ msgstr "" #: ./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:26 +#: ./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 @@ -64,31 +100,61 @@ msgstr "" #: ./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/orders/_listOrderElementCriterionRequirements.zul:40 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:186 +#: ./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/_orderElementTree.zul:72 #: ./navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:36 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:53 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:125 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:169 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:215 +#: ./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 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 +msgid "cannot be empty" +msgstr "" + +#: ./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 msgid "Add criterion" msgstr "" +#: ./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/planner/order.zul:176 +#: ./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 +msgid "from" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:197 msgid "Select" msgstr "" @@ -96,14 +162,18 @@ msgstr "" msgid "there must be {0} hours instead of {1}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:208 +#: ./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:72 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:40 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:33 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:61 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:138 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:38 +#: ./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:56 +#: ./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 msgid "Materials" msgstr "" @@ -117,7 +187,7 @@ msgid "" "date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:185 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:181 msgid "A type must be selected" msgstr "" @@ -125,16 +195,16 @@ msgstr "" msgid "Description cannot be null or empty" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:94 +#: ./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:40 +#: ./scripts/../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:503 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:944 +#: ./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 "" @@ -142,31 +212,55 @@ msgstr "" msgid "Variance At Completion" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:56 +#: ./navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:58 #: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:41 msgid "Help" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 -msgid "Name/NIF" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:305 +msgid "Please, select a calendar" msgstr "" #: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27 msgid "Managing fields and labels" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:276 -msgid "Please, select a calendar" +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:57 +#: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:33 +msgid "Quality Forms" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168 +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:171 msgid "Summary" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:68 +msgid "Order sequences" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:252 +msgid "Exportation options" +msgstr "" + +#: ./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 +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/planner/allocation/AdvancedAllocationController.java:553 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:25 +#: ./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 @@ -179,82 +273,93 @@ msgstr "" #: ./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/search/allocation_selector.zul:62 +#: ./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:69 #: ./navalplanner-webapp/src/main/webapp/planner/main.zul:48 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:47 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:160 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:51 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:156 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:25 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:33 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:64 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:180 +#: ./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 msgid "Name" msgstr "" -#: ./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" +#: ./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 msgid "Criterion requirements" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:76 -msgid "START_NOT_EARLIER_THAN" -msgstr "" - #: ./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/AssignedLabelsToOrderElementController.java:135 +#: ./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:295 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:358 msgid "Time Start cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:62 +#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65 msgid "Dedication chart" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154 +#: ./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:283 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:484 msgid "It not could remove the order element " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:500 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:502 -msgid "Error on splitting element: " +#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:619 +msgid "Not the same hours group, impossible to update" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:112 -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:93 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:913 +msgid "Stretches with Interpolation" +msgstr "" + +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:120 msgid "The end date cannot be before the init date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:73 -msgid "Click on the icons to execute operation in the order element" +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:132 +msgid "cost assignment with end date less than start date" msgstr "" #: ./navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:14 @@ -262,14 +367,28 @@ msgstr "" msgid "Category name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:383 +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:57 +msgid "hours type :" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:636 +msgid "Not the same material, impossible to update" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:63 +msgid "Quality form items list" +msgstr "" + +#: ./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:556 msgid "Create order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:174 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:198 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:193 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:216 +#: ./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 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" @@ -278,31 +397,43 @@ msgstr "" msgid "Main menu" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:37 -msgid "Zoom increase" -msgstr "" - #: ./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:535 +#: ./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 +msgid "Select print visualization options" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:684 msgid "Hour start" msgstr "" #: ./navalplanner-webapp/src/main/webapp/planner/main.zul:52 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:51 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:126 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:68 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:147 msgid "Start" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:357 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:366 msgid "There exists other workReportType with the same name." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:115 +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:107 +msgid "cost assignment's category not specified" +msgstr "" + +#: ./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/webapp/orders/_list.zul:64 msgid "Schedule" msgstr "" @@ -310,39 +441,71 @@ msgstr "" msgid "Unexpected: {0}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DefaultUserDetailsService.java:64 -msgid "User with login name '{0}': not found" +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:113 +msgid "worker's NIF not specified" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:60 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:59 -msgid "Notes" +#: ./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 msgid "Resources capability" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:151 +#: ./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 +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 msgid "changing perspective" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:139 -msgid "Add New Label Type" +#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26 +msgid "Filter quality forms by :" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:48 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:123 +msgid "" +"Could not add those authorizations to profile {0} because they were already " +"present." +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:57 msgid "Default calendar" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:85 +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:76 +msgid "Order Element Code" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:104 msgid "Changes saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:56 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:55 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:130 -msgid "End" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:736 +msgid "See scheduling" +msgstr "" + +#: ./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 +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:99 +msgid "Subcontract" msgstr "" #: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 @@ -350,88 +513,161 @@ msgstr "" msgid "Relationship" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:182 -msgid "Work report saved" +#: ./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:151 +msgid "End" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:290 -msgid "{0} must be after {1}" +#: ./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 +msgid "Materials needs at date" +msgstr "" + +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:134 +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/orders/OrderElementTreeController.java:667 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:32 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:520 msgid "Indent" msgstr "" +#: ./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 +msgid "New template" +msgstr "" + #: ./scripts/../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/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:463 -msgid "Not working day" +#: ./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 +msgid "Task quality forms" msgstr "" #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127 msgid "Base calendar \"{0}\" saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 -msgid "Locations" +#: ./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 +msgid "Create Order Element" msgstr "" #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:88 msgid "The advanceType cannot be modified" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:59 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:86 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:91 +#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31 +msgid "Locations" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66 +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:109 msgid "Resource allocation" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:376 +#: ./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 +msgid "please, select a quality form" +msgstr "" + +#: ./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/workreports/WorkReportCRUDController.java:513 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:139 +msgid "For interpolation at least two stretches are needed" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:660 msgid "Order Code" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:71 +#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:41 +msgid "Login name" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:90 msgid "Constraint" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 +msgid "Customer reference code" +msgstr "" + +#: ./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 msgid "Current" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:303 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:366 msgid "Time finish cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:85 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:91 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:96 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:342 +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:96 +#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +msgid "Customer reference" +msgstr "" + +#: ./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:500 msgid "Information" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:39 -msgid "Zoom decrease" +#: ./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 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" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36 msgid "Create new advance type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:38 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:37 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:239 +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 msgid "Criterion Requirement" msgstr "" @@ -443,10 +679,22 @@ msgstr "" 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 +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 +msgid "percentage cannot be duplicated" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26 msgid "Heading" msgstr "" @@ -459,7 +707,7 @@ msgstr "" msgid "Derived" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:184 +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:181 msgid "a disabled resource has enabled subresources" msgstr "" @@ -467,28 +715,36 @@ msgstr "" msgid "Add new advance assignment" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:228 +#: ./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/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 msgid "Could not save machine" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:169 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:73 msgid "Unable to convert value to {0} type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:145 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:174 msgid "Worker must be not-null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:46 -msgid "Show all order elements" +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:846 +msgid "Some criterion satisfactions overlap in time" msgstr "" #: ./scripts/../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:117 +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:115 msgid "Imputed hours" msgstr "" @@ -496,58 +752,96 @@ msgstr "" 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 +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/calendars/BaseCalendarModel.java:453 +#: ./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 msgid "{0} already exists" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:139 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:388 -msgid "Confirm deleting this hour cost. Are you sure?" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:213 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:231 msgid "Create Worker" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:341 -msgid "The order has no scheduled elements" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58 +msgid "Delete Milestone" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:17 -msgid "Code " +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:499 +msgid "The order has no scheduled elements" msgstr "" #: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47 msgid "Non-assigned locations" msgstr "" +#: ./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 msgid "" "The {0} is not valid, criterionType overlaps with other " "criterionSatisfaction from the same criterionType" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:842 +#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:74 +msgid "Application URI" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41 +msgid "Paper size" +msgstr "" + +#: ./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 msgid "None" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:864 +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:81 +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 +msgid "Scheduling progress per order" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:952 msgid "Configure" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:120 +msgid "Work" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45 #: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:25 msgid "First name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:883 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:95 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:409 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:201 +msgid "Could not execute print command" +msgstr "" + +#: ./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 msgid "Error" msgstr "" @@ -556,153 +850,205 @@ msgstr "" msgid "Cost Performance Index" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60 -msgid "ETC" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:139 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:951 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:204 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:317 -msgid "Confirm deleting {0}. Are you sure?" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:138 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:153 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:475 +msgid "Confirm deleting {0}. Are you sure?" +msgstr "" + +#: ./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 msgid "Log out" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:69 +msgid "External code" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23 msgid "Add new configuration unit" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:37 +#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:40 msgid "Main preferences" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:176 -msgid "The order {0} must be scheduled" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:153 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:154 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " "same criterion" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:45 -msgid "Add new worker assignment" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:196 +msgid "The order {0} must be scheduled" msgstr "" #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:165 msgid "Label type saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:463 +#: ./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 +msgid "View" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:475 msgid "resources per day must be not empty and bigger than zero" msgstr "" +#: ./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 +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 msgid "Edit type of work hour" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:248 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:28 -msgid "Up" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:111 -msgid "Total Estimated hours" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:158 +msgid "" +"CriterionType is not valid, it overlaps other criterionSatisfaction with the " +"same criterionType" msgstr "" #: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21 msgid "Work Report types" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:157 -msgid "" -"CriterionType is not valid, it overlaps other criterionSatisfaction with the " -"same criterionType" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:132 +msgid "Total Estimated hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58 -msgid "EAC" +#: ./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 msgid "Budgeted Cost Work Scheduled" msgstr "" +#: ./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 +msgid "Virtual workers list" +msgstr "" + #: ./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/order/SaveCommand.java:186 -msgid "The task '{0}' has some repeated Worker assigned" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:69 -msgid "Name and description" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionModel.java:142 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:129 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:248 msgid "End date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:99 +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:102 msgid "Start Date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:92 -msgid "Worker search" +#: ./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 msgid "Cost Variance" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:323 +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:343 msgid "criterion type does not allow resource hierarchy" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:55 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:81 +#: ./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 msgid "Total" msgstr "" +#: ./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 +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 +msgid "Please, select an order" +msgstr "" + +#: ./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:81 +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:86 msgid "Invalidate" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:100 -msgid "Criteria" +#: ./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 msgid "Order Details" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:111 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:510 +#: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:118 +msgid "Criteria" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:26 +msgid "User data" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 msgid "Budget hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:65 +#: ./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 +msgid "Edit task: {0}" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43 msgid "Lines" msgstr "" @@ -711,36 +1057,38 @@ msgstr "" msgid "Orders List" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:744 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1064 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1221 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1542 msgid "OrderElement not found" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187 +#: ./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/resources/machine/MachineCRUDController.java:214 -msgid "Could not save Machine" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:461 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:247 +msgid "must be greater than the previous date." msgstr "" #: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29 msgid "Personal data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:194 -msgid "Work reports" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:737 -#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37 -#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:40 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:41 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:45 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:498 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1375 msgid "Show all" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:85 +#: ./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 +msgid "A4" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92 msgid "{0} annotation required on {1}" msgstr "" @@ -749,7 +1097,23 @@ msgstr "" msgid "Default price" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:184 +#: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 +msgid "Estimated hours" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:595 +msgid "Modified" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:38 +msgid "Edit virtual resource" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:206 +msgid "Apply tab changes" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:190 msgid "Add Criterion" msgstr "" @@ -757,28 +1121,50 @@ msgstr "" msgid "Fattened Tree {0}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:235 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:61 +#: ./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 msgid "MessagesContainer is needed" msgstr "" +#: ./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:24 +#: ./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/java/org/navalplanner/web/common/CustomMenuController.java:209 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:260 +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 +msgid "Subcontracted tasks list" +msgstr "" + +#: ./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 +msgid "Last value" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:31 msgid "Create new order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:183 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:198 msgid "General resource allocation" msgstr "" @@ -788,15 +1174,33 @@ msgstr "" msgid "Edit Calendar" msgstr "" +#: ./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 msgid "Cannot be empty or null" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:32 +msgid "Total Budget" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:49 msgid "Hierarchy" msgstr "" +#: ./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 +msgid "Print configuration" +msgstr "" + #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:66 msgid "C" msgstr "" @@ -821,20 +1225,39 @@ msgstr "" msgid "Stretches function configuration" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:752 -msgid "Two assignments overlap in time" +#: ./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 +msgid "Filter work report by :" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:86 +msgid "User disabled" msgstr "" #: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:11 msgid "Order element name" msgstr "" +#: ./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 msgid "Workers" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:456 +#: ./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 msgid "end date: {0} must be after start date: {1}" msgstr "" @@ -842,50 +1265,110 @@ msgstr "" msgid "Advance measurements: " msgstr "" +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:100 +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:205 +#: ./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/web/orders/ManageOrderElementAdvancesController.java:841 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceServiceREST.java:171 +msgid "code is used by another machine being imported" +msgstr "" + +#: ./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 +msgid "Year" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:100 +msgid "Is subcontracted" +msgstr "" + +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66 +msgid "profile name not specified" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:226 +#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42 +msgid "Subcontratation date" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:47 +msgid "Date Start" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:842 msgid "Value is not valid, the current value must be less than max value" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:122 +#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3 +msgid "Filter by label:" +msgstr "" + +#: ./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/_listOrderElementAdvances.zul:67 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:31 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:52 -msgid "Value" +#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23 +msgid "Edit external company" +msgstr "" + +#: ./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/webapp/costcategories/_editCostCategory.zul:53 msgid "Hour costs" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:684 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:919 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/Autocomplete.java:91 +#: ./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 msgid "Please, select an item" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:525 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:966 +#: ./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 msgid "Exception end date should be greater or equals than start date" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:174 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:176 msgid "Work report type saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionModel.java:190 -msgid "Stretch date should be between task dates" +#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:79 +msgid "Prefix" +msgstr "" + +#: ./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:244 +#: ./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 @@ -894,61 +1377,85 @@ msgid "" "other criterion" msgstr "" +#: ./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 msgid "Schedule Performance Index" msgstr "" +#: ./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 +msgid "Create virtual resource" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26 msgid "Type data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207 -msgid "Label types" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:205 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:245 -msgid "Indicators" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:286 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:349 msgid "The order element code cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:538 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:688 msgid "Hour finish" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:65 +#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:62 msgid "Perspectives" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:74 +#: ./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 msgid "Order" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:123 -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:146 -msgid "Position" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:846 +#: ./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/webapp/common/layout/login.zul:87 -msgid "Incorrect authentication" +#: ./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 +msgid "Position" +msgstr "" + +#: ./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 +msgid "Company name" msgstr "" #: ./navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36 +#: ./navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:36 msgid "Edit work report" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:748 +#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:91 +msgid "Incorrect authentication" +msgstr "" + +#: ./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 +msgid "Value last advance measurement" +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/AssignedMaterialsToOrderElementController.java:483 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:456 msgid "Split new assignment" msgstr "" @@ -956,20 +1463,33 @@ msgstr "" msgid "Current value" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:167 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214 +#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:36 +#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51 +msgid "Zoom level" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:27 +msgid "Quality form" +msgstr "" + +#: ./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/java/org/navalplanner/web/common/CustomMenuController.java:213 +#: ./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 msgid "Configuration" msgstr "" #: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:48 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:41 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:121 +#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 +#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73 msgid "Categories" msgstr "" @@ -977,30 +1497,42 @@ msgstr "" msgid "Unscheduled" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:139 +#: ./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 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 msgid "Percentage" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:68 -msgid "Total order element hours" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:137 -msgid "Calculation type" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:204 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:221 msgid "Manage criteria" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:138 -msgid "No worker selected" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69 +msgid "Total order element hours" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:158 +msgid "Calculation type" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:127 +msgid "Updated" msgstr "" #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:116 @@ -1009,128 +1541,213 @@ msgid "" "value and not null" msgstr "" +#: ./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 +msgid "Number of digits" +msgstr "" + #: ./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:649 +msgid "Hours invested" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21 msgid "Navalpro: Calendars" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:349 -msgid "Hours invested" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:467 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:648 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:516 +msgid "Advance" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:345 -msgid "Advance" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:227 +msgid "Problems connecting with client web service" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:21 +msgid "Templates" msgstr "" #: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50 msgid "Amount work percentage" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:43 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:48 -msgid "Filter all order elements by label" +#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 +msgid "Date last advance reported" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:90 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:123 +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93 +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:126 msgid "Exception Type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:459 +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:206 +msgid "criterion satisfaction's resource not specified" +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:660 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:500 +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:55 +#: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:31 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:256 +#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:38 +msgid "Labels" +msgstr "" + #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:186 msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:354 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:36 -msgid "Labels" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:110 +msgid "Resources search" msgstr "" #: ./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 +msgid "Confirm deleting this profile. Are you sure?" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21 msgid "Navalpro: AdvanceTypes" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 -msgid "Data" +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:135 +msgid "Total hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:237 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:277 +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:29 +msgid "Resource :" +msgstr "" + +#: ./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 +msgid "Order element" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:281 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:355 msgid "Select date:" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:181 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197 msgid "Company view" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:511 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:952 +#: ./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 msgid "You should select a end date for the exception" msgstr "" +#: ./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 +msgid "Just one order sequence must be active" +msgstr "" + +#: ./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 msgid "Unknown attribute '{0}' in class {1}" msgstr "" #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:197 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:279 msgid "Calendar allocation" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:74 -msgid "Activation periods" +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:83 +msgid "machine name not specified" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:74 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:159 +#: ./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 +msgid "already assigned" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:323 +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 msgid "Category" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:97 -msgid "Order Element Information" -msgstr "" - #: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:23 msgid "Edit cost category" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:117 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:155 -msgid "already assigned" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:115 +msgid "Order Element Information" +msgstr "" + +#: ./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 +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:90 +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:111 msgid "Calendar" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 -msgid "Category data" +#: ./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 msgid "[generic all workers]" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:188 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:21 -msgid "Resources" +#: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26 +msgid "Category data" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:144 +#: ./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 msgid "Search" msgstr "" @@ -1138,12 +1755,15 @@ msgstr "" msgid "CriterionType and its criteria saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:192 -msgid "to" +#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115 +msgid "Add New Complementary Field" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:126 -msgid "%" +#: ./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 +msgid "to" msgstr "" #: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49 @@ -1151,14 +1771,30 @@ msgstr "" msgid "Remove calendar" msgstr "" +#: ./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:801 +msgid "must be lower than finish date" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:82 msgid "Order Element" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:507 +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:91 +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/_listWorkReport.zul:26 +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:75 #: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "" @@ -1167,117 +1803,197 @@ msgstr "" msgid "Could not load any resource" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:34 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:254 +msgid "date not specified" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:36 msgid "Material search" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:36 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35 -msgid "Advances" +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:78 +msgid "Select type :" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:308 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:337 msgid "" "You must allow multiple active criteria for this type to use this assignment " "strategy" 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:177 -msgid "Close" +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:54 +#: ./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 +msgid "Advances" +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 msgid "Default Label" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50 +#: ./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:198 +msgid "Close" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:55 msgid "Last name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:371 +#: ./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:348 +#: ./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 +msgid "Company data" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21 msgid "Criterions Requirement" msgstr "" +#: ./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 +msgid "Quality form saved" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49 msgid "Length percentage" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62 -msgid "SPI" +#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 +msgid "Label Type fields" +msgstr "" + +#: ./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 +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 msgid "Hours Management" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:440 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:928 +msgid "Interpolation" +msgstr "" + +#: ./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 +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 "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:59 -msgid "Type of day" +#: ./scripts/../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:366 +#: ./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/webapp/planner/stretches_function.zul:36 +#: ./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 +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 +msgid "Type of day" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:890 msgid "Stretches list" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:201 +#: ./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 +msgid "Task quality form name" +msgstr "" + +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:876 +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:42 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:45 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:47 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:50 +#: ./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/materials/materials.zul:120 +#: ./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:61 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:123 +#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:92 +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:112 +#: ./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 msgid "Save" msgstr "" -#: ./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/worker/_localizations.zul:30 #: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52 #: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66 msgid "Group" msgstr "" +#: ./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 @@ -1285,14 +2001,27 @@ msgstr "" #: ./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/qualityforms/qualityForms.zul:21 +msgid "Navalpro: QualityForms" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38 msgid "Edit advance type data" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:167 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:124 +msgid "Pending update" +msgstr "" + +#: ./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 msgid "Criterion previously selected" msgstr "" @@ -1300,34 +2029,62 @@ msgstr "" msgid "Completely scheduled" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:238 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:301 msgid "Order Element code cannot be null" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:35 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:34 +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:38 +#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:36 msgid "Assigned hours" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:810 +#: ./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 +msgid "Users authorization" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:827 msgid "You are going to change the assignment function. Are you sure?" msgstr "" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:164 +msgid "Problems connecting with subcontractor web service" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:144 +msgid "There must be at least 2 stretches for doing interpolation" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:67 +msgid "Show all labels" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38 msgid "Assigned load" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:105 +#: ./navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68 +msgid "Filter by workers" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:108 msgid "End Date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:164 -msgid "Resources Per Day" +#: ./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:6 +#: ./navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12 +#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 +msgid "Filter" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:46 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:52 -msgid "Filter" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:184 +msgid "Resources Per Day" msgstr "" #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:187 @@ -1335,15 +2092,15 @@ msgstr "" msgid "ResourceType must be not-null" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionServiceREST.java:138 +#: ./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" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:272 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:412 msgid "Order saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:601 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:456 msgid "Move down" msgstr "" @@ -1351,7 +2108,7 @@ msgstr "" msgid "Report structure" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:43 +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:84 msgid "password not specified" msgstr "" @@ -1365,21 +2122,28 @@ msgstr "" msgid "Assigned locations" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:32 +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:52 +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:36 msgid "General data" msgstr "" +#: ./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 msgid "BAC" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:332 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:301 msgid "Calculate Number of Hours" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:210 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:146 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:77 +#: ./navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:292 +#: ./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 "" @@ -1387,6 +2151,12 @@ msgstr "" msgid "Two hour costs with the same type overlap in time" msgstr "" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:429 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:751 +#: ./navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36 +msgid "Create Template" +msgstr "" + #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:70 msgid "U" msgstr "" @@ -1399,10 +2169,6 @@ msgstr "" msgid "ACWP" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:49 -msgid "Add work relationship" -msgstr "" - #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:164 msgid "Advance type saved" msgstr "" @@ -1411,7 +2177,8 @@ msgstr "" msgid "START" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:62 +#: ./navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51 +#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:68 msgid "Back" msgstr "" @@ -1419,11 +2186,32 @@ msgstr "" msgid "Schedule Variance" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:201 +#: ./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 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:784 +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 +msgid "Service does not manage resource of type: {0}" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:21 msgid "Work report listing" msgstr "" @@ -1432,40 +2220,48 @@ msgstr "" msgid "Cancel and return" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:41 +#: ./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 msgid "Edit worker" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:409 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:380 msgid "Delete item {0}. Are you sure?" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:185 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:876 +#: ./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 msgid "Warning" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:758 -#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:42 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:47 -msgid "Filter by Label" -msgstr "" - #: ./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:64 +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67 msgid "Hours of day" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:849 +#: ./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" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:905 msgid "Stretches" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:154 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:173 msgid "Allocations" msgstr "" @@ -1473,6 +2269,10 @@ msgstr "" msgid "Show" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:86 +msgid "Duration (days)" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:30 msgid "Assignment Type" msgstr "" @@ -1481,14 +2281,24 @@ msgstr "" msgid "Length" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:336 +#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:26 +#: ./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 msgid "Create derived" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:417 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:430 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 +msgid "Error on splitting" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 msgid "must be a real positive number" msgstr "" @@ -1507,20 +2317,32 @@ msgstr "" msgid "Removed calendar \"{0}\"" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:254 +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 msgid "<<" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:87 +#: ./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/planner/allocation/AdvancedAllocationController.java:875 +#: ./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 +msgid "Task properties" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:842 msgid "You need to select some function to configure" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:60 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:64 msgid "as soon as possible" msgstr "" @@ -1529,15 +2351,16 @@ msgstr "" msgid "Surname" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:351 -msgid "the name must be not null or not empty" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:501 +#: ./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/_listWorkReport.zul:25 +#: ./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/_listOrderElementMaterials.zul:69 +#: ./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 @@ -1545,47 +2368,72 @@ msgstr "" msgid "Date" msgstr "" +#: ./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 +msgid "company NIF has to be unique. It is already used" +msgstr "" + #: ./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/webapp/workreports/_listWorkReportTypes.zul:45 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:112 +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 msgid "New work report" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:66 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:76 +#: ./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 msgid "Advance assignments" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:28 -msgid "Edit order element" +#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45 +msgid "A3" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:314 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:327 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:315 -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:77 -msgid "Validate" +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:48 +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 +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 +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 +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:148 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:204 msgid "Error on removing element: " msgstr "" @@ -1595,68 +2443,135 @@ msgstr "" msgid "Cost category assignment" msgstr "" +#: ./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 msgid "Found workers" msgstr "" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:458 +msgid "All workers" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:236 +#: ./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 msgid "Label saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:103 +#: ./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/_orderElementTree.zul:26 +#: ./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/orders/_edition.zul:125 +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:114 +#: ./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 msgid "Save & Continue" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:918 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:37 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:928 +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:40 msgid "Label" msgstr "" +#: ./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:241 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:142 +#: ./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/materials/materials.zul:93 +#: ./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/orders/_ordersTab.zul:38 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:81 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:43 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:35 +#: ./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:537 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:377 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:357 +#: ./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 +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 +msgid "Quality forms" +msgstr "" + +#: ./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:116 +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:121 msgid "Hours group" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:980 +#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:29 +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:84 +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 "" @@ -1664,12 +2579,13 @@ msgstr "" msgid "Estimate At Completion" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:194 +#: ./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/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:173 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:175 msgid "Edit machine" msgstr "" @@ -1677,7 +2593,7 @@ msgstr "" msgid "Estimate To Complete" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:234 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:233 msgid "" "Are you sure of changing the resource type? You will lose the criterions " "with different resource type." @@ -1687,45 +2603,63 @@ msgstr "" msgid "Indirect" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:24 +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:29 msgid "Assigned Criterion Requirements" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:86 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:71 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:157 +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:90 +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 msgid "Unit type" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:27 +#: ./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 msgid "Order code" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java:123 +#: ./scripts/../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 -msgid "Direct" -msgstr "" - #: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41 msgid "Load due to other assignments" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:73 +#: ./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/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25 +msgid "Direct" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55 +#: ./navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55 +msgid "Reference date:" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:76 msgid "Work week" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:102 +#: ./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:216 -msgid "Quality management" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:185 +#: ./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 "" @@ -1734,22 +2668,51 @@ msgstr "" msgid "Value is not valid, the Precision value must not be null " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:232 +#: ./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 +msgid "Calendar data" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:294 msgid "Resource cannot be null" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:91 +#: ./navalplanner-webapp/src/main/webapp/templates/_list.zul:27 +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:79 +msgid "Delay from beginning (days)" +msgstr "" + +#: ./scripts/../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/_listOrderElementCriterionRequirements.zul:123 +#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:33 +msgid "Total Hours" +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 msgid "Criterion Requirements" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:103 +#: ./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 +msgid "External companies listing" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:182 +msgid "Order from client" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:53 msgid "OrderElement Code" msgstr "" @@ -1758,12 +2721,16 @@ msgstr "" msgid "Label list" msgstr "" +#: ./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 msgid "spread values are not valid, at least one value should be true" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:85 +#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:88 msgid "Create and assign label" msgstr "" @@ -1771,21 +2738,27 @@ msgstr "" msgid "SV" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:959 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:212 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:146 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:396 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:247 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:325 -msgid "Error on showing removing element: " -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:71 +#: ./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/planner/allocation/AdvancedAllocationController.java:882 -msgid "Unknown assignment function: " +#: ./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:483 +#: ./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 +msgid "Filter work reports" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:82 +msgid "Our company login" msgstr "" #: ./navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21 @@ -1796,38 +2769,49 @@ msgstr "" msgid "Direct imputation" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34 +msgid "PDF" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66 msgid "Price per hour" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206 +#: ./navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75 +msgid "Orders" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:222 msgid "Calendars" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:29 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:39 -msgid "Mandatory" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:264 -msgid "The date cannot be null" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:96 +#: ./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 +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 msgid "Add new row" msgstr "" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:386 +msgid "Error on showing delete confirm" +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/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:521 +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:32 +msgid "order element :" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:526 msgid "Sum of all rows" msgstr "" @@ -1836,19 +2820,40 @@ msgstr "" msgid "Overload" msgstr "" +#: ./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 +msgid "Finish hour" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29 +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:58 +msgid "Assignment log" +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 +msgid "Deadline (days since beggining project)" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:225 +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 msgid "Edit label type" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionModel.java:147 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:134 msgid "" "Last stretch should have one hundred percent for length and amount of work " "percentage" @@ -1860,28 +2865,28 @@ 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 msgid "Active" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:304 +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:317 msgid "criterion type name is already being used" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:46 -msgid "Edit work relationship" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:400 +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/orders/OrderElementTreeController.java:646 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:30 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:500 msgid "Unindent" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:46 +#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:49 msgid "Direct labels" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:34 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:151 msgid "Delete order element" msgstr "" @@ -1889,18 +2894,31 @@ msgstr "" 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 +msgid "Actions" +msgstr "" + #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:56 msgid "Order Scheduling" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:29 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 -msgid "Actions" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:215 +#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44 +msgid "External company" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:94 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:24 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:139 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72 msgid "New order element" msgstr "" @@ -1908,20 +2926,32 @@ msgstr "" msgid "Precision" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:72 +#: ./navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:47 +msgid "Date last advance measurement" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:77 +msgid "Start hour" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75 msgid "Exceptions" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:25 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:163 +msgid "format filters are not valid" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28 msgid "Indirect labels" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:65 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:105 msgid "Scheduling state" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:177 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:280 +#: ./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 "" @@ -1931,10 +2961,30 @@ msgid "" "calendar is derived from this one." msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:149 +#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:87 +msgid "Our company password" +msgstr "" + +#: ./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 +msgid "criterion satisfaction's criterion not specified" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:150 msgid "Create machine" msgstr "" +#: ./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 +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 " @@ -1946,46 +2996,66 @@ msgstr "" msgid "Reload" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:370 +#: ./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 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_'." msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:21 -msgid "Criterion type list" +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25 +msgid "Profiles authorization" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:132 +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:137 msgid "Hours Group" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:899 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:909 msgid "Unallocated name" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:58 -msgid "Add new advance measurement" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:477 +msgid "Move up" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:429 +#: ./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 msgid "Not deletable" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:623 -msgid "Move up" +#: ./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 +msgid "Create quality form" msgstr "" #: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28 -#: ./navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:63 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:55 +#: ./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 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:165 +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 msgid "BCWP" msgstr "" @@ -1994,20 +3064,24 @@ msgstr "" msgid "Not editable" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:180 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:68 +#: ./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 msgid "Scheduling" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:46 -msgid "user roles not specified" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:231 +msgid "Subcontract communication date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:85 +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:106 msgid "Dependencies have priority" msgstr "" +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:43 +msgid "code not specified" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:48 msgid "Confirmation" msgstr "" @@ -2016,11 +3090,15 @@ msgstr "" msgid "Budget At Completion" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:73 +#: ./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 msgid "Assign Label" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:184 +#: ./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 "" @@ -2034,41 +3112,68 @@ msgid "List label types" msgstr "" #: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:22 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:25 +#: ./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 msgid "State" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:70 +#: ./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 msgid "Must start after" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115 -msgid "Add New Description Field" -msgstr "" - #: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:66 +#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:47 msgid "Password" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:811 +#: ./navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:27 +#: ./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 msgid "Confirm change" msgstr "" +#: ./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:166 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:189 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:213 +#: ./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/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:461 +#: ./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 msgid "Exception" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:354 +#: ./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:523 msgid "Edit order" msgstr "" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:147 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:152 +msgid "Send" +msgstr "" + #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:280 msgid "Cannot insert material in general view. Please, select a category" msgstr "" @@ -2077,6 +3182,16 @@ msgstr "" msgid "user" msgstr "" +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:180 +msgid "criterion satisfaction's start date not specified" +msgstr "" + +#: ./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/webapp/resources/worker/_criterions.zul:11 #: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13 msgid "All" @@ -2086,11 +3201,11 @@ msgstr "" 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:79 +#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82 #: ./navalplanner-webapp/src/main/webapp/planner/main.zul:65 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:81 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:185 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:270 msgid "Accept" msgstr "" @@ -2098,29 +3213,37 @@ msgstr "" msgid "Calendars List" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:478 +#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:78 +msgid "Example: {0}" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:451 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:178 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:188 +#: ./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 msgid "Edit Worker" msgstr "" +#: ./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 msgid "Work report lines" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:218 -msgid "Create activation period" -msgstr "" - #: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 msgid "Calculated" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:189 +#: ./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 msgid "Workers List" msgstr "" @@ -2129,6 +3252,14 @@ msgstr "" msgid "Criterion must be not-null" msgstr "" +#: ./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 +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 msgid " The " @@ -2138,6 +3269,16 @@ msgstr "" 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 +msgid "Click on " +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74 msgid "Advance Progress" msgstr "" @@ -2150,31 +3291,30 @@ msgstr "" msgid "Report data" msgstr "" +#: ./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 msgid "External load" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:33 +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:37 msgid "Order elements" msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:288 +#: ./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" msgstr "" -#: ./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:83 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25 -#: ./navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:55 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:68 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:155 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:66 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:26 -msgid "Code" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:161 +msgid "Create order from Template" msgstr "" #: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:8 @@ -2182,6 +3322,30 @@ msgstr "" msgid "Filters" 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:73 +#: ./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 +msgid "Code" +msgstr "" + #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:289 msgid "Materials saved" msgstr "" @@ -2190,25 +3354,40 @@ msgstr "" msgid "Add stretch" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:194 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:190 +#: ./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 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:537 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:978 +#: ./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 msgid "Start date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:135 +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:138 msgid "Update exception" msgstr "" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:167 +msgid "Operation cannot be done" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:118 +msgid "Budget" +msgstr "" + #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:320 msgid "Already exists other criterion with the same name" msgstr "" @@ -2217,29 +3396,48 @@ msgstr "" msgid "Unit name" msgstr "" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:197 +msgid "Could open generated PDF" +msgstr "" + #: ./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 +msgid "Profile name" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:103 msgid "Disable Delete" msgstr "" +#: ./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/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:98 +msgid "Filter type" +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:466 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:468 msgid "Normal" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:34 -#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:33 +#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35 msgid "Details" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:226 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:287 msgid "Date cannot be null" msgstr "" @@ -2248,89 +3446,128 @@ 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 +msgid "Advance type" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:229 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:166 +msgid "Error: {0}" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:125 +msgid "Company saved" +msgstr "" + +#: ./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 msgid "Do you want to delete "{0}"?" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165 -msgid "Parent" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:203 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:243 -#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 -msgid "Load" -msgstr "" - #: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27 msgid "New criterion" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197 -msgid "Work report list" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:207 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:298 +#: ./navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48 +msgid "Load" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168 +msgid "Parent" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:653 +#: ./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 +msgid "Description" msgstr "" #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:112 msgid "Type of work hours saved" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:60 -#: ./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:84 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:79 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:43 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:34 -msgid "Description" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:212 +msgid "Work report list" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:187 -msgid "Apply" +#: ./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 msgid "Not found converter for {0}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:82 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:86 msgid "start in fixed date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:108 -msgid "Descripiton Fields" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:207 +msgid "Go to advanced Allocation" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:446 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:258 +msgid "Material assignments" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:459 msgid "already exists an allocation for criteria {0}" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:906 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:916 msgid "Text field" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:44 -#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:69 -msgid "Work relationships" +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:100 +msgid "code is already being used" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:409 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:408 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 msgid "User" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:68 +msgid "Interacts with applications" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:45 msgid "Multiple values per resource" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:198 +#: ./navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32 +msgid "Hours:" +msgstr "" + +#: ./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 msgid "Create new work week" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:102 -msgid "Split" +#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:21 +msgid "Work report lines listing" msgstr "" #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:136 @@ -2341,7 +3578,7 @@ msgstr "" msgid "Work record" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:202 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:284 msgid "Select the calendar" msgstr "" @@ -2349,20 +3586,30 @@ msgstr "" msgid "Criterion saved" msgstr "" +#: ./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:23 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:59 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:23 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:27 +#: ./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/workreports/WorkReportCRUDController.java:311 -msgid "Hours cannot be null" +#: ./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 +msgid "Print" msgstr "" #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:153 @@ -2370,44 +3617,66 @@ msgstr "" msgid "{0} not found type for criterion " msgstr "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:338 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:374 +msgid "Hours cannot be null" +msgstr "" + +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:358 msgid "resource type does not allow enabled criteria" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:566 -msgid "Function" -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/worker/_edition.zul:70 #: ./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:63 +#: ./navalplanner-webapp/src/main/webapp/common/configuration.zul:94 +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:116 #: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:34 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:81 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:188 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:212 -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:127 +#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84 +#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:272 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:294 +#: ./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 msgid "Cancel" msgstr "" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:575 +msgid "Function" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:31 msgid "Unschedule" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:69 +#: ./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:156 +msgid "Subcontracted task sent successfully" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72 msgid "Accumulated hours chart" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:191 +#: ./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 msgid "Machines List" msgstr "" @@ -2415,27 +3684,45 @@ msgstr "" 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 +msgid "Format" +msgstr "" + #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:573 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:360 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:35 +#: ./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:416 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:705 +#: ./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:41 +#: ./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/worker.zul:48 +#: ./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:34 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:51 +#: ./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 "" @@ -2448,64 +3735,96 @@ msgstr "" msgid "Init date" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:69 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:31 +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:84 msgid "Responsible" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:156 -msgid "By default" +#: ./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/orders/_listOrderElementMaterials.zul:70 msgid "Units" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:159 +msgid "By default" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:39 msgid "Create Calendar" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionModel.java:138 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:125 msgid "At least one stretch is needed" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskCommand.java:74 +#: ./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 +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 +msgid "New Description" +msgstr "" + +#: ./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:143 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:158 msgid "" "CriterionType is not valid, the criterionType overlap other " "criterionSatisfaction whith same criterionType" msgstr "" +#: ./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 +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 msgid "Cost category saved" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:170 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:213 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:236 -msgid "" -"End date is not valid, the new end date must be greater than the start date" +#: ./navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27 +msgid "name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:137 +#: ./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:85 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:72 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:158 +#: ./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 +msgid "Communication date" +msgstr "" + #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:114 msgid "{0} (max: {1})" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:422 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:435 msgid "{0} already assigned to resource allocation list" msgstr "" @@ -2513,32 +3832,47 @@ msgstr "" msgid "Log" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:319 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:382 msgid "The type of hours cannot be null." msgstr "" +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:45 +msgid "Authorizations" +msgstr "" + #: ./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 +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:28 +#: ./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/orders/_listOrderElementCriterionRequirements.zul:39 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:124 +#: ./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:119 +#: ./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:38 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:176 +#: ./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:92 +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:97 msgid "Total Hours OrderElement" msgstr "" @@ -2546,12 +3880,12 @@ msgstr "" msgid "Associated Criteria" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49 -msgid "Generic" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:848 +msgid "Value is not valid, the Precision value must be exact " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:847 -msgid "Value is not valid, the Precision value must be exact " +#: ./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 @@ -2562,75 +3896,111 @@ msgstr "" msgid "P" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:518 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:959 +#: ./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 "" -#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:93 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:251 +msgid " in the specified directory." +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:107 +msgid "Order does not exist" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:64 +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" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:31 -msgid "Add criterion requirement" -msgstr "" - -#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 -msgid "Default max value" -msgstr "" - #: ./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/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:344 -msgid "Calculate End Date" +#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 +msgid "Default max value" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:114 +#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36 +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 +msgid "Working progress per task" +msgstr "" + +#: ./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 +msgid "Manage external companies" +msgstr "" + +#: ./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/common/CustomMenuController.java:211 +#: ./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 msgid "Manage types of work hours" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:106 +msgid "Add profile" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19 -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:22 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:38 +#: ./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 msgid "Criterion name" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:143 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:115 -msgid "The following errors were found: " -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54 -msgid "Actual Cost Work Performed" -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/orders/OrderElementTreeController.java:459 +#: ./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 +msgid "Task name" +msgstr "" + +#: ./scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:116 +msgid "cost assignment's resource not specified" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:294 msgid "" "Value is not valid.\n" " Code cannot contain chars like '_' \n" " and should not be empty" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:118 -msgid "Task information" +#: ./scripts/../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 msgid "Unassigned" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:139 +msgid "Task information" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100 msgid "Add new criterion requirement" msgstr "" @@ -2639,52 +4009,58 @@ msgstr "" 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 +msgid "Must start after (days since beginning project)" +msgstr "" + #: ./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/resources/worker/worker.zul:51 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:53 -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:76 +#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:54 +#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:82 msgid "Add" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/materials/materials.zul:87 +#: ./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/webapp/materials/materials.zul:55 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:43 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:123 -msgid "Unselect" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:204 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:244 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:208 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:299 msgid "Earned value" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:415 -msgid "Error on showing delete materialAssignment: " +#: ./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/webapp/orders/_edition.zul:64 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:33 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:71 +#: ./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 msgid "Deadline" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:493 -msgid "You should select the type of exception" -msgstr "" - #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:213 msgid "Advance measurements" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:213 +#: ./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 msgid "Amount work percentage should be between 0 and 100" msgstr "" @@ -2696,30 +4072,33 @@ msgstr "" msgid "VAC" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:30 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:51 -msgid "Label type" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:177 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:190 -msgid "Advanced Allocation" -msgstr "" - -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:448 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:461 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:578 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:591 msgid "{0} not supported yet" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 -msgid "Alpha" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:178 +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 +msgid "Label type" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/templates/templates.zul:53 +msgid "Template Tree" msgstr "" #: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52 msgid "New entry" msgstr "" +#: ./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 msgid "Resources Load" msgstr "" @@ -2728,46 +4107,57 @@ msgstr "" msgid "Overload due to current order" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:91 -msgid "Changes have been canceled" -msgstr "" - #: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:45 msgid "Overall Resources Load" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:147 -msgid "Recommended Allocation" +#: ./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:211 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:225 +#: ./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 msgid "Machine saved" msgstr "" +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:168 +msgid "Recommended Allocation" +msgstr "" + #: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21 msgid "Advance type list" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:75 +#: ./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:543 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:560 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65 -#: ./navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:101 -#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:162 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:125 -#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:67 +#: ./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:120 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:182 +#: ./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:110 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:124 -#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:155 +#: ./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 +msgid "date not specified." +msgstr "" + +#: ./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 msgid "The name of the criterion is empty." msgstr "" @@ -2776,11 +4166,12 @@ msgstr "" msgid "New label" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:305 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:319 +#: ./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 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 msgid "Max value" msgstr "" @@ -2795,29 +4186,29 @@ msgstr "" msgid "The name is not valid, the name must not be null " msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:111 +#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:240 +msgid "Subcontract price" +msgstr "" + +#: ./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 msgid "Spread" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132 -msgid "Assignment Label Types" +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:210 +msgid "Edit virtual worker groups" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:224 #: ./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:332 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:490 msgid "Removed {0}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:40 -msgid "Help on authentication (opens a new window)" -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 @@ -2825,28 +4216,49 @@ msgstr "" msgid "Assigned criteria" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:854 +#: ./navalplanner-webapp/src/main/webapp/common/layout/login.zul:40 +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 msgid "The length must be greater than 0, and not null." 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 +msgid "Role name" +msgstr "" + #: ./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:456 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:461 msgid "Could not save new calendar" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:296 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:336 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:332 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:423 msgid "h" 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 msgid "Couldn't find criterion {0}" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:92 +#: ./navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95 msgid "Create & Assign" msgstr "" @@ -2854,79 +4266,127 @@ msgstr "" msgid "Add Milestone" msgstr "" -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:194 +#: ./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" +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 msgid "Confirm" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:54 -#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35 +#: ./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:43 -#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:70 +#: ./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 msgid "Create" msgstr "" -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:73 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1620 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1626 +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 +msgid "Permissions" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31 +msgid "Print layout" +msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/users/_editUser.zul:23 +msgid "Edit User" +msgstr "" + +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:98 +msgid "Filter pattern" +msgstr "" + +#: ./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:202 +#: ./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:872 +#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:873 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:939 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:951 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:434 +#: ./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:139 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:159 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:223 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:388 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:544 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:224 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:410 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:910 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:675 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:683 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:893 -#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1106 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:41 -#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:47 +#: ./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:528 +#: ./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:721 +#: ./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:63 +#: ./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:102 +#: ./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/orders/_listOrderElementCriterionRequirements.zul:73 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:181 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:99 +#: ./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/_list.zul:58 -#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:63 +#: ./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 msgid "Delete" msgstr "" + +#: ./navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21 +msgid "Profiles listing" +msgstr ""