diff --git a/ganttzk/src/main/resources/i18n/es.po b/ganttzk/src/main/resources/i18n/es.po
index c7b895e41..5f0bde914 100644
--- a/ganttzk/src/main/resources/i18n/es.po
+++ b/ganttzk/src/main/resources/i18n/es.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 19:27+0100\n"
-"PO-Revision-Date: 2010-03-02 14:13+0100\n"
+"POT-Creation-Date: 2010-05-17 02:07+0200\n"
+"PO-Revision-Date: 2010-05-17 02:15+0200\n"
 "Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
 "Language-Team: Spanish <>\n"
 "MIME-Version: 1.0\n"
@@ -21,18 +21,103 @@ msgstr ""
 msgid "Erase"
 msgstr "Borrar"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:106
-msgid "0% - 100%"
-msgstr "0% - 100%"
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:303
+#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:297
 msgid "Add Dependency"
 msgstr "Añadir dependencia"
 
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Worker"
+msgstr "Trabajador"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
+msgid "Start"
+msgstr "Inicio"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:85
+msgid "by criteria"
+msgstr "por criterios"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Order"
+msgstr "Pedido"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:214
+msgid "Set End-End"
+msgstr "Asignar Fin-Fin"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Task"
+msgstr "Tarea"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:84
+msgid "by resources"
+msgstr "por recursos"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64
+msgid "Criterion"
+msgstr "Criterio"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:17
+msgid "Print"
+msgstr "Imprimir"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71
+msgid "Week"
+msgstr "Semana"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:404
+msgid "filtering by name"
+msgstr "filtrando por nombre"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:108
+msgid "See scheduling"
+msgstr "Ver planificación"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29
+msgid "End"
+msgstr "Fin"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:221
+msgid "changing zoom"
+msgstr "cambiando zoom"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45
+msgid "Quarter"
+msgstr "Cuarto"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "None"
+msgstr "Ninguno"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41
+msgid "Flatten/Unflatten tree"
+msgstr "Aplanar/expandir árbol"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43
+msgid "Filter"
+msgstr "Filtro"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:49
+msgid "Name filter"
+msgstr "Filtro por nombres"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:27
+msgid "Name"
+msgstr "Nombre"
+
 #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
 msgid "Expand/Collapse all"
 msgstr "Expandir/plegar todo"
 
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:135
+msgid "showing criteria"
+msgstr "mostrando criterios"
+
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32
 msgid "Year"
 msgstr "Año"
@@ -45,31 +130,18 @@ msgstr "Mes"
 msgid "Show/Hide resources"
 msgstr "Mostrar/ocultar recursos"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21
-msgid "Zoom"
-msgstr "Zoom"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:206
 msgid "Set End-Start"
 msgstr "Asignar Fin-Inicio"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:214
-msgid "Set End-End"
-msgstr "Asignar Fin-Fin"
-
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:232
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:245
 msgid "decreasing zoom"
 msgstr "reduciendo zoom"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:443
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:479
 msgid "Hide critical path"
 msgstr "Ocultar camino crítico"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:116
-msgid "+ 100%"
-msgstr "+ 100%"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:84
 msgid "Day"
 msgstr "Día"
@@ -78,52 +150,57 @@ msgstr "Día"
 msgid "Show/Hide Critical path"
 msgstr "Mostrar/ocultar camino crítico"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:111
-msgid "100%"
-msgstr "100%"
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:132
+msgid "showing resources"
+msgstr "mostrando recursos"
 
 #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:31
 msgid "Show/Hide labels"
 msgstr "Mostrar/ocultar etiquetas"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:17
-msgid "Print"
-msgstr "Imprimir"
-
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:101
-msgid "Assignation percentage"
-msgstr "Porcentaje asignado"
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90
+msgid "Graphics"
+msgstr "Gráficas"
 
 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:210
 msgid "Set Start-Start"
 msgstr "Definir Inicio-Inicio"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:71
-msgid "Week"
-msgstr "Semana"
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:142
+msgid "See resource allocation"
+msgstr "Ver asignación de recursos"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:215
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:228
 msgid "increasing zoom"
 msgstr "aumentando zoom"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:221
-msgid "changing zoom"
-msgstr "cambiando zoom"
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:378
+msgid "Show all elements"
+msgstr "Mostrar todos los elementos"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:45
-msgid "Quarter"
-msgstr "Cuarto"
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:377
+msgid "All"
+msgstr "Todos"
 
 #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:14
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:438
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:474
 msgid "Show critical path"
 msgstr "Mostrar camino crítico"
 
-#~ msgid "Filter"
-#~ msgstr "Filtro"
+#~ msgid "0% - 100%"
+#~ msgstr "0% - 100%"
+
+#~ msgid "+ 100%"
+#~ msgstr "+ 100%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "Assignation percentage"
+#~ msgstr "Porcentaje asignado"
 
 #~ msgid "Critical path"
 #~ msgstr "Camino crítico"
diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po
index b460945c4..0519a5ef5 100644
--- a/navalplanner-webapp/src/main/resources/i18n/es.po
+++ b/navalplanner-webapp/src/main/resources/i18n/es.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-08 19:27+0100\n"
-"PO-Revision-Date: 2010-03-08 19:41+0100\n"
+"POT-Creation-Date: 2010-05-17 02:07+0200\n"
+"PO-Revision-Date: 2010-05-17 02:10+0200\n"
 "Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
 "Language-Team: Spanish <>\n"
 "MIME-Version: 1.0\n"
@@ -17,24 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:210
-msgid "Work report types"
-msgstr "Tipos de partes de trabajo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:332
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:336
 msgid "The resource cannot be null"
 msgstr "El recurso no puede ser nulo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:236
-msgid "Completed estimated hours"
-msgstr "Horas estimadas completadas"
-
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31
-msgid "Customer"
-msgstr "Cliente"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:381
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:386
 msgid "criterion codes must be unique inside a criterion type"
 msgstr "el código del criterio debe ser único dentro de un tipo de criterio"
 
@@ -42,54 +29,32 @@ msgstr "el código del criterio debe ser único dentro de un tipo de criterio"
 msgid "No authorizations were added because you did not select any."
 msgstr "No se pueden añadir autorizaciones porque no se seleccionó ninguna."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:711
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74
-msgid "Hours type"
-msgstr "Tipo de horas"
-
 #: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:63
 #: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:73
 msgid "en"
 msgstr "es"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:147
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:186
-msgid "criterion type name not specified"
-msgstr "nombre del tipo de criterio no especificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230
-msgid "Manage user accounts"
-msgstr "Administrar cuentas de usuario"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:134
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:130
 msgid "Create exception"
 msgstr "Crear excepción"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:302
-msgid "Up to company view"
-msgstr "Arriba a la vista de la compañía"
-
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45
 msgid "Select report data"
 msgstr "Seleccione fecha del informe"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216
-msgid "Add Exception"
-msgstr "Añadir excepción"
-
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:23
-msgid "Edit profile"
-msgstr "Editar perfil"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:189
-msgid "there exist multiple resource calendars with name {0}"
-msgstr "existen múltiples calendarios de recursos con el nombre {0}"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:347
+msgid "Up to company view"
+msgstr "Arriba a la vista de la compañía"
 
 #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:54
 msgid "Create Virtual Worker"
 msgstr "Crear trabajador virtual"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:715
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:205
+msgid "there exist multiple resource calendars with name {0}"
+msgstr "existen múltiples calendarios de recursos con el nombre {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:765
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:97
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35
@@ -97,32 +62,36 @@ msgstr "Crear trabajador virtual"
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:124
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:148
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41
 #: 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/criterions/_list-V2.zul:27
 #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35
 #: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
 #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:37
 #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:17
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:25
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
-#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:37
+#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:28
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:65
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:91
 #: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:63
-#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:75
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:27
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:82
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:136
 #: 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/_tabPanelNonLimitingResourceAllocation.zul:98
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:189
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:121
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48
@@ -132,20 +101,14 @@ msgstr "Crear trabajador virtual"
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:39
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:80
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:128
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:172
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:218
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:124
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:166
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:211
 #: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27
 msgid "Operations"
 msgstr "Operaciones"
 
-#: 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 "no puede ser vacío"
-
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:71
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:125
 msgid "New order sequence"
 msgstr "Nueva secuencia de pedido"
 
@@ -154,6 +117,2630 @@ msgstr "Nueva secuencia de pedido"
 msgid "Add criterion"
 msgstr "Añadir criterio"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:130
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:498
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:130
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:190
+msgid "There is no type of work hours with this code"
+msgstr "No hay un tipo de horas de trabajo con este código"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:121
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:88
+msgid "Select"
+msgstr "Seleccionar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:334
+msgid "there must be {0} hours instead of {1}"
+msgstr "debe haber {0} horas en lugar de {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:36
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:1
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:88
+msgid "Materials"
+msgstr "Materiales"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21
+msgid "NavalPlan: Virtual workers"
+msgstr "NavalPlan: Trabajadores virtuales"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:108
+msgid "Order view"
+msgstr "Vista de pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:377
+msgid "Reassign"
+msgstr "Reasignar"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:61
+msgid "Description cannot be null or empty"
+msgstr "La descripción no puede ser nula o vacía"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:92
+msgid "Percentage of consumed budget hours / hours consumed"
+msgstr "Porcentaje de horas de presupuesto consumidas / horas consumidas"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:75
+msgid "login name not specified"
+msgstr "nombre de usuario no especificado"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27
+msgid "Managing fields and labels"
+msgstr "Administrar campos y etiquetas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:347
+msgid "Please, select a calendar"
+msgstr "Por favor, seleccione un calendario"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165
+msgid "Summary"
+msgstr "Resumen"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
+msgid "Quality Forms"
+msgstr "Formularios de calidad"
+
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
+#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161
+msgid "Predefined"
+msgstr "Predefinido"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:122
+msgid "Order sequences"
+msgstr "Secuencias de pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:236
+msgid "Reports"
+msgstr "Informes"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:80
+msgid "Criterion requirements"
+msgstr "Criterios requeridos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:88
+msgid "START_NOT_EARLIER_THAN"
+msgstr "COMENZAR_NO_ANTES_DE"
+
+#: 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 ""
+"El calendario por defecto no puede borrarse. Por favor, cambie antes el "
+"calendario por defecto en la ventana de configuración."
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65
+msgid "Dedication chart"
+msgstr "Gráfico de dedicación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:606
+msgid "Not the same hours group, impossible to update"
+msgstr "No es el mismo grupo de horas, imposible actualizar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:322
+msgid "Remove limiting resource element"
+msgstr "Borrar elemento de recurso limitante"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:20
+msgid "Active period from"
+msgstr "Período activo desde"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:51
+msgid "hours type :"
+msgstr "tipo de horas :"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:223
+msgid "Unassign"
+msgstr "Desasignar"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:67
+msgid "Quality form items list"
+msgstr "Lista de elementos del formulario de calidad"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
+msgid "Name/Code"
+msgstr "Nombre/Código"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:744
+msgid "Create order"
+msgstr "Crear pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:196
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:228
+msgid ""
+"End date is not valid, the new end date must be later the current end date"
+msgstr ""
+"La fecha de fin no es válida, la nueva fecha de fin debe ser posterior a la "
+"actual"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63
+msgid "Select print visualization options"
+msgstr "Seleccione las opciones de impresión de la visualización"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:742
+msgid "Hour start"
+msgstr "Hora de inicio"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:31
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:52
+msgid "Start"
+msgstr "Comienzo"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118
+msgid "cost assignment's category not specified"
+msgstr "categoría de la asignación de coste no especificada"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:71
+msgid "Delete Template element"
+msgstr "Borrar elemento de plantilla"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:65
+msgid "User with login name '{0}': not found"
+msgstr "Usuario con login '{0}': no encontrado"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36
+msgid "Resources capability"
+msgstr "Capacidad de recursos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:153
+msgid "The first stretch must be after the first day for doing interpolation"
+msgstr ""
+"El primer tramo debe estar después del primer día para hacer interpolación"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
+msgid "Filter quality forms by :"
+msgstr "Filtrar formularios de calidad por :"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:96
+msgid "changing perspective"
+msgstr "cambio de perspectiva"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:121
+msgid ""
+"Could not add those authorizations to profile {0} because they were already "
+"present."
+msgstr ""
+"No se pudieron añadir esas autorizaciones al perfil {0} porque ya estaban "
+"presentes."
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:57
+msgid "Default calendar"
+msgstr "Calendario por defecto"
+
+#: navalplanner-webapp/src/main/webapp/users/profiles.zul:22
+msgid "NavalPlan: Profiles"
+msgstr "NavalPlan: Perfiles"
+
+#: navalplanner-webapp/src/main/webapp/common/error.zul:20
+msgid "NavalPlan: Error"
+msgstr "NavalPlan: Error"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:243
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41
+msgid "Materials needs at date"
+msgstr "Necesidades de materiales en fecha"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:299
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:566
+msgid "Indent"
+msgstr "Indentar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:50
+msgid "New template"
+msgstr "Plantilla nueva"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127
+msgid "Base calendar \"{0}\" saved"
+msgstr "Calendario base \"{0}\" guardado"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:29
+msgid "Create Order Element"
+msgstr "Crear elemento de pedido"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31
+msgid "Locations"
+msgstr "Ubicaciones"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:90
+msgid "The advanceType cannot be modified"
+msgstr "El advanceType no puede ser modificado"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70
+msgid "New quality form item"
+msgstr "Nuevo elemento del formulario de calidad"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:20
+msgid "Templates list"
+msgstr "Lista de plantillas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:143
+msgid "For interpolation at least two stretches are needed"
+msgstr "Para interpolar se necesitan al menos dos tramos"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:41
+msgid "Login name"
+msgstr "Nombre de usuario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:718
+msgid "Order Code"
+msgstr "Código de pedido"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:14
+msgid "Current"
+msgstr "Actual"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:76
+msgid "Dependencies"
+msgstr "Dependencias"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:196
+msgid "missing code in a calendar exception"
+msgstr "falta código en una excepción de calendario"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1023
+msgid ""
+"there exist criterion satisfactions referring to criterion types not "
+"applicable to this resource"
+msgstr ""
+"existen criterios satisfechos que pertenecen a tipos de criterio no "
+"aplicables a este recurso"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47
+msgid "Criterion Requirement"
+msgstr "Criterio requerido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54
+msgid "Company Scheduling"
+msgstr "Planificación de la compañía"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1151
+msgid ""
+"This advance can not be changed or removed, because it has got consolidated "
+"advances. It is needed removing the consolidation on all its advances."
+msgstr ""
+"Este avance no puede ser cambiado o borrado, porque tiene avances "
+"consolidados. Se requiere borrar la consolidación de todos sus avances."
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22
+msgid "Create new version"
+msgstr "Crear versión nueva"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:190
+msgid "Derived"
+msgstr "Derivado"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:285
+msgid "a disabled resource has enabled subresources"
+msgstr "un recurso deshabilitado tiene subrecursos habilitados"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28
+msgid "Add new advance assignment"
+msgstr "Añadir nueva asignación de avance"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51
+msgid "Client"
+msgstr "Cliente"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:491
+msgid ""
+"there are no resources for required criteria: {0}. So the generic allocation "
+"can't be added"
+msgstr ""
+"no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede "
+"añadir la asignación genérica"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:393
+msgid "work report has not any description value with this field name"
+msgstr ""
+"El parte de trabajo no tiene ningún valor de descripción con ese nombre de "
+"campo"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:146
+msgid "material category name has to be unique. It is already used"
+msgstr "el nombre de la categoría de materiales debe ser único. Ya está en uso"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:115
+msgid "Imputed hours"
+msgstr "Horas imputadas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:412
+msgid "Confirm deleting this hour cost. Are you sure?"
+msgstr "Confirmar el borrado de este coste por hora. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58
+msgid "Delete Milestone"
+msgstr "Borrar hito"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:395
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:637
+msgid "The order has no scheduled elements"
+msgstr "El pedido no tiene elementos planificados"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47
+msgid "Non-assigned locations"
+msgstr "Ubicaciones no asignadas"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
+msgid "Application URI"
+msgstr "URI de la aplicación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:405
+msgid ""
+"The {0} is not valid, criterionType overlaps with other "
+"criterionSatisfaction from the same criterionType"
+msgstr ""
+"{0} no es válido, criterionType se solapa con otro criterionSatisfaction del "
+"mismo criterionType"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1278
+msgid "Configure"
+msgstr "Configurar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:241
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41
+msgid "Scheduling progress per order"
+msgstr "Progreso de la planificación por pedido"
+
+#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:21
+msgid "Unit type list"
+msgstr "Lista de tipos de unidades"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:56
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:32
+msgid "First name"
+msgstr "Nombre"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:225
+msgid "Could not execute print command"
+msgstr "No se pudo ejecutar el comando de impresión"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:108
+msgid "Complementary text fields"
+msgstr "Campos de texto complementario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:190
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:113
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:282
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:592
+msgid "Confirm deleting {0}. Are you sure?"
+msgstr "Confirmar el borrado de {0}. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:81
+msgid "External code"
+msgstr "Código externo"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:46
+msgid "View"
+msgstr "Ver"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:513
+msgid "resources per day must be not empty and bigger than zero"
+msgstr "los recursos por día deben ser no vacíos y mayores que cero"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:98
+msgid "Up"
+msgstr "Arriba"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:23
+msgid "Edit type of work hour"
+msgstr "Editar tipo de horas de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:164
+msgid ""
+"CriterionType is not valid, it overlaps other criterionSatisfaction with the "
+"same criterionType"
+msgstr ""
+"CriterionType no válido, otro criterionSatisfaction se solapa con el mismo "
+"criterionType"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:85
+msgid "Types of work hours"
+msgstr "Tipos de horas de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58
+msgid "EAC"
+msgstr "EAC"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21
+msgid "Virtual workers list"
+msgstr "Lista de trabajadores virtuales"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:133
+msgid "Some stretch has higher or equal values than the previous stretch"
+msgstr "Algún tramo tiene valores mayores o iguales que el tramo anterior"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:110
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:121
+msgid "Total hours order element"
+msgstr "Total de horas del elemento de pedido"
+
+#: 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/_tabPanelSubcontract.zul:39
+msgid "End date"
+msgstr "Fecha de fin"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:227
+msgid "missing worker code in the work report"
+msgstr "falta código de trabajador en un parte de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140
+msgid ""
+"Value is not valid, the default max value must be greater than the precision "
+"value "
+msgstr ""
+"El valor no es válido, el valor máximo por defecto debe ser mayor que el "
+"valor de precisión"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87
+msgid "profile name is already being used by another profile"
+msgstr "el nombre del perfil ya está siendo usado por otro perfil"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:63
+msgid "E-mail"
+msgstr "Correo electrónico"
+
+#: 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 "Por favor, seleccione un pedido"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21
+msgid "List quality forms"
+msgstr "Lista de formularios de calidad"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26
+msgid "User data"
+msgstr "Datos del usuario"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:118
+msgid "Resource / Criteria"
+msgstr "Recursos / Criterios"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:767
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:41
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:46
+msgid "Criteria"
+msgstr "Criterios"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46
+msgid "Order Details"
+msgstr "Detalles de pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:77
+msgid "AS_SOON_AS_POSSIBLE"
+msgstr "TAN_PRONTO_COMO_SEA_POSIBLE"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:101
+msgid "Error setting up creation form."
+msgstr "Error preparando el formulario de creación."
+
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43
+msgid "Lines"
+msgstr "Líneas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:44
+msgid "Orders List"
+msgstr "Lista de pedidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189
+msgid "Error on showing warning message removing workReportType: "
+msgstr ""
+"Error al mostrar mensaje de advertencia borrando tipo de parte de trabajo: "
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29
+msgid "Personal data"
+msgstr "Datos personales"
+
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41
+msgid "Save Order"
+msgstr "Guardar pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:210
+msgid "Work reports"
+msgstr "Partes de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92
+msgid "{0} annotation required on {1}"
+msgstr "{0} anotación obligatoria en {1}"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215
+msgid "Add Criterion"
+msgstr "Añadir criterio"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:38
+msgid "Edit virtual resource"
+msgstr "Editar recurso virtual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:651
+msgid "Modified"
+msgstr "Modificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:212
+msgid "Fattened Tree {0}"
+msgstr "Árbol aplanado {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:285
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:69
+msgid "MessagesContainer is needed"
+msgstr "Es necesario un MessagesContainer"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
+msgid "Ending date"
+msgstr "Fecha de fin"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227
+msgid "Manage cost categories"
+msgstr "Administrar categorías de coste"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:135
+msgid "Last value"
+msgstr "Último valor"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:198
+msgid "General resource allocation"
+msgstr "Asignación de recursos general"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65
+msgid "Statistics log"
+msgstr "Histórico de estadísticas"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:43
+msgid "Edit Calendar"
+msgstr "Editar calendario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:215
+msgid "Work report query"
+msgstr "Consulta de partes de trabajo"
+
+#: 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 "No puede ser vacío o nulo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:249
+msgid "filtering"
+msgstr "filtrado"
+
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33
+msgid "Total Budget"
+msgstr "Presupuesto total"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:50
+msgid "Hierarchy"
+msgstr "Jerarquía"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:25
+msgid "Print configuration"
+msgstr "Imprimir configuración"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:26
+msgid "Overload due to other assignments"
+msgstr "Sobrecarga debido a otras asignaciones"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148
+msgid "Time period saved"
+msgstr "Período de tiempo guardado"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:39
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34
+msgid "Filter work report by :"
+msgstr "Filtrar parte de trabajo por :"
+
+#: 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 "Trabajadores"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:49
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35
+msgid "Order element code"
+msgstr "Código del elemento de pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:94
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:267
+msgid "Advance measurements: "
+msgstr "Medidas de avance: "
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:22
+msgid "NavalPlan: Work report"
+msgstr "NavalPlan: Parte de trabajo"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54
+msgid "Year"
+msgstr "Año"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66
+msgid "profile name not specified"
+msgstr "nombre del perfil no especificado"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:60
+msgid "Date Start"
+msgstr "Fecha de inicio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1030
+msgid "Value is not valid, the current value must be less than max value"
+msgstr ""
+"El valor no es válido, el valor actual debe ser menor que el valor máximo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:54
+msgid "From Chosen"
+msgstr "A partir de elegidos"
+
+#: navalplanner-webapp/src/main/webapp/planner/img/_tabPanelAdvanceConsolidation.zul:32
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelAdvanceConsolidations.zul:43
+#: 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 "Valor"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53
+msgid "Hour costs"
+msgstr "Costes por hora"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52
+msgid "Add role"
+msgstr "Añadir rol"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:489
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:922
+msgid "Exception end date should be greater or equals than start date"
+msgstr ""
+"La fecha de fin de una excepción debe ser mayor o igual que la fecha de "
+"inicio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:679
+msgid "Duplicate advance assignment for order element "
+msgstr "Asignación de avance duplicada para el elemento de pedido "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:402
+msgid ""
+"The {0} can not be assigned to this resource. Its interval overlaps with "
+"other criterion"
+msgstr ""
+"El {0} no se puede asignar a este recurso. Su intervalo se solapa con otro "
+"criterio"
+
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66
+msgid "Work done until ending date:"
+msgstr "Trabajo realizado hasta la fecha de fin:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63
+msgid "Schedule Performance Index"
+msgstr "Índice de rendimiento de la planificación"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26
+msgid "Type data"
+msgstr "Datos del tipo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:500
+msgid "Create virtual resource"
+msgstr "Crear recurso virtual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224
+msgid "Label types"
+msgstr "Tipos de etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:349
+msgid "The order element code cannot be null"
+msgstr "El código del elemento de pedido no puede ser nulo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:746
+msgid "Hour finish"
+msgstr "Hora de fin"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:69
+msgid "Perspectives"
+msgstr "Perspectivas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:239
+msgid "missing code in a subcategory"
+msgstr "falta código en una subcategoría"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:426
+msgid "Confirm deleting this cost category. Are you sure?"
+msgstr "Confirmar el borrado de esta categoría de coste. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:30
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:72
+msgid "Non limiting resource allocation"
+msgstr "Asignación de recursos no limitantes"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:189
+msgid "Error removing element: "
+msgstr "Error al borrar elemento: "
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39
+msgid "Company name"
+msgstr "Nombre de la empresa"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:32
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:73
+msgid "Limiting resource allocation"
+msgstr "Asignación de recursos limitantes"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:842
+msgid "{0}"
+msgstr "{0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:462
+msgid "Split new assignment"
+msgstr "Dividir nueva asignación"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210
+msgid "Expiry date"
+msgstr "Fecha de vencimiento"
+
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:52
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53
+msgid "Pagination"
+msgstr "Paginación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:219
+msgid "should select a advance type"
+msgstr "debe seleccionar un tipo de avance"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:42
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:71
+msgid "Categories"
+msgstr "Categorías"
+
+#: 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 " ir a la salida directamente"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
+msgid "Add new hours group"
+msgstr "Añadir nuevo grupo de horas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:364
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:79
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:222
+msgid "Manage criteria"
+msgstr "Gestionar criterios"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134
+msgid "Updated"
+msgstr "Actualizado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:130
+msgid "No worker selected"
+msgstr "Ningún trabajador seleccionado"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:134
+msgid "Number of digits"
+msgstr "Número de dígitos"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28
+msgid "Total capability"
+msgstr "Capacidad total"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:232
+msgid "Problems connecting with client web service"
+msgstr "Problemas al conectar con el servicio web cliente"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:461
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:643
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:774
+msgid "Advance"
+msgstr "Avance"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:20
+msgid "NavalPlan: User access"
+msgstr "NavalPlan: Acceso de usuarios"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:122
+msgid "Exception Type"
+msgstr "Tipo de excepción"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21
+msgid "NavalPlan: Subcontracted tasks"
+msgstr "NavalPlan: Tareas subcontratadas"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:21
+msgid "NavalPlan: Materials"
+msgstr "NavalPlan: Materiales"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202
+msgid "Advances sent successfully"
+msgstr "Avances enviados con éxito"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:243
+msgid "both {0} of category {1} and {2} of category {3} have the same code"
+msgstr ""
+"{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:655
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:754
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:47
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45
+msgid "Labels"
+msgstr "Etiquetas"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147
+msgid "Total hours"
+msgstr "Total de horas"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:66
+msgid "Filter by task status"
+msgstr "Filtrar por estado de tarea"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:356
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:467
+msgid "Select date:"
+msgstr "Seleccione fecha:"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29
+msgid "Integrated user"
+msgstr "Usuario integrado"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46
+msgid "Value last advance reported"
+msgstr "Valor último avance notificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:482
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:915
+msgid "You should select a end date for the exception"
+msgstr "Debe seleccionar una fecha de fin para la excepción"
+
+#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:33
+msgid "Please try it again."
+msgstr "Por favor, inténtelo de nuevo."
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:51
+msgid "Company code"
+msgstr "Código de la empresa"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109
+msgid "Unknown attribute '{0}' in class {1}"
+msgstr "Atributo desconocido '{0}' en la clase {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:647
+msgid "NON LIMITING RESOURCE"
+msgstr "RECURSO NO LIMITANTE"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96
+msgid "machine name not specified"
+msgstr "nombre de la máquina no especificado"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:77
+msgid "Activation periods"
+msgstr "Períodos de activación"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:23
+msgid "Edit cost category"
+msgstr "Editar categoría de coste"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:368
+msgid "Passed"
+msgstr "Pasado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174
+msgid "already assigned"
+msgstr "ya asignado"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:123
+msgid "Calendar"
+msgstr "Calendario"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67
+msgid "Read"
+msgstr "Leer"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:81
+msgid "Resources"
+msgstr "Recursos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:243
+msgid "CriterionType and its criteria saved"
+msgstr "CriterionType y sus criterios guardados"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:22
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:9
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:8
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:188
+msgid "to"
+msgstr "a"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43
+#: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:43
+msgid "<<"
+msgstr "<<"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:106
+msgid "worker's first name not specified"
+msgstr "nombre del trabajador no especificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266
+msgid "date not specified"
+msgstr "fecha no especificada"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1154
+msgid ""
+"This advance measurement can not be changed or removed, because it is "
+"consolidated. It is needed removing its consolidation."
+msgstr ""
+"Esta medida de avance no se puede cambiar o borrar, porque está consolidada. "
+"Se requiere borrar su consolidación."
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:93
+msgid "Select type :"
+msgstr "Seleccione tipo :"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:43
+msgid "Advances"
+msgstr "Avances"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73
+msgid "Shrink to fit page width"
+msgstr "Reducir para ajustar al ancho de página"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66
+msgid "Last name"
+msgstr "Apellidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:252
+msgid "cost category name not specified"
+msgstr "nombre de la categoría de coste no especificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:548
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:321
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:386
+msgid "Remove"
+msgstr "Borrar"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21
+msgid "NavalPlan: Templates"
+msgstr "NavalPlan: Plantillas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62
+msgid "SPI"
+msgstr "SPI"
+
+#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47
+msgid "Name name"
+msgstr "Nombre nombre"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/costCategory.zul:22
+msgid "NavalPlan: Cost categories"
+msgstr "NavalPlan: Categorías de coste"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163
+msgid "Edit quality form"
+msgstr "Editar formulario de calidad"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1249
+msgid "Interpolation"
+msgstr "Interpolación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:310
+msgid "{0} must not be before {1}"
+msgstr "{0} no debe estar antes de {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:220
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:205
+msgid ""
+"Start date is not valid, the new start date must be previous the current "
+"start date"
+msgstr ""
+"La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior "
+"a la fecha de inicio actual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:377
+msgid "the code must be not null or not empty"
+msgstr "el código no puede ser nulo o vacío"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1211
+msgid "Stretches list"
+msgstr "Lista de tramos"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21
+msgid "NavalPlan: QualityForms"
+msgstr "NavalPlan: Formularios de calidad"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:44
+msgid "Zoom"
+msgstr "Zoom"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:437
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:210
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:84
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:36
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:91
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:39
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:123
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:104
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:146
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:126
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:38
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:124
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80
+msgid "Save"
+msgstr "Guardar"
+
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21
+msgid "NavalPlan: AdvanceTypes"
+msgstr "NavalPlan: AdvanceTypes"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:87
+msgid "Material categories"
+msgstr "Categorías de materiales"
+
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
+msgid "Edit advance type data"
+msgstr "Editar datos del tipo de avance"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131
+msgid "Pending update"
+msgstr "Actualización pendiente"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59
+msgid "End date:"
+msgstr "Fecha de fin:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:159
+msgid "Criterion previously selected"
+msgstr "Criterio seleccionado previamente"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1044
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1093
+msgid ""
+"Value is not valid, the value must be greater than the value of the previous "
+"advances."
+msgstr ""
+"El valor no es válido, el valor debe ser mayor que el valor de los avances "
+"anteriores."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296
+msgid "Order Element code cannot be null"
+msgstr "El código del elemento de pedido no puede ser nulo"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:62
+msgid "Users authorization"
+msgstr "Autorización de usuarios"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:242
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41
+msgid "Task scheduling status for an order"
+msgstr "Estado de las tareas de planificacion de un pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:170
+msgid "Problems connecting with subcontractor web service"
+msgstr "Problemas conectando con el servicio web subcontratista"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38
+msgid "Assigned load"
+msgstr "Carga asignada"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:106
+msgid "End Date"
+msgstr "Fecha de fin"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68
+msgid "Filter by workers"
+msgstr "Filtrar por trabajadores"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:97
+msgid "Resources Per Day"
+msgstr "Recursos por día"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:94
+msgid ""
+"Estimated end date for the task (press enter in textbox to open calendar "
+"popup or type in date directly)"
+msgstr ""
+"Fecha de fin estimada para la tarea (presione enter en el cuadro de texto "
+"para abrir el calendario o escriba la fecha directamente)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:201
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167
+msgid "ResourceType must be not-null"
+msgstr "ResourceType no debe ser nulo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:240
+msgid "Expand/Collapse all"
+msgstr "Expandir/Plegar todo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:460
+msgid "Name: {0}"
+msgstr "Nombre: {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:502
+msgid "Move down"
+msgstr "Mover abajo"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26
+msgid "Report structure"
+msgstr "Estructura del parte"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:84
+msgid "password not specified"
+msgstr "contraseña no especificada"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56
+msgid "Yes"
+msgstr "Sí"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:116
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:57
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39
+msgid "General data"
+msgstr "Datos generales"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57
+msgid "BAC"
+msgstr "BAC"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:26
+msgid "Apply filtering to machines satisfying required criteria"
+msgstr ""
+"Aplicar filtrado a las máquinas que satisfacen los criterios requeridos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:380
+msgid "Calculate Number of Hours"
+msgstr "Calcular número de horas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:345
+#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:108
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80
+msgid "Assign"
+msgstr "Asignar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:129
+msgid "missing code in a criterion"
+msgstr "falta código en un criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:657
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:951
+#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39
+msgid "Create Template"
+msgstr "Crear plantilla"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168
+msgid "Advance type saved"
+msgstr "Tipo de avance guardado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:559
+msgid ""
+"IMPORTANT: Don't forget to communicate to subcontractor that his contract "
+"has been cancelled"
+msgstr ""
+"IMPORTANTE: No olvidar comunicar al subcontratista que su contrato ha sido "
+"cancelado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57
+msgid "Schedule Variance"
+msgstr "Desviación en planificación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:414
+msgid "Service does not manage resource of type: {0}"
+msgstr "El servicio no gestiona recursos del tipo: {0}"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39
+msgid "Edit worker"
+msgstr "Editar trabajador"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1164
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:491
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:529
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:560
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:57
+msgid "Warning"
+msgstr "Advertencia"
+
+#: 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 "Seleccionar el calendario padre"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67
+msgid "Hours of day"
+msgstr "Horas del día"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297
+msgid "criterion satisfaction with end date less than start date"
+msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1226
+msgid "Stretches"
+msgstr "Tramos"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47
+msgid "Show"
+msgstr "Mostrar"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:49
+msgid "Duration (days)"
+msgstr "Duración (días)"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:30
+msgid "Assignment Type"
+msgstr "Tipo de asignación"
+
+#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/index.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:21
+msgid "NavalPlan: Scheduling"
+msgstr "NavalPlan: planificación"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:28
+msgid "Back to log in"
+msgstr "Volver a iniciar sesión"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:479
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:481
+msgid "Error on splitting"
+msgstr "Error al dividir"
+
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:20
+msgid "NavalPlan: Unit types"
+msgstr "NavalPlan: Tipos de unidades"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:45
+msgid "Node without children"
+msgstr "Nodo sin hijos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:134
+msgid "Profile saved"
+msgstr "Perfil guardado"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:71
+msgid "Task properties"
+msgstr "Propiedades de la tarea"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:33
+msgid "Surname"
+msgstr "Apellidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1163
+msgid "You need to select some function to configure"
+msgstr "Necesita seleccionar alguna función para configurar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:694
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:155
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48
+#: navalplanner-webapp/src/main/webapp/planner/img/_tabPanelAdvanceConsolidation.zul:33
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelAdvanceConsolidations.zul:44
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:8
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
+msgid "Date"
+msgstr "Fecha"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:362
+msgid "the name must be not null or not empty"
+msgstr "el nombre no puede ser nulo o vacío"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21
+msgid "NavalPlan: Resources"
+msgstr "NavalPlan: Recursos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:490
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:528
+msgid "Assigned resources for this task will be deleted. Are you sure?"
+msgstr "Los recursos asignados para esta tarea serán borrados. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:64
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:74
+msgid "Order lines imputation"
+msgstr "Imputación de líneas de pedido"
+
+#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:26
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:23
+msgid "Advance assignments"
+msgstr "Asignaciones de avances"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:336
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:339
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:317
+msgid "The criterion and its type cannot be null"
+msgstr "El criterio y su tipo no pueden ser nulos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:190
+msgid "The code is not valid. There is another unit type with the same code"
+msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:315
+msgid "( max: {0} )"
+msgstr "( máx: {0} )"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:200
+msgid "Error on removing element: "
+msgstr "Error al borrar elemento: "
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63
+msgid "Cannot calculate charts for current data"
+msgstr "No se pueden calcular gráficos para los datos actuales"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57
+msgid "Found workers"
+msgstr "Trabajadores encontrados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:464
+msgid "The cost category had already been removed."
+msgstr "La categoría de coste ya había sido borrada."
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:27
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48
+msgid "Work description"
+msgstr "Descripción del trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:504
+msgid "Order element {0} : Order is incompatible type with {1}"
+msgstr "Elemento de pedido {0} : El pedido tiene un tipo incompatible con {1}"
+
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:38
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:43
+msgid "Split assignment"
+msgstr "Dividir asignación"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104
+msgid "Down"
+msgstr "Abajo"
+
+#: 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 "enlace directo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:928
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:75
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47
+msgid "Label"
+msgstr "Etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:240
+msgid "Order costs per resource"
+msgstr "Costes de pedido por recurso"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:605
+msgid "Value is not valid, taking into account the current list of HoursGroup"
+msgstr ""
+"El valor no es válido, teniendo en cuenta la lista actual de grupos de horas"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:72
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:48
+msgid "Association with roles"
+msgstr "Asociación con roles"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:351
+msgid "missing type of work hours in a work report line"
+msgstr "falta el tipo de horas en una línea del parte de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230
+#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:29
+msgid "Quality forms"
+msgstr "Formularios de calidad"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:143
+msgid "Hours group"
+msgstr "Grupo de horas"
+
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:29
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:92
+msgid "Days from Beginning to Deadline"
+msgstr "Días desde el comienzo hasta la fecha límite"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59
+msgid "Estimate At Completion"
+msgstr "Estimación de coste total actual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:196
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:329
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353
+msgid "Delete item. Are you sure?"
+msgstr "Borrar elemento. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:217
+msgid "Edit machine"
+msgstr "Editar máquina"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27
+msgid "Indirect"
+msgstr "Indirecto"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101
+msgid "cost assignment's start date not specified"
+msgstr "fecha de inicio de la asignación de coste no especificada"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48
+#: 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 "Código de pedido"
+
+#: 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 "Formato de salida:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25
+msgid "Direct"
+msgstr "Directo"
+
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55
+msgid "Reference date:"
+msgstr "Fecha de referencia:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:380
+msgid "Limiting resource assignation"
+msgstr "Asignación de recursos limitantes"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:76
+msgid "Work week"
+msgstr "Semana de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:126
+msgid "You will lose the changes. Are you sure?"
+msgstr "Se perderán los cambios. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:162
+msgid "Unit type name cannot be empty"
+msgstr "El nombre del tipo de unidad no puede ser vacío"
+
+#: 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 "Lista de pedidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:208
+msgid "Virtual worker groups"
+msgstr "Grupos de trabajadores virtuales"
+
+#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:87
+msgid "Delay from beginning (days)"
+msgstr "Retraso desde el comienzo (en días)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:289
+msgid "Resource cannot be null"
+msgstr "El recurso no puede ser nulo"
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52
+msgid "Do you want to delete "
+msgstr "¿Quiere borrar "
+
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
+msgid "Total Hours"
+msgstr "Horas totales"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71
+msgid "All orders"
+msgstr "Todos los pedidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:127
+msgid "Confirm cancel"
+msgstr "Confirmar cancelación"
+
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:61
+msgid "Label list"
+msgstr "Lista de etiquetas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1169
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:290
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:147
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:420
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:434
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:260
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:600
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:185
+msgid "Error on showing removing element: "
+msgstr "Error al mostrar el elemento a borrar: "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:83
+msgid "start not earlier than"
+msgstr "empezar no antes de"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:205
+msgid "missing work report code in a work report"
+msgstr "falta código en un parte de trabajo"
+
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
+msgid "Criterion requirement"
+msgstr "Criterios requeridos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:155
+msgid ""
+"Still not saved changes would be lost. Are you sure you want to go to create "
+"a template?"
+msgstr ""
+"Los cambios que no hayan sido guardados se perderán. ¿Está seguro de que "
+"quiere ir a la creación de plantillas?"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34
+msgid "PDF"
+msgstr "PDF"
+
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75
+msgid "Orders"
+msgstr "Pedidos"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:61
+msgid "Type resource assignation"
+msgstr "Asignación de tipo de recursos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:135
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:286
+msgid "Scheduling saved"
+msgstr "Planificación guardada"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:196
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:6
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:57
+msgid "Add new row"
+msgstr "Añadir nueva fila"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:222
+msgid "missing code in the resource calendar"
+msgstr "falta código en un calendario de recursos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138
+msgid "Could not save new criterion"
+msgstr "No se pudo guardar el nuevo criterio"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33
+msgid "Overload"
+msgstr "Sobrecarga"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64
+msgid "Assignment log"
+msgstr "Histórico de asignación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:44
+msgid "CutycaptTimeout thread exception"
+msgstr "Excepción de thread CutycaptTimeout"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46
+msgid "Load due to current order"
+msgstr "Carga debido al pedido actual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:93
+msgid "Deadline (days since beggining project)"
+msgstr "Fecha límite (días desde el inicio del proyecto)"
+
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38
+msgid "Edit unit type data"
+msgstr "Editar datos del tipo de unidad"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:390
+msgid "number of hours is not properly calculated based on clock"
+msgstr "número de horas no calculado correctamente basado en reloj"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:807
+msgid "Value is not valid, the type must be not empty"
+msgstr "El valor no es válido, el tipo no debe ser vacío"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:411
+msgid "criterion type name is already being used"
+msgstr "el nombre de tipo de criterio está siendo usado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:393
+msgid "Could not get order code, please try again later"
+msgstr ""
+"No se pudo obtener código de pedido, por favor inténtelo otra vez luego"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java:46
+msgid "worker"
+msgstr "trabajador"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:102
+msgid "Error setting up creation form for Criterion Type"
+msgstr "Error preparando el formulario de creación para un tipo de criterio"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:6
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44
+msgid "External company"
+msgstr "Empresa externa"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:64
+#: 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 "Acciones"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:145
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72
+msgid "New order element"
+msgstr "Nuevo elemento de pedido"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75
+msgid "Exceptions"
+msgstr "Excepciones"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71
+msgid "Start hour"
+msgstr "Hora de inicio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:847
+msgid ""
+"You can not remove the order element \"{0}\" because of this or any of its "
+"children are already in use in some work reports"
+msgstr ""
+"No puede borrarse el elemento de pedido \"{0}\" porque uno de sus hijos se "
+"está usando en algún parte de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:201
+msgid "format filters are not valid"
+msgstr "los filtros de formato no son válidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:405
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:473
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:646
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:681
+msgid "You don't have read access to this order"
+msgstr "No tiene acceso de lectura a este pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:178
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:304
+msgid "The init date cannot be empty"
+msgstr "La fecha de inicio no puede ser vacía"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java:46
+msgid "criterion"
+msgstr "criterio"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88
+msgid "Our company password"
+msgstr "Contraseña de nuestra empresa"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:192
+msgid "Create machine"
+msgstr "Crear máquina"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46
+msgid "A2"
+msgstr "A2"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:21
+msgid "Criterion type list"
+msgstr "Lista de tipos de criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:381
+msgid ""
+"Value is not valid.\n"
+" Code cannot contain chars like '_'."
+msgstr ""
+"El valor no es válido.\n"
+" El código no puede contener caracteres como '_'."
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:160
+msgid "Hours Group"
+msgstr "Grupo de horas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:909
+msgid "Unallocated name"
+msgstr "Nombre no asignado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:523
+msgid "Move up"
+msgstr "Mover arriba"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelAdvanceConsolidations.zul:25
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelAdvanceConsolidations.zul:32
+msgid "Advance Consolidation"
+msgstr "Consolidación de avance"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55
+msgid "BCWP"
+msgstr "BCWP"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:22
+msgid "Subcontract communication date"
+msgstr "Fecha de comunicación de la subcontratación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:196
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:258
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:119
+msgid "Scheduling"
+msgstr "Planificación"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:118
+msgid "Dependencies have priority"
+msgstr "Las dependencias tienen prioridad"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52
+msgid "Nif"
+msgstr "Nif"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58
+msgid "Budget At Completion"
+msgstr "Total coste planificado"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:76
+msgid "Assign Label"
+msgstr "Asignar etiqueta"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21
+msgid "Type of work hours listing"
+msgstr "Listado de tipos de horas de trabajo"
+
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21
+msgid "List label types"
+msgstr "Listar tipos de etiqueta"
+
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62
+msgid "Work done from starting date:"
+msgstr "Trabajo realizado desde la fecha de inicio:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:468
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:24
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50
+#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35
+msgid "State"
+msgstr "Estado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:79
+msgid "Must start after"
+msgstr "Debe empezar después"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1149
+msgid "Confirm change"
+msgstr "Confirmar cambio"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37
+msgid "Single image"
+msgstr "Imagen simple"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:201
+msgid "missing date in a calendar exception"
+msgstr "falta la fecha de una excepción de calendario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:445
+msgid "Exception"
+msgstr "Excepción"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226
+msgid "Unit types"
+msgstr "Tipos de unidad"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194
+msgid "Send"
+msgstr "Enviar"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:58
+msgid "user"
+msgstr "usuario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:115
+msgid "The password for a new user cannot be empty"
+msgstr "La contraseña no puede ser vacía  para un usuario nuevo"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26
+msgid "Type name"
+msgstr "Nombre del tipo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:155
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:185
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26
+msgid "All"
+msgstr "Todo"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:21
+msgid "Calendars List"
+msgstr "Lista de calendarios"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:183
+msgid "Cannot be higher than Ending date"
+msgstr "No puede ser mayor que la fecha de fin"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214
+msgid "Create activation period"
+msgstr "Crear período de activación"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:10
+msgid "Personal details"
+msgstr "Detalles personales"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206
+msgid "Workers List"
+msgstr "Lista de trabajadores"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:202
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168
+msgid "Criterion must be not-null"
+msgstr "El criterio no debe ser nulo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:293
+msgid "Worker"
+msgstr "Trabajador"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:366
+msgid ""
+"Cannot allocate selected element. There is not any queue that matches "
+"resource allocation criteria at any interval of time"
+msgstr ""
+"No se puede asignar el elemento seleccionado. No hay ninguna cola que "
+"coincida con los criterios de asignación de recursos en ningún intervalo de "
+"tiempo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:160
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:206
+msgid "criterion name not specified"
+msgstr "nombre del criterio no especificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:134
+msgid "Value is not valid, the default max value must not be empty "
+msgstr "El valor no es válido, el valor máximo por defecto no debe ser nulo "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:206
+msgid "the "
+msgstr "el "
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74
+msgid "Advance Progress"
+msgstr "Progreso de avance"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:28
+msgid "External overload"
+msgstr "Sobrecarga externa"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:69
+msgid "Authorize"
+msgstr "Autorizar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:168
+msgid "Create order from Template"
+msgstr "Crear pedido a partir de plantilla"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:366
+msgid "Materials saved"
+msgstr "Materiales guardados"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:55
+msgid "Quarter"
+msgstr "Cuarto"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:675
+msgid "Duplicate value true report global Advance for order element "
+msgstr ""
+"Valor verdadero duplicado para la propiedad 'informar avance global' en el "
+"elemento de pedido "
+
+#: 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 "Nombre del perfil"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:221
+msgid "Could open generated PDF"
+msgstr "No se pudo abrir el PDF generado"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:106
+msgid "Disable Delete"
+msgstr "Deshabilitar borrado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67
+msgid "Assigned"
+msgstr "Asignado"
+
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:39
+msgid "Details"
+msgstr "Detalles"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:158
+msgid ""
+"The name is not valid, there is another advance type with the same name. "
+msgstr ""
+"El nombre no es válido, ya hay otro tipo de avance con el mismo nombre. "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:135
+msgid "Company saved"
+msgstr "Empresa guardada"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:234
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172
+msgid "Error: {0}"
+msgstr "Error: {0}"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:162
+msgid "Parent"
+msgstr "Padre"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:213
+msgid "Work report list"
+msgstr "Lista de partes de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:114
+msgid "Type of work hours saved"
+msgstr "Tipo de horas de trabajo guardado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63
+msgid "Not found converter for {0}"
+msgstr "No se encontró un conversor para {0}"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:49
+msgid "Material assignments"
+msgstr "Asignaciones de materiales"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:94
+msgid "start in fixed date"
+msgstr "comenzar en fecha fija"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:120
+msgid ""
+"Value is not valid, the Precision value must be less than the defalt max "
+"value."
+msgstr ""
+"El valor no es válido, el valor de precisión debe ser menor que el valor "
+"máximo por defecto."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:916
+msgid "Text field"
+msgstr "Campo de texto"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:194
+msgid "Create new work week"
+msgstr "Crear nueva semana de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:137
+msgid "Create label type"
+msgstr "Crear tipo de etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:646
+msgid "LIMITING RESOURCE"
+msgstr "RECURSO LIMITANTE"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:81
+msgid "Extended view"
+msgstr "Vista expandida"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:168
+msgid ""
+"The meausure name is not valid. There is another unit type with the same "
+"measure name"
+msgstr ""
+"El nombre de la medida no es válido. Hay otro tipo de unidad con el mismo "
+"nombre de medida"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32
+msgid "Work record"
+msgstr "Registro de trabajo"
+
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:129
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
+msgid "Output format"
+msgstr "Formato de salida"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174
+msgid "Criterion saved"
+msgstr "Criterio guardado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:115
+msgid "Error setting up edition form."
+msgstr "Error preparando el formulario de edición."
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:77
+msgid "Print"
+msgstr "Imprimir"
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21
+msgid "NavalPlan: Calendars"
+msgstr "NavalPlan: Calendarios"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:380
+msgid "Hours cannot be null"
+msgstr "Las horas no pueden ser nulas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:167
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:113
+msgid "{0} not found type for criterion "
+msgstr "{0} no encontrado tipo para criterio "
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:452
+msgid "resource type does not allow enabled criteria"
+msgstr "el tipo de recurso no permite criterios habilitados"
+
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
+msgid "NavalPlan: Scheduling progress report"
+msgstr "NavalPlan: Informe de progreso de planificación"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:32
+msgid "General user data"
+msgstr "Datos generales de usuario"
+
+#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:31
+msgid "Unschedule"
+msgstr "Quitar planificación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:216
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:65
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:97
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:110
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:148
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84
+#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:88
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:110
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72
+msgid "Accumulated hours chart"
+msgstr "Gráfico de horas acumuladas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200
+msgid "Subcontracted task sent successfully"
+msgstr "Tarea subcontratada enviada con éxito"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207
+msgid "Machines List"
+msgstr "Lista de máquinas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
+msgid "CPI"
+msgstr "CPI"
+
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:8
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:9
+#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:17
+msgid "Units"
+msgstr "Unidades"
+
+#: 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 "Fechas"
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:39
+msgid "Create Calendar"
+msgstr "Crear Calendario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:129
+msgid "At least one stretch is needed"
+msgstr "Se necesita al menos un tramo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:311
+msgid "a day is not valid"
+msgstr "un día no es válido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:214
+msgid "Stretch date should be greater or equals than task start date"
+msgstr ""
+"La fecha de un tramo debe ser mayor o igual que la fecha de inicio de la "
+"tarea"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60
+msgid "Task Properties"
+msgstr "Propiedades de la tarea"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:414
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:477
+msgid "There is no resource with this nif"
+msgstr "No hay otro recurso con este nif"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:12
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
+msgid "name"
+msgstr "nombre"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35
+msgid "Create new Work Report Type"
+msgstr "Crear nuevo tipo de parte de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:168
+msgid "Cost category saved"
+msgstr "Categoría de coste guardada"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:192
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:225
+#: 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 ""
+"Fecha de fin inválida, la fecha de fin nueva debe ser posterior a la fecha "
+"de inicio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:118
+msgid "{0} (max: {1})"
+msgstr "{0} (máx: {1})"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:542
+msgid "end"
+msgstr "fin"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:62
+msgid "Log"
+msgstr "Diario"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56
+msgid "Authorizations"
+msgstr "Autorizaciones"
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:28
+#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:35
+msgid "Continue"
+msgstr "Continuar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:197
+msgid "Start date cannot be null"
+msgstr "La fecha de inicio no puede ser nula"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:50
+msgid "Generic"
+msgstr "Genérico"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1036
+msgid "Value is not valid, the Precision value must be exact "
+msgstr "El valor no es válido, el valor de precisión debe ser exacto "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127
+msgid "Order does not exist"
+msgstr "El pedido no existe"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
+msgid "Add criterion requirement"
+msgstr "Añadir criterio requerido"
+
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:46
+msgid "Default max value"
+msgstr "Valor máximo por defecto"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:117
+msgid "Task"
+msgstr "Tarea"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:233
+msgid "Manage external companies"
+msgstr "Administrar empresas externas"
+
+#: navalplanner-webapp/src/main/webapp/labels/labelTypes.zul:20
+msgid "NavalPlan: Label types"
+msgstr "NavalPlan: Tipos de etiquetas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:392
+msgid "Calculate End Date"
+msgstr "Calcular fecha de fin"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84
+msgid "please, select a label"
+msgstr "por favor, seleccione una etiqueta"
+
+#: navalplanner-webapp/src/main/webapp/users/users.zul:22
+msgid "NavalPlan: User accounts"
+msgstr "NavalPlan: Cuentas de usuario"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:106
+msgid "Add profile"
+msgstr "Añadir perfil"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:17
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26
+msgid "Criterion name"
+msgstr "Nombre del criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:233
+msgid "missing code in a calendar data version"
+msgstr "falta el código en los datos de versión de un calendario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:190
+msgid "filter already exists"
+msgstr "el filtro ya existe"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:121
+msgid "values are not valid, the values must not be null"
+msgstr "los valores no son válidos, no deben ser nulos"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
+msgid "Task name"
+msgstr "Nombre de la tarea"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127
+msgid "cost assignment's resource not specified"
+msgstr "recurso de la asignación de coste no especificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78
+msgid "Unassigned"
+msgstr "No asignado"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24
+msgid "Select the date from which the new version will be valid"
+msgstr "Seleccione la fecha a partir de la cual la versión nueva será válida"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100
+msgid "Add new criterion requirement"
+msgstr "Añadir nuevo criterio requerido"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:79
+msgid "Work report"
+msgstr "Parte de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55
+msgid "Budgeted Cost Work Performed"
+msgstr "Coste presupuestado del trabajo realizado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:272
+msgid "the name must be not empty"
+msgstr "el nombre no puede ser vacío"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:90
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:58
+#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:26
+msgid "Disabled"
+msgstr "Deshabilitado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:283
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:411
+msgid "Earned value"
+msgstr "Valor ganado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42
+msgid "From Today"
+msgstr "A partir de hoy"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:624
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:637
+msgid "{0} not supported yet"
+msgstr "{0} aún no soportado"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52
+msgid "New entry"
+msgstr "Entrada nueva"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:48
+msgid "Resources Load"
+msgstr "Carga de recursos"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:31
+msgid "Overload due to current order"
+msgstr "Sobrecarga debido al pedido actual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:118
+msgid "Changes have been canceled"
+msgstr "Cambios cancelados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:46
+msgid "Overall Resources Load"
+msgstr "Carga global de recursos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:258
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:273
+msgid "Machine saved"
+msgstr "Máquina guardada"
+
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21
+msgid "Advance type list"
+msgstr "Lista de tipos de avance"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:30
+msgid "Assigned criterion requirements"
+msgstr "Criterios requeridos asignados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java:81
+msgid "Filter by criteria"
+msgstr "Filtrar por criterios"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:16
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:14
+msgid "Apply filtering to order elements satisfying required criteria"
+msgstr ""
+"Aplicar filtrado a los elementos de pedido que satisfacen los criterios "
+"requeridos"
+
+#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:41
+msgid "Max value"
+msgstr "Valor máximo"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:51
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:58
+msgid "No"
+msgstr "No"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:120
+msgid "Hours to allocate"
+msgstr "Horas para asignar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154
+msgid "The name is not valid, the name must not be null "
+msgstr "El nombre no es válido, no debe ser nulo "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:112
+msgid "A category must be selected"
+msgstr "Debe seleccionar una categoría"
+
+#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45
+msgid "Spread"
+msgstr "Propagación"
+
+#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21
+msgid "NavalPlan: Working progress report"
+msgstr "NavalPlan: Informe de progreso de trabajo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:156
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:625
+msgid "Removed {0}"
+msgstr "{0} borrado"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:61
+msgid "Group name"
+msgstr "Nombre del grupo"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
+msgid "Start date:"
+msgstr "Fecha de inicio:"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57
+msgid "Role name"
+msgstr "Nombre del rol"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:407
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:572
+msgid "h"
+msgstr "h"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114
+msgid "Value is not valid, the precision value must not be empty"
+msgstr "El valor no es válido, el valor de precisión no debe ser vacío"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:157
+msgid "Workable capacity for this period "
+msgstr "Capacidad de trabajo para este período "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188
+msgid "Cannot delete profile: it does not exist anymore"
+msgstr "No se puede borrar el perfil: ya no existe"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:91
+msgid "Unit Types"
+msgstr "Tipos de unidad"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99
+msgid "Add Milestone"
+msgstr "Añadir hito"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:520
+msgid "init"
+msgstr "inicio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:382
+msgid "Select for automatic queuing"
+msgstr "Seleccione para encolar automáticamente"
+
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95
+msgid "Create & Assign"
+msgstr "Crear y asignar"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31
+msgid "Print layout"
+msgstr "Salida de impresión"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:23
+msgid "Edit User"
+msgstr "Editar usuario"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54
+msgid "Maximum/minimum of the estimated hours"
+msgstr "Máximo/mínimo de las horas estimadas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:42
+msgid "Filter pattern"
+msgstr "Patrón de filtro"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1082
+msgid ""
+"The date is not valid, the date must be unique for this advanced assignment"
+msgstr "La fecha no es válida, debe ser única para esta asignación de avance"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:105
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:108
+#: navalplanner-webapp/src/main/webapp/planner/img/_tabPanelAdvanceConsolidation.zul:34
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelAdvanceConsolidations.zul:45
+msgid "Consolidated"
+msgstr "Consolidado"
+
+#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21
+msgid "Profiles listing"
+msgstr "Listado de perfiles"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:211
+msgid "Work report types"
+msgstr "Tipos de partes de trabajo"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:69
+msgid "Apply filtering to resource load satisfying required criteria"
+msgstr ""
+"Aplicar filtrado a la carga de recursos que satisfacen los criterios "
+"requeridos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:216
+msgid "missing code in a material"
+msgstr "falta el código en un material"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238
+msgid "Completed estimated hours"
+msgstr "Horas estimadas completadas"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:101
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31
+msgid "Customer"
+msgstr "Cliente"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:756
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:74
+msgid "Hours type"
+msgstr "Tipo de horas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:155
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:191
+msgid "criterion type name not specified"
+msgstr "nombre del tipo de criterio no especificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:232
+msgid "Manage user accounts"
+msgstr "Administrar cuentas de usuario"
+
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:23
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:219
+msgid "Add Exception"
+msgstr "Añadir excepción"
+
+#: 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 "no puede ser vacío"
+
 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41
 msgid "Completed estimated hours per task"
 msgstr "Horas estimadas completadas por tarea"
@@ -165,34 +2752,11 @@ msgstr "Horas estimadas completadas por tarea"
 msgid "from"
 msgstr "desde"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:114
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:145
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:105
 msgid "Heading Fields"
 msgstr "Campos de cabecera"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:200
-msgid "Select"
-msgstr "Seleccionar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:329
-msgid "there must be {0} hours instead of {1}"
-msgstr "debe haber {0} horas en lugar de {1}"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:224
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:41
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:78
-#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:1
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:62
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
-#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:52
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:137
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:49
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:35
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:90
-msgid "Materials"
-msgstr "Materiales"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:154
 msgid ""
 "Time period contains non valid data. Ending data must be older than starting "
@@ -201,28 +2765,12 @@ msgstr ""
 "El período de tiempo contiene datos inválidos. La fecha de fin debe ser "
 "mayor que la de inicio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:271
-msgid "Reassign"
-msgstr "Reasignar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:181
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:209
 msgid "A type must be selected"
 msgstr "Debe seleccionar un tipo"
 
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55
-msgid "Description cannot be null or empty"
-msgstr "La descripción no puede ser nula o vacía"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:92
-msgid "Percentage of consumed budget hours / hours consumed"
-msgstr "Porcentaje de horas de presupuesto consumidas / horas consumidas"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:75
-msgid "login name not specified"
-msgstr "nombre de usuario no especificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:505
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:946
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:474
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:907
 msgid "You should select a start date for the exception"
 msgstr "Debe seleccionar una fecha de inicio para la excepción"
 
@@ -231,44 +2779,14 @@ msgid "Variance At Completion"
 msgstr "Desviación al coste final"
 
 #: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:64
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:47
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:48
 msgid "Help"
 msgstr "Ayuda"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:337
-msgid "Please, select a calendar"
-msgstr "Por favor, seleccione un calendario"
-
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27
-msgid "Managing fields and labels"
-msgstr "Administrar campos y etiquetas"
-
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
-#: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:161
-msgid "Predefined"
-msgstr "Predefinido"
-
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
-msgid "Quality Forms"
-msgstr "Formularios de calidad"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:171
-msgid "Summary"
-msgstr "Resumen"
-
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:68
-msgid "Order sequences"
-msgstr "Secuencias de pedido"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:255
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:43
 msgid "Exportation options"
 msgstr "Opciones de exportación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:234
-msgid "Reports"
-msgstr "Informes"
-
 #: 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 "
@@ -283,7 +2801,7 @@ msgstr ""
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:732
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:860
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:354
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33
@@ -302,15 +2820,16 @@ msgstr ""
 #: 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/_editMachine.zul:54
 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:34
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:25
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:62
 #: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:61
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:72
 #: 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/costcategories/_editTypeOfWorkHours.zul:51
 #: 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
@@ -320,71 +2839,65 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:73
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:26
 #: navalplanner-webapp/src/main/webapp/templates/templates.zul:76
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:27
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:95
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:48
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:64
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:183
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:68
 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:27
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:108
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:40
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:37
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:167
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:161
 #: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26
 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:39
 msgid "Name"
 msgstr "Nombre"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:80
-msgid "START_NOT_EARLIER_THAN"
-msgstr "COMENZAR_NO_ANTES_DE"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java:80
+msgid "Filter by resources"
+msgstr "Filtrar por recursos"
 
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:80
-msgid "Criterion requirements"
-msgstr "Criterios requeridos"
-
-#: 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 ""
-"El calendario por defecto no puede borrarse. Por favor, cambie antes el "
-"calendario por defecto en la ventana de configuración."
+#: 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/orders/labels/AssignedLabelsController.java:107
 msgid "please, select an item"
 msgstr "por favor, seleccione un elemento"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:352
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:360
 msgid "Time Start cannot be null"
 msgstr "La hora de inicio no puede ser nula"
 
-#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65
-msgid "Dedication chart"
-msgstr "Gráfico de dedicación"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:157
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:151
 msgid "Day of week"
 msgstr "Día de la semana"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:477
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:493
+msgid "Other orders"
+msgstr "Otros pedidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:481
 msgid "It not could remove the order element "
 msgstr "No se pudo borrar el elemento de pedido "
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:588
-msgid "Not the same hours group, impossible to update"
-msgstr "No es el mismo grupo de horas, imposible actualizar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1095
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1234
 msgid "Stretches with Interpolation"
 msgstr "Tramos con interpolación"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:120
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:143
 msgid "The end date cannot be before the init date"
 msgstr "La fecha de fin no puede ser anterior a la fecha de inicio"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationCommand.java:67
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:74
+msgid "Advance consolidation"
+msgstr "Consolidación de avances"
+
 #: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:143
 msgid "cost assignment with end date less than start date"
 msgstr "la asignación de coste tiene fecha de fin anterior a la de inicio"
@@ -398,78 +2911,28 @@ msgstr "Nombre de la categoría"
 msgid "Maximum/minimum of the worked hours"
 msgstr "Máximo/mínimo de las horas trabajadas"
 
-#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:8
-msgid "Active period from"
-msgstr "Período activo desde"
-
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:51
-msgid "hours type :"
-msgstr "tipo de horas :"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:605
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:624
 msgid "Not the same material, impossible to update"
 msgstr "No es el mismo material, imposible actualizar"
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:67
-msgid "Quality form items list"
-msgstr "Lista de elementos del formulario de calidad"
-
-#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
-msgid "Name/Code"
-msgstr "Nombre/Código"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:743
-msgid "Create order"
-msgstr "Crear pedido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:197
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:229
-msgid ""
-"End date is not valid, the new end date must be later the current end date"
-msgstr ""
-"La fecha de fin no es válida, la nueva fecha de fin debe ser posterior a la "
-"actual"
-
 #: navalplanner-webapp/src/main/webapp/common/layout/template.zul:46
 msgid "Main menu"
 msgstr "Menú principal"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:130
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:134
 msgid "cannot include an Advance of the same Advance type twice"
 msgstr "no se puede asignar un avance del mismo tipo dos veces"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:697
-msgid "Hour start"
-msgstr "Hora de inicio"
-
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63
-msgid "Select print visualization options"
-msgstr "Seleccione las opciones de impresión de la visualización"
-
 #: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37
 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
 msgid "Create From Template"
 msgstr "Crear a partir de plantilla"
 
-#: navalplanner-webapp/src/main/webapp/planner/main.zul:52
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:68
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:149
-msgid "Start"
-msgstr "Comienzo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:366
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:368
 msgid "There exists other workReportType with the same name."
 msgstr "Ya existe otro tipo de parte de trabajo con el mismo nombre."
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118
-msgid "cost assignment's category not specified"
-msgstr "categoría de la asignación de coste no especificada"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:71
-msgid "Delete Template element"
-msgstr "Borrar elemento de plantilla"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:122
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:128
 #: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28
 msgid "Schedule"
 msgstr "Planificar"
@@ -489,44 +2952,11 @@ msgstr ""
 "Completa, parcialmente o no planificado. (Pinche y arrastre para mover "
 "elementos de pedido)"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DBUserDetailsService.java:65
-msgid "User with login name '{0}': not found"
-msgstr "Usuario con login '{0}': no encontrado"
-
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36
-msgid "Resources capability"
-msgstr "Capacidad de recursos"
-
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:41
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:60
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:78
 msgid "Notes"
 msgstr "Notas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:153
-msgid "The first stretch must be after the first day for doing interpolation"
-msgstr ""
-"El primer tramo debe estar después del primer día para hacer interpolación"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:94
-msgid "changing perspective"
-msgstr "cambio de perspectiva"
-
-#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
-msgid "Filter quality forms by :"
-msgstr "Filtrar formularios de calidad por :"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationController.java:121
-msgid ""
-"Could not add those authorizations to profile {0} because they were already "
-"present."
-msgstr ""
-"No se pudieron añadir esas autorizaciones al perfil {0} porque ya estaban "
-"presentes."
-
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:57
-msgid "Default calendar"
-msgstr "Calendario por defecto"
-
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:70
 msgid "Order Element Code"
 msgstr "Código del elemento de pedido"
@@ -535,11 +2965,11 @@ msgstr "Código del elemento de pedido"
 msgid "Changes saved"
 msgstr "Cambios guardados"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:931
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:936
 msgid "See scheduling"
 msgstr "Ver planificación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:140
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:142
 msgid ""
 "Some order was created during the configuration process, it is impossible to "
 "update order sequence table. Please, try again later"
@@ -548,13 +2978,13 @@ msgstr ""
 "actualizar la tabla de secuencia de pedido. Por favor, inténtelo otra vez "
 "luego"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:233
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:234
 msgid "Work report saved"
 msgstr "Parte de trabajo guardado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:381
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:56
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:101
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:75
 msgid "Subcontract"
 msgstr "Subcontratar"
 
@@ -563,13 +2993,16 @@ msgstr "Subcontratar"
 msgid "Relationship"
 msgstr "Relación"
 
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:36
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:56
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:73
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:153
 msgid "End"
 msgstr "Fin"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:967
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java:341
+msgid "There are not any assigned advance to current task"
+msgstr "No hay ningún avance asignado a la tarea actual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1075
 msgid "The date is not valid, the date must be not empty"
 msgstr "La fecha no es válida, no debe ser vacía"
 
@@ -577,19 +3010,22 @@ msgstr "La fecha no es válida, no debe ser vacía"
 msgid "User login name"
 msgstr "Nombre de usuario"
 
-#: 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 "Necesidades de materiales en fecha"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:427
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:488
+msgid "There is no order element with this code"
+msgstr "No hay elementos de pedido con este código"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:156
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:215
 msgid "criterion type not specified"
 msgstr "tipo de criterio no especificado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:275
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:539
-msgid "Indent"
-msgstr "Indentar"
+#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:32
+msgid ""
+"Another user has modified the same data, so the operation can't be safely "
+"completed."
+msgstr ""
+"Otro usuario ha modificado los mismos datos, por tanto la operación no se "
+"puede completar de manera segura."
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142
 msgid "must be not empty"
@@ -599,76 +3035,29 @@ msgstr "no puede ser vacío"
 msgid "Show all resource assignments"
 msgstr "Mostrar todas las asignaciones de recursos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:50
-msgid "New template"
-msgstr "Plantilla nueva"
-
-#: 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 "el código del tipo debe ser único. Ya está en uso"
-
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:26
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:54
 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:51
 msgid "Task quality forms"
 msgstr "Formularios de calidad de tarea"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127
-msgid "Base calendar \"{0}\" saved"
-msgstr "Calendario base \"{0}\" guardado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:465
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:447
 msgid "Not working day"
 msgstr "Día no laborable"
 
-#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:29
-msgid "Create Order Element"
-msgstr "Crear elemento de pedido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:88
-msgid "The advanceType cannot be modified"
-msgstr "El advanceType no puede ser modificado"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31
-msgid "Locations"
-msgstr "Ubicaciones"
-
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70
-msgid "New quality form item"
-msgstr "Nuevo elemento del formulario de calidad"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:67
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:54
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:111
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:73
 msgid "Resource allocation"
 msgstr "Asignación de recursos"
 
-#: 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 "Lista de plantillas"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:170
 msgid "please, select a quality form"
 msgstr "por favor, seleccione un formulario de calidad"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:385
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:387
 msgid "Exist other workReportType with the same code."
 msgstr "Ya existe otro tipo de parte de trabajo con el mismo código."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:143
-msgid "For interpolation at least two stretches are needed"
-msgstr "Para interpolar se necesitan al menos dos tramos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:673
-msgid "Order Code"
-msgstr "Código de pedido"
-
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:41
-msgid "Login name"
-msgstr "Nombre de usuario"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:90
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:53
 msgid "Constraint"
 msgstr "Restricción"
 
@@ -680,11 +3069,7 @@ msgstr "Código de referencia del cliente"
 msgid "Add New Label Type Field"
 msgstr "Añadir nuevo campo de tipo de etiqueta"
 
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:14
-msgid "Current"
-msgstr "Actual"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:360
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:370
 msgid "Time finish cannot be null"
 msgstr "La hora de fin no puede ser nula"
 
@@ -693,58 +3078,36 @@ msgstr "La hora de fin no puede ser nula"
 msgid "Customer reference"
 msgstr "Referencia de cliente"
 
-#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:76
-msgid "Dependencies"
-msgstr "Dependencias"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:102
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:396
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:406
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:709
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:135
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:286
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:474
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:606
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:637
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:646
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:681
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:638
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:647
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:682
 msgid "Information"
 msgstr "Información"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java:78
-msgid "Are you sure?"
-msgstr "¿Está seguro?"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:174
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:191
 msgid "Worker saved"
 msgstr "Trabajador guardado"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1008
-msgid ""
-"there exist criterion satisfactions referring to criterion types not "
-"applicable to this resource"
-msgstr ""
-"existen criterios satisfechos que pertenecen a tipos de criterio no "
-"aplicables a este recurso"
-
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36
-msgid "Create new advance type"
-msgstr "Crear un nuevo tipo de avance"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:251
 msgid "can not pass until the previous item is passed."
 msgstr "no se puede pasar mientras el elemento no anterior sea pasado."
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:61
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:49
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:47
-msgid "Criterion Requirement"
-msgstr "Criterio requerido"
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36
+msgid "Create new advance type"
+msgstr "Crear un nuevo tipo de avance"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205
 msgid "New hours group "
 msgstr "Nuevo grupo de horas "
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54
-msgid "Company Scheduling"
-msgstr "Planificación de la compañía"
-
 #: 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
@@ -757,36 +3120,15 @@ msgstr "Filtrar por pedidos"
 msgid "percentage cannot be duplicated"
 msgstr "el porcentaje no puede estar duplicado"
 
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:21
-msgid "NavalPlan: Configuration"
-msgstr "NavalPlan: Configuración"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26
 msgid "Heading"
 msgstr "Cabecera"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22
-msgid "Create new version"
-msgstr "Crear versión nueva"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:121
+msgid "There is no material category with this code"
+msgstr "No hay ninguna categoría de materiales con este código"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:189
-msgid "Derived"
-msgstr "Derivado"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:226
-msgid "a disabled resource has enabled subresources"
-msgstr "un recurso deshabilitado tiene subrecursos habilitados"
-
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51
-msgid "Client"
-msgstr "Cliente"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28
-msgid "Add new advance assignment"
-msgstr "Añadir nueva asignación de avance"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:266
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:276
 msgid "Could not save machine"
 msgstr "No se pudo guardar la máquina"
 
@@ -794,93 +3136,52 @@ msgstr "No se pudo guardar la máquina"
 msgid "Unable to convert value to {0} type"
 msgstr "No se pudo convertir el valor a tipo {0}"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:179
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:341
+msgid "The calendar exception type not found"
+msgstr "Tipo de excepción de calendario no encontrado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:184
 msgid "Worker must be not-null"
 msgstr "El trabajador no debe ser nulo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:460
-msgid ""
-"there are no resources for required criteria: {0}. So the generic allocation "
-"can't be added"
-msgstr ""
-"no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede "
-"añadir la asignación genérica"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:923
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:938
 msgid "Some criterion satisfactions overlap in time"
 msgstr "Algunos criterios satisfechos se solapan en el tiempo"
 
-#: 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 "el nombre de la categoría de materiales debe ser único. Ya está en uso"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:115
-msgid "Imputed hours"
-msgstr "Horas imputadas"
-
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:42
 msgid "Worker assignments"
 msgstr "Asignaciones de trabajador"
 
-#: 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 "Confirmar el borrado de este coste por hora. ¿Está seguro?"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:133
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:116
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:101
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:128
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:307
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:149
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:115
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:142
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:308
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:389
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:411
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:466
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:752
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:476
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:753
 #, java-format
 msgid "{0} already exists"
 msgstr "{0} ya existe"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:250
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:270
 msgid "Create Worker"
 msgstr "Crear trabajador"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58
-msgid "Delete Milestone"
-msgstr "Borrar hito"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:636
-msgid "The order has no scheduled elements"
-msgstr "El pedido no tiene elementos planificados"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47
-msgid "Non-assigned locations"
-msgstr "Ubicaciones no asignadas"
-
 #: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:17
 msgid "Code "
 msgstr "Código"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:405
-msgid ""
-"The {0} is not valid, criterionType overlaps with other "
-"criterionSatisfaction from the same criterionType"
-msgstr ""
-"{0} no es válido, criterionType se solapa con otro criterionSatisfaction del "
-"mismo criterionType"
-
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
-msgid "Application URI"
-msgstr "URI de la aplicación"
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52
+msgid "Password confirmation"
+msgstr "Confirmación de contraseña"
 
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41
 msgid "Paper size"
 msgstr "Tamaño del papel"
 
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52
-msgid "Password confirmation"
-msgstr "Confirmación de contraseña"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1033
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1172
 msgid "None"
 msgstr "Ninguno"
 
@@ -888,35 +3189,14 @@ msgstr "Ninguno"
 msgid "Work Report"
 msgstr "Parte de trabajo"
 
-#: 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 "Progreso de la planificación por pedido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1137
-msgid "Configure"
-msgstr "Configurar"
-
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:132
 msgid "Work"
 msgstr "Trabajo"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:32
-msgid "First name"
-msgstr "Nombre"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:221
-msgid "Could not execute print command"
-msgstr "No se pudo ejecutar el comando de impresión"
-
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:108
-msgid "Complementary text fields"
-msgstr "Campos de texto complementario"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:92
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:119
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:389
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:137
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:373
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:400
 #: navalplanner-webapp/src/main/webapp/common/event_error.zul:21
 msgid "Error"
 msgstr "Error"
@@ -925,7 +3205,7 @@ msgstr "Error"
 msgid "Cost Performance Index"
 msgstr "Eficiencia en coste"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:161
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:160
 msgid ""
 "Criterion is not valid, the criterion overlap other criterionSatisfaction "
 "whith same criterion"
@@ -933,15 +3213,6 @@ msgstr ""
 "Criterion no es válido, otro criterionSatisfaction se solapa con el mismo "
 "criterion"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:189
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1080
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:204
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:179
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:198
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:592
-msgid "Confirm deleting {0}. Are you sure?"
-msgstr "Confirmar el borrado de {0}. ¿Está seguro?"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60
 msgid "ETC"
 msgstr "ETC"
@@ -954,10 +3225,6 @@ msgstr "Salir"
 msgid "Edit template"
 msgstr "Editar plantilla"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:81
-msgid "External code"
-msgstr "Código externo"
-
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23
 msgid "Add new configuration unit"
 msgstr "Añadir nueva unidad de configuración"
@@ -966,7 +3233,7 @@ msgstr "Añadir nueva unidad de configuración"
 msgid "Main preferences"
 msgstr "Preferencias principales"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:161
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:160
 msgid ""
 "Criterion is not valid, it overlaps other criterionSatisfaction with the "
 "same criterion"
@@ -974,21 +3241,22 @@ msgstr ""
 "Criterion no válido, otro criterionSatisfaction se solapa con el mismo "
 "criterionType"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:165
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:166
 msgid "Label type saved"
 msgstr "Tipo de etiqueta guardado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:384
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:527
+msgid "missing field name in a description value"
+msgstr "falta nombre de campo en un valor de descripción"
+
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:45
 msgid "Add new worker assignment"
 msgstr "Añadir nueva asignación de trabajador"
 
-#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:46
-msgid "View"
-msgstr "Ver"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:482
-msgid "resources per day must be not empty and bigger than zero"
-msgstr "los recursos por día deben ser no vacíos y mayores que cero"
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:64
+msgid "Limited resource"
+msgstr "Recurso limitante"
 
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86
 msgid "Show dependencies:"
@@ -998,22 +3266,6 @@ msgstr "Mostrar dependencias:"
 msgid "Hours Group at "
 msgstr "Grupo de horas en "
 
-#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:23
-msgid "Edit type of work hour"
-msgstr "Editar tipo de horas de trabajo"
-
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:98
-msgid "Up"
-msgstr "Arriba"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:165
-msgid ""
-"CriterionType is not valid, it overlaps other criterionSatisfaction with the "
-"same criterionType"
-msgstr ""
-"CriterionType no válido, otro criterionSatisfaction se solapa con el mismo "
-"criterionType"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21
 msgid "Work Report types"
 msgstr "Tipos de partes de trabajo"
@@ -1024,7 +3276,8 @@ msgstr ""
 "Su sesión ha expirado tras un tiempo de inactividad. Por favor, inicie "
 "sesión de nuevo."
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:134
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:55
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:60
 msgid "Total Estimated hours"
 msgstr "Horas totales estimadas"
 
@@ -1037,44 +3290,11 @@ msgstr "PROPAGACIÓN"
 msgid "Budgeted Cost Work Scheduled"
 msgstr "Coste de trabajo presupuestado planificado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58
-msgid "EAC"
-msgstr "EAC"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:21
-msgid "Virtual workers list"
-msgstr "Lista de trabajadores virtuales"
-
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:50
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:56
 msgid "Name cannot be null or empty"
 msgstr "El nombre no puede ser nulo o vacío"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:133
-msgid "Some stretch has higher or equal values than the previous stretch"
-msgstr "Algún tramo tiene valores mayores o iguales que el tramo anterior"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:107
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:118
-msgid "Total hours order element"
-msgstr "Total de horas del elemento de pedido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:140
-msgid ""
-"Value is not valid, the default max value must be greater than the precision "
-"value "
-msgstr ""
-"El valor no es válido, el valor máximo por defecto debe ser mayor que el "
-"valor de precisión"
-
-#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:16
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
-#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68
-#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:251
-msgid "End date"
-msgstr "Fecha de fin"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:102
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:101
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
@@ -1086,10 +3306,12 @@ msgstr "Crear pedido"
 msgid "Cost Variance"
 msgstr "Desviación en coste"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:432
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:437
 msgid "criterion type does not allow resource hierarchy"
 msgstr "el tipo de criterio no permite jerarquía de recursos"
 
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:104
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:107
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:142
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:53
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:79
@@ -1100,72 +3322,23 @@ msgstr "Total"
 msgid "A1"
 msgstr "A1"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:87
-msgid "profile name is already being used by another profile"
-msgstr "el nombre del perfil ya está siendo usado por otro perfil"
-
-#: 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 "Por favor, seleccione un pedido"
-
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:63
-msgid "E-mail"
-msgstr "Correo electrónico"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:198
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:95
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:98
 msgid "Invalidate"
 msgstr "Invalidar"
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:21
-msgid "List quality forms"
-msgstr "Lista de formularios de calidad"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46
-msgid "Order Details"
-msgstr "Detalles de pedido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:610
-#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:120
-msgid "Criteria"
-msgstr "Criterios"
-
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26
-msgid "User data"
-msgstr "Datos del usuario"
-
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109
 msgid "Budget hours"
 msgstr "Horas del presupuesto"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:69
-msgid "AS_SOON_AS_POSSIBLE"
-msgstr "TAN_PRONTO_COMO_SEA_POSIBLE"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:130
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:155
 msgid "Edit task: {0}"
 msgstr "Editar tarea: {0}"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43
-msgid "Lines"
-msgstr "Líneas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:44
-msgid "Orders List"
-msgstr "Lista de pedidos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1487
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1569
 msgid "OrderElement not found"
 msgstr "OrderElement no encontrado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189
-msgid "Error on showing warning message removing workReportType: "
-msgstr ""
-"Error al mostrar mensaje de advertencia borrando tipo de parte de trabajo: "
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:304
 msgid ""
 "Another order element in the same branch is already reporting advance for "
@@ -1183,33 +3356,17 @@ msgstr "debe ser mayor que la fecha anterior"
 msgid "NavalPlan: Advanced allocation"
 msgstr "NavalPlan: Asignación avanzada"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29
-msgid "Personal data"
-msgstr "Datos personales"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:498
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1317
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java:514
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1399
 msgid "Show all"
 msgstr "Mostrar todo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:209
-msgid "Work reports"
-msgstr "Partes de trabajo"
-
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:44
 msgid "A4"
 msgstr "A4"
 
-#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41
-msgid "Save Order"
-msgstr "Guardar pedido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92
-msgid "{0} annotation required on {1}"
-msgstr "{0} anotación obligatoria en {1}"
-
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27
-#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57
 msgid "Default price"
 msgstr "Precio por defecto"
 
@@ -1217,122 +3374,45 @@ msgstr "Precio por defecto"
 msgid "Estimated hours"
 msgstr "Horas estimadas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:624
-msgid "Modified"
-msgstr "Modificado"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:38
-msgid "Edit virtual resource"
-msgstr "Editar recurso virtual"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:209
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:130
 msgid "Apply tab changes"
 msgstr "Aplicar cambios de la pestaña"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212
-msgid "Add Criterion"
-msgstr "Añadir criterio"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:201
-msgid "Fattened Tree {0}"
-msgstr "Árbol aplanado {0}"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:268
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:67
-msgid "MessagesContainer is needed"
-msgstr "Es necesario un MessagesContainer"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:234
 msgid "passwords don't match"
 msgstr "las contraseñas no conciden"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
-#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19
-#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23
-#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
-msgid "Ending date"
-msgstr "Fecha de fin"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:263
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:51
 msgid "Hours groups"
 msgstr "Grupos de horas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:201
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:203
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:33
 msgid "Subcontracted tasks list"
 msgstr "Lista de tareas subcontratadas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:225
-msgid "Manage cost categories"
-msgstr "Administrar categorías de coste"
-
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:81
-msgid "Last value"
-msgstr "Último valor"
-
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:233
 #: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:33
 msgid "Create new order"
 msgstr "Crear pedido nuevo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:198
-msgid "General resource allocation"
-msgstr "Asignación de recursos general"
-
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:65
-msgid "Statistics log"
-msgstr "Histórico de estadísticas"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46
-#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:43
-msgid "Edit Calendar"
-msgstr "Editar calendario"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:214
-msgid "Work report query"
-msgstr "Consulta de partes de trabajo"
-
-#: 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 "No puede ser vacío o nulo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:229
-msgid "filtering"
-msgstr "filtrado"
-
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33
-msgid "Total Budget"
-msgstr "Presupuesto total"
-
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:50
-msgid "Hierarchy"
-msgstr "Jerarquía"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:126
+msgid "Unit {0} cannot be  removed because it is used in materials"
+msgstr ""
+"La unidad {0} no se puede borrar porque está siendo usada en materiales"
 
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65
 msgid "Reference date"
 msgstr "Fecha de referencia"
 
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:21
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:25
-msgid "Print configuration"
-msgstr "Imprimir configuración"
-
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:26
-msgid "Overload due to other assignments"
-msgstr "Sobrecarga debido a otras asignaciones"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148
-msgid "Time period saved"
-msgstr "Período de tiempo guardado"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56
 msgid "CV"
 msgstr "CV"
 
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:103
+msgid "Original"
+msgstr "Original"
+
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30
 msgid "Stretches function configuration"
 msgstr "Configuración de la función de tramos"
@@ -1341,17 +3421,18 @@ msgstr "Configuración de la función de tramos"
 msgid "Week"
 msgstr "Semana"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:39
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:34
-msgid "Filter work report by :"
-msgstr "Filtrar parte de trabajo por :"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:264
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:278
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:288
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:302
 msgid "Not indentable"
 msgstr "No indentable"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:92
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:482
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:74
+msgid "List of materials for all categories (select one to filter)"
+msgstr ""
+"Lista de materiales para todas las categorías (seleccione una para filtrar)"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:93
 msgid "User disabled"
 msgstr "Usuario deshabilitado"
 
@@ -1363,24 +3444,10 @@ msgstr "Nombre del elemento de pedido"
 msgid "Association with profiles"
 msgstr "Asociación con perfiles"
 
-#: 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 "Trabajadores"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:475
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:506
 msgid "end date: {0} must be after start date: {1}"
 msgstr "fecha de fin: {0} debe ser posterior a la fecha de inicio {1}"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48
-#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:35
-msgid "Order element code"
-msgstr "Código del elemento de pedido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:222
-msgid "Advance measurements: "
-msgstr "Medidas de avance: "
-
 #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:115
 msgid "worker's surname not specified"
 msgstr "apellidos del trabajador no especificados"
@@ -1394,32 +3461,15 @@ msgstr "Error al borrar tipo de parte de trabajo: "
 msgid "Save changes"
 msgstr "Guardar cambios"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:346
+msgid "Assign to queue"
+msgstr "Asignar a cola"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:114
 msgid "Total dedication"
 msgstr "Dedicación total"
 
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54
-msgid "Year"
-msgstr "Año"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:102
-msgid "Is subcontracted"
-msgstr "Está subcontratado"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66
-msgid "profile name not specified"
-msgstr "nombre del perfil no especificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:924
-msgid "Value is not valid, the current value must be less than max value"
-msgstr ""
-"El valor no es válido, el valor actual debe ser menor que el valor máximo"
-
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:60
-msgid "Date Start"
-msgstr "Fecha de inicio"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:229
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:17
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42
 msgid "Subcontratation date"
 msgstr "Fecha de subcontratación"
@@ -1429,55 +3479,29 @@ msgid "Edit external company"
 msgstr "Editar empresa externas"
 
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:58
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:125
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:121
 msgid "Day"
 msgstr "Día"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:204
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33
 msgid "Report advances"
 msgstr "Notificar avances"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:54
-msgid "From Chosen"
-msgstr "A partir de elegidos"
-
-#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53
-msgid "Hour costs"
-msgstr "Costes por hora"
-
-#: 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 "Valor"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1053
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:864
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113
 msgid "Please, select an item"
 msgstr "Por favor, seleccione un elemento"
 
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:76
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:52
-msgid "Add role"
-msgstr "Añadir rol"
-
-#: 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 ""
-"La fecha de fin de una excepción debe ser mayor o igual que la fecha de "
-"inicio"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:176
 msgid "Work report type saved"
 msgstr "Tipo de partes de trabajo guardado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1003
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1063
 msgid "Cannot be higher than finish hour"
 msgstr "No puede ser mayor que la fecha de fin"
 
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:79
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:133
 msgid "Prefix"
 msgstr "Prefijo"
 
@@ -1485,57 +3509,28 @@ msgstr "Prefijo"
 msgid "New Template element"
 msgstr "Nuevo elemento de plantilla"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:247
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:35
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46
 msgid "Subcontracted code"
 msgstr "Código subcontratado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:402
-msgid ""
-"The {0} can not be assigned to this resource. Its interval overlaps with "
-"other criterion"
-msgstr ""
-"El {0} no se puede asignar a este recurso. Su intervalo se solapa con otro "
-"criterio"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:259
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:327
+msgid "The base calendar parent not found"
+msgstr "Calendario base padre no encontrado"
 
-#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66
-msgid "Work done until ending date:"
-msgstr "Trabajo realizado hasta la fecha de fin:"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63
-msgid "Schedule Performance Index"
-msgstr "Índice de rendimiento de la planificación"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223
-msgid "Label types"
-msgstr "Tipos de etiqueta"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:481
-msgid "Create virtual resource"
-msgstr "Crear recurso virtual"
-
-#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26
-msgid "Type data"
-msgstr "Datos del tipo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:343
-msgid "The order element code cannot be null"
-msgstr "El código del elemento de pedido no puede ser nulo"
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:106
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:109
+msgid "Non Consolidated"
+msgstr "No consolidado"
 
 #: navalplanner-webapp/src/main/webapp/planner/reassign.zul:33
 msgid "Reassigning type"
 msgstr "Tipo de reasignación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:701
-msgid "Hour finish"
-msgstr "Hora de fin"
-
-#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:69
-msgid "Perspectives"
-msgstr "Perspectivas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:117
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:116
 #: navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java:66
 msgid "Order"
 msgstr "Pedido"
@@ -1551,23 +3546,19 @@ msgstr "El nombre del campo debe ser único, no nulo y no vacío"
 msgid "Position"
 msgstr "Posición"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:189
-msgid "Error removing element: "
-msgstr "Error al borrar elemento: "
-
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39
-msgid "Company name"
-msgstr "Nombre de la empresa"
-
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:105
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:107
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:96
 msgid "Edit work report"
 msgstr "Editar parte de trabajo"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:97
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:98
 msgid "Incorrect authentication"
 msgstr "Identificación incorrecta"
 
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:122
+msgid "Auto queueing"
+msgstr "Auto encolar"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:99
 msgid "All order tasks"
 msgstr "Todas las tareas del pedido"
@@ -1576,23 +3567,15 @@ msgstr "Todas las tareas del pedido"
 msgid "Value last advance measurement"
 msgstr "Valor última medida de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:714
-msgid "{0}"
-msgstr "{0}"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:758
 msgid "A description field of the same name already exists."
 msgstr "Ya existe un campo de descripción con el mismo nombre."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:458
-msgid "Split new assignment"
-msgstr "Dividir nueva asignación"
-
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
 msgid "Current value"
 msgstr "Valor actual"
 
-#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:47
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:45
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:51
 msgid "Zoom level"
 msgstr "Nivel de zoom"
@@ -1602,100 +3585,32 @@ msgstr "Nivel de zoom"
 msgid "Quality form"
 msgstr "Formulario de calidad"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:170
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:217
-msgid "Expiry date"
-msgstr "Fecha de vencimiento"
-
 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:26
 msgid "Profile data"
 msgstr "Datos del perfil"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:227
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:229
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:34
 msgid "Configuration"
 msgstr "Configuración"
 
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:48
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73
-msgid "Categories"
-msgstr "Categorías"
-
-#: 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 " ir a la salida directamente"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:163
-msgid "Add new hours group"
-msgstr "Añadir nuevo grupo de horas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:364
-#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:62
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:79
-msgid "Percentage"
-msgstr "Porcentaje"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:221
-msgid "Manage criteria"
-msgstr "Gestionar criterios"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:76
+msgid "It was not possible load entity. Not found. Id: "
+msgstr "No ha sido posible cargar la entidad. No encontrada. Id: "
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:70
 msgid "Total order element hours"
 msgstr "Total de horas en elementos de pedido"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:160
-msgid "Calculation type"
-msgstr "Tipo de cálculo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134
-msgid "Updated"
-msgstr "Actualizado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:130
-msgid "No worker selected"
-msgstr "Ningún trabajador seleccionado"
-
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:80
-msgid "Number of digits"
-msgstr "Número de dígitos"
-
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28
-msgid "Total capability"
-msgstr "Capacidad total"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:476
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:640
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:465
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:644
 msgid "Hours invested"
 msgstr "Horas invertidas"
 
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21
-msgid "NavalPlan: Calendars"
-msgstr "NavalPlan: Calendarios"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:472
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:639
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:617
-msgid "Advance"
-msgstr "Avance"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:237
-msgid "Problems connecting with client web service"
-msgstr "Problemas al conectar con el servicio web cliente"
-
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21
-msgid "Templates"
-msgstr "Plantillas"
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:65
+msgid "Vertical interval"
+msgstr "Intervalo vertical"
 
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50
 msgid "Amount work percentage"
@@ -1705,44 +3620,24 @@ msgstr "Porcentaje de cantidad de trabajo"
 msgid "Date last advance reported"
 msgstr "Fecha último avance notificado"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:93
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:126
-msgid "Exception Type"
-msgstr "Tipo de excepción"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:645
+msgid "ALL"
+msgstr "TODOS"
 
 #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:220
 msgid "criterion satisfaction's resource not specified"
 msgstr "recurso del criterio satisfecho no especificado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202
-msgid "Advances sent successfully"
-msgstr "Avances enviados con éxito"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:461
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:443
 msgid "Derived exception"
 msgstr "Excepción derivada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:215
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:481
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:651
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:597
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:259
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:45
-msgid "Labels"
-msgstr "Etiquetas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:206
-msgid "both {0} of category {1} and {2} of category {3} have the same code"
-msgstr ""
-"{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:112
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:31
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:36
 msgid "Resources search"
 msgstr "Búsqueda de recursos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:139
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:143
 msgid "Couldn't find element: {0}"
 msgstr "No se pudo encontrar el elemento: {0}"
 
@@ -1750,156 +3645,84 @@ msgstr "No se pudo encontrar el elemento: {0}"
 msgid "Confirm deleting this profile. Are you sure?"
 msgstr "Confirmar el borrado de este perfil. ¿Está seguro?"
 
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21
-msgid "NavalPlan: AdvanceTypes"
-msgstr "NavalPlan: AdvanceTypes"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:184
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:268
+msgid "unit type code not found"
+msgstr "código de tipo de unidad no encontrado"
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147
-msgid "Total hours"
-msgstr "Total de horas"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:44
+msgid "Limiting resources"
+msgstr "Recursos limitantes"
 
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:41
 msgid "Resource :"
 msgstr "Recurso :"
 
-#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:66
-msgid "Filter by task status"
-msgstr "Filtrar por estado de tarea"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:48
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:49
 msgid "Order element"
 msgstr "Elemento de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:298
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:450
-msgid "Select date:"
-msgstr "Seleccione fecha:"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:106
 msgid "Company view"
 msgstr "Vista de la compañía"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29
-msgid "Integrated user"
-msgstr "Usuario integrado"
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:21
+msgid "NavalPlan: Configuration"
+msgstr "NavalPlan: Configuración"
 
-#: 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 "Debe seleccionar una fecha de fin para la excepción"
-
-#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:46
-msgid "Value last advance reported"
-msgstr "Valor último avance notificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:127
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:129
 msgid "Just one order sequence must be active"
 msgstr "Solo una secuencia de pedido debe estar activa"
 
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:51
-msgid "Company code"
-msgstr "Código de la empresa"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109
-msgid "Unknown attribute '{0}' in class {1}"
-msgstr "Atributo desconocido '{0}' en la clase {1}"
-
-#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:2
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:4
 msgid "Filter by"
 msgstr "Filtrar por"
 
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:14
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:75
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:36
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:36
+msgid "Limiting resource"
+msgstr "Recurso limitante"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:282
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:95
 msgid "Calendar allocation"
 msgstr "Asignación de calendario"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96
-msgid "machine name not specified"
-msgstr "nombre de la máquina no especificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:136
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:143
 msgid "Choose a order element from which create a template from"
 msgstr "Elija un elemento de pedido a partir del cual crear una plantilla"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:87
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:127
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:174
-msgid "already assigned"
-msgstr "ya asignado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:368
-msgid "Passed"
-msgstr "Pasado"
-
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:89
 #: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:12
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:13
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:113
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111
 msgid "Category"
 msgstr "Categoría"
 
-#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:23
-msgid "Edit cost category"
-msgstr "Editar categoría de coste"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:117
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:37
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:43
 msgid "Order Element Information"
 msgstr "Información de elemento de pedido"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:77
-msgid "Activation periods"
-msgstr "Períodos de activación"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:154
 msgid "must be greater than finish date"
 msgstr "debe ser mayor que la fecha de fin"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:123
-msgid "Calendar"
-msgstr "Calendario"
-
-#: 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 "Recursos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:404
-msgid "[generic all workers]"
-msgstr "[genérico todos los trabajadores]"
-
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26
 msgid "Category data"
 msgstr "Datos de categoría"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:30
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67
-msgid "Read"
-msgstr "Leer"
-
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:94
 msgid "Search"
 msgstr "Buscar"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:232
-msgid "CriterionType and its criteria saved"
-msgstr "CriterionType y sus criterios guardados"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115
 msgid "Add New Complementary Field"
 msgstr "Añadir nuevo campo complementario"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:49
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:49
-#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:10
-#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:9
-#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:8
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:195
-msgid "to"
-msgstr "a"
-
 #: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49
 #: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42
 msgid "Remove calendar"
@@ -1909,15 +3732,15 @@ msgstr "Borrar calendario"
 msgid "%"
 msgstr "%"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1384
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1548
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:562
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:483
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1466
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1630
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:581
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:493
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:180
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:266
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:676
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:996
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:207
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:286
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:833
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:1001
 msgid "must be lower than finish date"
 msgstr "debe ser menor que la fecha de fin"
 
@@ -1925,13 +3748,9 @@ msgstr "debe ser menor que la fecha de fin"
 msgid "Order Element"
 msgstr "Elemento de pedido"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java:106
-msgid "worker's first name not specified"
-msgstr "nombre del trabajador no especificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:666
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:239
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:128
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:711
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:289
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:159
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:69
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:119
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:71
@@ -1943,19 +3762,15 @@ msgstr "Recurso"
 msgid "Could not load any resource"
 msgstr "No se pudo cargar un recurso"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266
-msgid "date not specified"
-msgstr "fecha no especificada"
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
+msgid "NavalPlan: Working arrangements report"
+msgstr "NavalPlan: Informe de planes de trabajo"
 
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:36
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:34
 msgid "Material search"
 msgstr "Búsqueda de materiales"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:91
-msgid "Select type :"
-msgstr "Seleccione tipo :"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:342
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:347
 msgid ""
 "You must allow multiple active criteria for this type to use this assignment "
 "strategy"
@@ -1963,43 +3778,24 @@ msgstr ""
 "Debe permitir múltiples criterios activos para este tipo para usar esta "
 "estrategia de asignación"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:48
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:45
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:43
-msgid "Advances"
-msgstr "Avances"
-
 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:10
 msgid "sub elements"
 msgstr "sub elementos"
 
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:73
-msgid "Shrink to fit page width"
-msgstr "Reducir para ajustar al ancho de página"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:147
 msgid "Default Label"
 msgstr "Etiqueta por defecto"
 
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:176
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:77
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:201
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:88
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:122
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:89
 msgid "Close"
 msgstr "Cerrar"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:55
-msgid "Last name"
-msgstr "Apellidos"
-
-#: 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 "Borrar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:215
-msgid "cost category name not specified"
-msgstr "nombre de la categoría de coste no especificado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:298
+msgid "Time filter"
+msgstr "Filtro de tiempo"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:354
 msgid "Create copy"
@@ -2009,6 +3805,10 @@ msgstr "Crear copia"
 msgid "Company data"
 msgstr "Datos de la empresa"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:185
+msgid "Unit type code cannot be empty"
+msgstr "El código del tipo de unidad no puede ser vacío"
+
 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21
 msgid "Criterions Requirement"
 msgstr "Criterios requeridos"
@@ -2017,10 +3817,6 @@ msgstr "Criterios requeridos"
 msgid "Average of the estimated hours"
 msgstr "Media de horas estimadas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62
-msgid "SPI"
-msgstr "SPI"
-
 #: 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"
@@ -2034,31 +3830,10 @@ msgstr "Porcentaje de longitud"
 msgid "Label Type fields"
 msgstr "Campos de tipo de etiqueta"
 
-#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47
-msgid "Name name"
-msgstr "Nombre nombre"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163
-msgid "Edit quality form"
-msgstr "Editar formulario de calidad"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93
 msgid "Hours Management"
 msgstr "Administración de horas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1110
-msgid "Interpolation"
-msgstr "Interpolación"
-
-#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:21
-#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:21
-msgid "Subcontracted tasks"
-msgstr "Tareas subcontratadas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:292
-msgid "{0} must not be before {1}"
-msgstr "{0} no debe estar antes de {1}"
-
 #: 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 "el nombre de la empresa debe ser único. Ya está siendo usado"
@@ -2068,26 +3843,15 @@ msgstr "el nombre de la empresa debe ser único. Ya está siendo usado"
 msgid "Template saved"
 msgstr "Plantilla guardada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375
-msgid "the code must be not null or not empty"
-msgstr "el código no puede ser nulo o vacío"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:221
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:206
-msgid ""
-"Start date is not valid, the new start date must be previous the current "
-"start date"
-msgstr ""
-"La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior "
-"a la fecha de inicio actual"
-
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:62
 msgid "Type of day"
 msgstr "Tipo de día"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1072
-msgid "Stretches list"
-msgstr "Lista de tramos"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:536
+msgid "work report have not any description value with this field name"
+msgstr ""
+"El parte de trabajo no tiene ningún valor de descripción con ese nombre de "
+"campo"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:160
 msgid "User saved"
@@ -2097,42 +3861,14 @@ msgstr "Usuario guardado"
 msgid "Task quality form name"
 msgstr "Nombre del formulario de calidad de tarea"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:953
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:22
+msgid "NavalPlan: Work report admin query"
+msgstr "NavalPlan: Consulta de administración de partes de trabajo"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:968
 msgid "Some cost category assignments overlap in time"
 msgstr "Algunas asignaciones a categorías de coste se solapan en el tiempo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:242
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:179
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:169
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:73
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47
-#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:36
-#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:38
-#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:38
-#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40
-#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:40
-#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:39
-#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:77
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:128
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:40
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88
-#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
-#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:69
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:92
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:126
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:124
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:135
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:80
-msgid "Save"
-msgstr "Guardar"
-
 #: 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
@@ -2147,11 +3883,11 @@ msgstr "Salir de la sesión"
 
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:55
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:26
 #: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
-#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62
 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26
 msgid "Enabled"
 msgstr "Activado"
@@ -2160,61 +3896,23 @@ msgstr "Activado"
 msgid "Statistics list "
 msgstr "Lista de estadísticas "
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21
-msgid "NavalPlan: QualityForms"
-msgstr "NavalPlan: Formularios de calidad"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:276
+msgid "Filter by worker"
+msgstr "Filtrar por trabajadores"
 
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
-msgid "Edit advance type data"
-msgstr "Editar datos del tipo de avance"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131
-msgid "Pending update"
-msgstr "Actualización pendiente"
-
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59
-msgid "End date:"
-msgstr "Fecha de fin:"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:159
-msgid "Criterion previously selected"
-msgstr "Criterio seleccionado previamente"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:938
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:985
-msgid ""
-"Value is not valid, the value must be greater than the value of the previous "
-"advances."
-msgstr ""
-"El valor no es válido, el valor debe ser mayor que el valor de los avances "
-"anteriores."
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:295
-msgid "Order Element code cannot be null"
-msgstr "El código del elemento de pedido no puede ser nulo"
+#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:21
+msgid "NavalPlan: Machines"
+msgstr "NavalPlan: Máquinas"
 
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43
 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:41
 msgid "Assigned hours"
 msgstr "Horas asignadas"
 
-#: 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 "Estado de las tareas de planificacion de un pedido"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:62
-msgid "Users authorization"
-msgstr "Autorización de usuarios"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1009
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1148
 msgid "You are going to change the assignment function. Are you sure?"
 msgstr "Va a cambiar la función de asignación. ¿Está seguro?"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:170
-msgid "Problems connecting with subcontractor web service"
-msgstr "Problemas conectando con el servicio web subcontratista"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:148
 msgid "There must be at least 2 stretches for doing interpolation"
 msgstr "Debe haber al menos dos tramos para hacer interpolación"
@@ -2223,121 +3921,68 @@ msgstr "Debe haber al menos dos tramos para hacer interpolación"
 msgid "Show all labels"
 msgstr "Mostrar todas las etiquetas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:257
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:297
 msgid "Incompatible update: stored resource is not of type: {0}"
 msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}"
 
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38
-msgid "Assigned load"
-msgstr "Carga asignada"
-
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68
-msgid "Filter by workers"
-msgstr "Filtrar por trabajadores"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:108
-msgid "End Date"
-msgstr "Fecha de fin"
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:212
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:86
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:112
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:94
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:40
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:107
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82
+msgid "Save & Continue"
+msgstr "Guardar y continuar"
 
 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:51
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:54
-#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:12
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:25
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:64
 #: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:2
 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
 msgid "Filter"
 msgstr "Filtrar"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:187
-msgid "Resources Per Day"
-msgstr "Recursos por día"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:187
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167
-msgid "ResourceType must be not-null"
-msgstr "ResourceType no debe ser nulo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:94
-msgid ""
-"Estimated end date for the task (press enter in textbox to open calendar "
-"popup or type in date directly)"
-msgstr ""
-"Fecha de fin estimada para la tarea (presione enter en el cuadro de texto "
-"para abrir el calendario o escriba la fecha directamente)"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519
 msgid "Order saved"
 msgstr "Pedido guardado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:475
-msgid "Move down"
-msgstr "Mover abajo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471
-msgid "Name: {0}"
-msgstr "Nombre: {0}"
-
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26
-msgid "Report structure"
-msgstr "Estructura del parte"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:84
-msgid "password not specified"
-msgstr "contraseña no especificada"
-
-#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56
-msgid "Yes"
-msgstr "Sí"
-
 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:25
 msgid "Assigned locations"
 msgstr "Ubicaciones asignadas"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:57
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39
-msgid "General data"
-msgstr "Datos generales"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:235
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237
 msgid "Hours worked per worker"
 msgstr "Horas trabajadas por trabajador"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57
-msgid "BAC"
-msgstr "BAC"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:217
+msgid "Unit type saved"
+msgstr "Tipo de unidad guardado"
 
-#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:13
-msgid "Apply filtering to machines satisfying required criteria"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:481
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:533
+msgid "Order element {0} : OrderLineGroup is incompatible type with {1}"
 msgstr ""
-"Aplicar filtrado a las máquinas que satisfacen los criterios requeridos"
+"Elemento de pedido {0} : El grupo de líneas de pedido tiene un tipo "
+"incompatible con {1}"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:301
-msgid "Calculate Number of Hours"
-msgstr "Calcular número de horas"
-
-#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:37
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:295
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80
-msgid "Assign"
-msgstr "Asignar"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:121
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:161
 msgid "Two hour costs with the same type overlap in time"
 msgstr "Dos costes por hora con el mismo tipo se solapan en el tiempo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:129
-msgid "missing code in a criterion"
-msgstr "falta código en un criterio"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:500
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:946
-#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39
-msgid "Create Template"
-msgstr "Crear plantilla"
-
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:63
 msgid "Ok"
 msgstr "Aceptar"
@@ -2346,49 +3991,41 @@ msgstr "Aceptar"
 msgid "ACWP"
 msgstr "ACWP"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168
-msgid "Advance type saved"
-msgstr "Tipo de avance guardado"
-
 #: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:48
 msgid "START"
 msgstr "INICIO"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:379
+msgid "Non limiting resource assignation"
+msgstr "Asignación de recursos no limitantes"
+
 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:74
 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:81
 msgid "Back"
 msgstr "Atrás"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57
-msgid "Schedule Variance"
-msgstr "Desviación en planificación"
-
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56
 msgid "Subcontractor"
 msgstr "Subcontratista"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:219
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:220
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40
 #: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java:32
 msgid "Administration"
 msgstr "Administración"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1367
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1530
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:545
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:466
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:163
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:247
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:658
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:979
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1449
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1612
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:564
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:476
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java:190
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java:267
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:815
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:984
 msgid "must be greater than start date"
 msgstr "debe ser mayor que la fecha de inicio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:371
-msgid "Service does not manage resource of type: {0}"
-msgstr "El servicio no gestiona recursos del tipo: {0}"
-
 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:35
 msgid "Work report listing"
 msgstr "Listado de partes de trabajo"
@@ -2402,83 +4039,44 @@ msgstr "Cancelar y volver"
 msgid "Assign quality form"
 msgstr "Asignar formulario de calidad"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39
-msgid "Edit worker"
-msgstr "Editar trabajador"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:382
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:386
 msgid "Delete item {0}. Are you sure?"
 msgstr "Borrar elemento {0}. ¿Está seguro?"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1025
-#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:57
-msgid "Warning"
-msgstr "Advertencia"
-
-#: 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 "Seleccionar el calendario padre"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67
-msgid "Hours of day"
-msgstr "Horas del día"
+#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:49
+msgid "Unit measure name"
+msgstr "Nombre de la unidad de medida"
 
 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37
 msgid "worked hours"
 msgstr "horas trabajadas"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297
-msgid "criterion satisfaction with end date less than start date"
-msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:451
+msgid "a work report line has not this label type assigned"
+msgstr "una línea de parte de trabajo no tiene este tipo de etiqueta asignada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1087
-msgid "Stretches"
-msgstr "Tramos"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:175
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:88
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:69
 msgid "Allocations"
 msgstr "Asignaciones"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47
-msgid "Show"
-msgstr "Mostrar"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:86
-msgid "Duration (days)"
-msgstr "Duración (días)"
-
-#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:30
-msgid "Assignment Type"
-msgstr "Tipo de asignación"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:64
-msgid "Capacity"
-msgstr "Capacidad"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
 msgid "Length"
 msgstr "Longitud"
 
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:83
+msgid "Capacity"
+msgstr "Capacidad"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:337
 msgid "Create derived"
 msgstr "Crear derivado"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/timeout.zul:28
-msgid "Back to log in"
-msgstr "Volver a iniciar sesión"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:437
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:468
 msgid "it must be greater than zero"
 msgstr "debe ser mayor que cero"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:475
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:477
-msgid "Error on splitting"
-msgstr "Error al dividir"
-
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129
 msgid "must be a real positive number"
 msgstr "debe ser un número real positivo"
@@ -2487,40 +4085,14 @@ msgstr "debe ser un número real positivo"
 msgid "No Allocations have been done"
 msgstr "No se han hecho asignaciones"
 
-#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21
-#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21
-#: navalplanner-webapp/src/main/webapp/planner/main.zul:21
-#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21
-#: navalplanner-webapp/src/main/webapp/planner/index.zul:21
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:21
-msgid "NavalPlan: Scheduling"
-msgstr "NavalPlan: planificación"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:187
 msgid "Removed calendar \"{0}\""
 msgstr "Borrado calendario \"{0}\""
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:257
-msgid "Node without children"
-msgstr "Nodo sin hijos"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43
-#: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:43
-msgid "&lt;&lt;"
-msgstr "&lt;&lt;"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:91
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:99
 msgid "START_IN_FIXED_DATE"
 msgstr "COMENZAR_EN_FECHA_FIJA"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:134
-msgid "Profile saved"
-msgstr "Perfil guardado"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:53
-msgid "Task properties"
-msgstr "Propiedades de la tarea"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:620
 msgid ""
 "You can not remove the order element \"{0}\" because of any of its order "
@@ -2529,41 +4101,10 @@ msgstr ""
 "No puede borrarse el elemento de pedido \"{0}\" porque uno de sus elementos "
 "se está usando en algún parte de trabajo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1024
-msgid "You need to select some function to configure"
-msgstr "Necesita seleccionar alguna función para configurar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:64
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:72
 msgid "as soon as possible"
 msgstr "tan pronto como sea posible"
 
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:33
-msgid "Surname"
-msgstr "Apellidos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:649
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:372
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:124
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:67
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:115
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45
-#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45
-#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45
-#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48
-#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:8
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
-msgid "Date"
-msgstr "Fecha"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:360
-msgid "the name must be not null or not empty"
-msgstr "el nombre no puede ser nulo o vacío"
-
 #: 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 "el NIF de la empresa debe ser único. Ya está siendo usado"
@@ -2583,20 +4124,10 @@ msgstr ""
 "presentes."
 
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:46
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:99
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:101
 msgid "New work report"
 msgstr "Nuevo parte de trabajo"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:64
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:74
-msgid "Order lines imputation"
-msgstr "Imputación de líneas de pedido"
-
-#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:26
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:23
-msgid "Advance assignments"
-msgstr "Asignaciones de avances"
-
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:45
 msgid "A3"
 msgstr "A3"
@@ -2605,133 +4136,65 @@ msgstr "A3"
 msgid "Date Finish"
 msgstr "Fecha de fin"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:200
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:94
+msgid "Validate"
+msgstr "Validar"
+
 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:41
 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:33
 msgid "Edit order element"
 msgstr "Editar elemento de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:337
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:340
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:306
-msgid "The criterion and its type cannot be null"
-msgstr "El criterio y su tipo no pueden ser nulos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:200
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91
-msgid "Validate"
-msgstr "Validar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:199
-msgid "Error on removing element: "
-msgstr "Error al borrar elemento: "
-
 #: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34
 #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:3
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
 msgid "Cost category assignment"
 msgstr "Asignación de categoría de coste"
 
-#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63
-msgid "Cannot calculate charts for current data"
-msgstr "No se pueden calcular gráficos para los datos actuales"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:145
+msgid "missing code in a hour cost"
+msgstr "falta código en un coste por hora"
 
-#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57
-msgid "Found workers"
-msgstr "Trabajadores encontrados"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:462
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:451
 msgid "All workers"
 msgstr "Todos los trabajadores"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:239
-#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48
-msgid "Work description"
-msgstr "Descripción del trabajo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:224
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:225
 msgid "Label saved"
 msgstr "Etiqueta guardada"
 
-#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:36
-#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:41
-msgid "Split assignment"
-msgstr "Dividir asignación"
-
-#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:3
+#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:5
 #: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3
 #: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:3
 msgid "Select required criteria set and press filter button"
 msgstr ""
 "Seleccione conjunto de criterios requeridos y pulse el botón de filtrar"
 
-#: 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 ""
-"Al subcontratar esta tarea, todas sus asignaciones de recursos se borrarán."
-
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:181
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:171
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:75
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:80
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:91
-#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
-#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:71
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:128
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:127
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:82
-msgid "Save & Continue"
-msgstr "Guardar y continuar"
-
-#: 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 "enlace directo"
-
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104
-msgid "Down"
-msgstr "Abajo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:928
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:47
-msgid "Label"
-msgstr "Etiqueta"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:238
-msgid "Order costs per resource"
-msgstr "Costes de pedido por recurso"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:173
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:174
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:175
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:224
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:237
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:218
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:247
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:302
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:265
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:280
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:309
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:114
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:133
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:42
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:68
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:48
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:46
 #: 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/materials/materials.zul:96
 #: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:70
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:49
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:82
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:86
 #: 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/costcategories/_editTypeOfWorkHours.zul:54
 #: 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
@@ -2740,52 +4203,20 @@ msgstr "Costes de pedido por recurso"
 msgid "cannot be null or empty"
 msgstr "no puede ser nulo o vacío"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:448
-msgid "Value is not valid, taking into account the current list of HoursGroup"
-msgstr ""
-"El valor no es válido, teniendo en cuenta la lista actual de grupos de horas"
-
 #: 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 "Código nuevo"
 
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:72
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:48
-msgid "Association with roles"
-msgstr "Asociación con roles"
-
-#: 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 "Formularios de calidad"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:326
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:405
 msgid "Calculate Resources per Day"
 msgstr "Calcular recursos por día"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:140
-msgid "Hours group"
-msgstr "Grupo de horas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59
-msgid "Estimate At Completion"
-msgstr "Estimación de coste total actual"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:990
 msgid "The index fields and labels must be uniques and consecutives"
 msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas"
 
-#: navalplanner-webapp/src/main/webapp/templates/_list.zul:29
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:92
-msgid "Days from Beginning to Deadline"
-msgstr "Días desde el comienzo hasta la fecha límite"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27
-msgid "Indirect"
-msgstr "Indirecto"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:237
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:248
 msgid ""
 "Are you sure of changing the resource type? You will lose the criterions "
 "with different resource type."
@@ -2797,136 +4228,68 @@ msgstr ""
 msgid "Estimate To Complete"
 msgstr "Estimación del coste pendiente"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:207
-msgid "Edit machine"
-msgstr "Editar máquina"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:511
+msgid "Cannot delete that material because it is assigned to an order."
+msgstr "No se puede borrar ese material porque está asignado a un pedido."
 
-#: 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 "Borrar elemento. ¿Está seguro?"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:101
-msgid "cost assignment's start date not specified"
-msgstr "fecha de inicio de la asignación de coste no especificada"
-
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:92
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:88
 #: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:9
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:10
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:111
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109
 msgid "Unit type"
 msgstr "Tipo de unidad"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java:47
-#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:34
-#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45
-#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:42
-msgid "Order code"
-msgstr "Código de pedido"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java:122
-msgid "materialcode has to be unique. It is already used"
-msgstr "el código del material debe ser único. Ya está en uso"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25
-msgid "Direct"
-msgstr "Directo"
-
-#: 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 "Formato de salida:"
+#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22
+msgid "NavalPlan: Type of work hours"
+msgstr "NavalPlan: Tipo de horas de trabajo"
 
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41
 msgid "Load due to other assignments"
 msgstr "Carga debido a otras asignaciones"
 
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55
-#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55
-msgid "Reference date:"
-msgstr "Fecha de referencia:"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:76
-msgid "Work week"
-msgstr "Semana de trabajo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:126
-msgid "You will lose the changes. Are you sure?"
-msgstr "Se perderán los cambios. ¿Está seguro?"
-
-#: 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 "Lista de pedidos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207
-msgid "Virtual worker groups"
-msgstr "Grupos de trabajadores virtuales"
-
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25
 msgid "Calendar data"
 msgstr "Datos del calendario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:288
-msgid "Resource cannot be null"
-msgstr "El recurso no puede ser nulo"
-
-#: navalplanner-webapp/src/main/webapp/templates/_list.zul:27
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:87
-msgid "Delay from beginning (days)"
-msgstr "Retraso desde el comienzo (en días)"
-
 #: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:137
 msgid "login name is already being used by another user"
 msgstr "el nombre de usuario ya está siendo usado"
 
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
-msgid "Total Hours"
-msgstr "Horas totales"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:102
+#: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:106
 msgid "code is already used"
 msgstr "el código ya está siendo usado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71
-msgid "All orders"
-msgstr "Todos los pedidos"
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:66
+msgid "Task start :"
+msgstr "Inicio de la tarea :"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:148
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:151
 msgid "Criterion Requirements"
 msgstr "Criterios requeridos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:127
-msgid "Confirm cancel"
-msgstr "Confirmar cancelación"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:613
+msgid "Calculated advances can not be removed"
+msgstr "Los avances calculados no se pueden borrar"
 
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:21
 msgid "External companies listing"
 msgstr "Listado de empresas externas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:187
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:183
 msgid "Order from client"
 msgstr "Pedido del cliente"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:136
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:167
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:126
 msgid "OrderElement Code"
 msgstr "Código del elemento de pedido"
 
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:50
-msgid "Label list"
-msgstr "Lista de etiquetas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:229
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231
 msgid "Manage user profiles"
 msgstr "Administrar perfiles de usuario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:120
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:133
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:124
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:137
 msgid "spread values are not valid, at least one value should be true"
 msgstr ""
 "los valores de propagación no son válidos, al menos uno debe ser verdadero"
@@ -2939,22 +4302,7 @@ msgstr "Crear y asignar etiqueta"
 msgid "SV"
 msgstr "SV"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:75
-msgid "start not earlier than"
-msgstr "empezar no antes de"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1088
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:212
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:147
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:392
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:249
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:206
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:600
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:185
-msgid "Error on showing removing element: "
-msgstr "Error al mostrar el elemento a borrar: "
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1319
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1401
 msgid "Filter work reports"
 msgstr "Filtrar partes de trabajo"
 
@@ -2970,50 +4318,27 @@ msgstr "Listado de categorías de coste"
 msgid "Direct imputation"
 msgstr "Imputación directa"
 
-#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
-msgid "Criterion requirement"
-msgstr "Criterios requeridos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:148
-msgid ""
-"Still not saved changes would be lost. Are you sure you want to go to create "
-"a template?"
-msgstr ""
-"Los cambios que no hayan sido guardados se perderán. ¿Está seguro de que "
-"quiere ir a la creación de plantillas?"
-
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:34
-msgid "PDF"
-msgstr "PDF"
-
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66
 msgid "Price per hour"
 msgstr "Precio por hora"
 
-#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75
-msgid "Orders"
-msgstr "Pedidos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:222
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:223
 msgid "Calendars"
 msgstr "Calendarios"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:102
-msgid "Scheduling saved"
-msgstr "Planificación guardada"
+#: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:20
+msgid "NavalPlan: Page not found"
+msgstr "NavalPlan: Página no encontrada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:321
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:323
 msgid "The date cannot be null"
 msgstr "La fecha no puede ser nula"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:165
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:155
-#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:6
-#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:57
-msgid "Add new row"
-msgstr "Añadir nueva fila"
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22
+msgid "NavalPlan: Work report types"
+msgstr "NavalPlan: Tipos de partes de trabajo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:388
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:392
 msgid "Error on showing delete confirm"
 msgstr "Error al mostrar la confirmación de borrado"
 
@@ -3021,54 +4346,32 @@ msgstr "Error al mostrar la confirmación de borrado"
 msgid "Show only current satisfied criteria"
 msgstr "Mostrar solo los criterios satisfechos actualmente"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138
-msgid "Could not save new criterion"
-msgstr "No se pudo guardar el nuevo criterio"
+#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21
+msgid "Users listing"
+msgstr "Listado de usuarios"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:651
+msgid "Sum of all rows"
+msgstr "Suma de todas las filas"
 
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:44
 msgid "order element :"
 msgstr "elemento de pedido :"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:528
-msgid "Sum of all rows"
-msgstr "Suma de todas las filas"
-
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33
-msgid "Overload"
-msgstr "Sobrecarga"
-
-#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:21
-msgid "Users listing"
-msgstr "Listado de usuarios"
-
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:72
 msgid "Finish hour"
 msgstr "Hora de fin"
 
-#: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:64
-msgid "Assignment log"
-msgstr "Histórico de asignación"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:162
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:259
 msgid "Done {0} of {1}"
 msgstr "Hecho {0} de {1}"
 
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46
-msgid "Load due to current order"
-msgstr "Carga debido al pedido actual"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:93
-msgid "Deadline (days since beggining project)"
-msgstr "Fecha límite (días desde el inicio del proyecto)"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:225
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:337
 #: navalplanner-business/src/main/java/org/navalplanner/business/common/daos/OrderSequenceDAO.java:72
 msgid "You can not remove this order sequence, it is already in use"
 msgstr "No se puede borrar esta secuencia de pedido, está siendo usada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:152
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:153
 msgid "Edit label type"
 msgstr "Editar tipo de etiqueta"
 
@@ -3080,40 +4383,23 @@ msgstr ""
 "El último tramo debe tener 100% de porcentajes de longitud y cantidad de "
 "trabajo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:376
-msgid "number of hours is not properly calculated based on clock"
-msgstr "número de horas no calculado correctamente basado en reloj"
-
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31
 msgid "Each worker configuration unit name"
 msgstr "Nombre de la unidad de configuración de cada trabajador"
 
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:39
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40
 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:41
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:78
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:132
 msgid "Active"
 msgstr "Activo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:718
-msgid "Value is not valid, the type must be not empty"
-msgstr "El valor no es válido, el tipo no debe ser vacío"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:406
-msgid "criterion type name is already being used"
-msgstr "el nombre de tipo de criterio está siendo usado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:393
-msgid "Could not get order code, please try again later"
-msgstr ""
-"No se pudo obtener código de pedido, por favor inténtelo otra vez luego"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:732
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:918
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:821
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1024
 msgid "Value is not valid, the current value must be not empty"
 msgstr "El valor no es válido, el valor actual no debe ser vacío"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:261
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:518
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:285
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:545
 msgid "Unindent"
 msgstr "Desindentar"
 
@@ -3125,38 +4411,14 @@ msgstr "Etiquetas directas"
 msgid "Delete order element"
 msgstr "Borrar elemento de pedido"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:85
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:86
 msgid "Log in"
 msgstr "Entrar"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30
-#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29
-#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79
-#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:26
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:82
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:112
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:58
-#: navalplanner-webapp/src/main/webapp/users/_listUsers.zul:27
-msgid "Actions"
-msgstr "Acciones"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:56
 msgid "Order Scheduling"
 msgstr "Planificación de pedidos"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:218
-#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44
-msgid "External company"
-msgstr "Empresa externa"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:145
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:72
-msgid "New order element"
-msgstr "Nuevo elemento de pedido"
-
 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:52
 msgid "Precision"
 msgstr "Precisión"
@@ -3165,44 +4427,28 @@ msgstr "Precisión"
 msgid "Date last advance measurement"
 msgstr "Fecha de la última medida de avance"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:71
-msgid "Start hour"
-msgstr "Hora de inicio"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75
-msgid "Exceptions"
-msgstr "Excepciones"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:690
-msgid ""
-"You can not remove the order element \"{0}\" because of this or any of its "
-"children are already in use in some work reports"
-msgstr ""
-"No puede borrarse el elemento de pedido \"{0}\" porque uno de sus hijos se "
-"está usando en algún parte de trabajo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:173
-msgid "format filters are not valid"
-msgstr "los filtros de formato no son válidos"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:339
+msgid "missing code in a work report line"
+msgstr "falta código en una línea de parte de trabajo"
 
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:28
 msgid "Indirect labels"
 msgstr "Etiquetas indirectas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:473
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:645
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:680
-msgid "You don't have read access to this order"
-msgstr "No tiene acceso de lectura a este pedido"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:109
 msgid "Scheduling state"
 msgstr "Estado de planificación"
 
-#: 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 "La fecha de inicio no puede ser vacía"
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:135
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:70
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48
+#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:43
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:64
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:51
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45
+msgid "Generate code"
+msgstr "Generar código"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:172
 msgid ""
@@ -3212,10 +4458,6 @@ msgstr ""
 "El calendario no fue borrado porque aún tiene hijos. Algún otro calendario "
 "deriva de este."
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88
-msgid "Our company password"
-msgstr "Contraseña de nuestra empresa"
-
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:27
 msgid "Select print page properties"
 msgstr "Seleccione las propiedades de la página de impresión"
@@ -3224,15 +4466,7 @@ msgstr "Seleccione las propiedades de la página de impresión"
 msgid "criterion satisfaction's criterion not specified"
 msgstr "criterio del criterio satisfecho no especificado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:182
-msgid "Create machine"
-msgstr "Crear máquina"
-
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:46
-msgid "A2"
-msgstr "A2"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:241
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:291
 msgid "Machine"
 msgstr "Máquina"
 
@@ -3241,37 +4475,25 @@ msgstr "Máquina"
 msgid "Reload"
 msgstr "Recargar"
 
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:21
-msgid "Criterion type list"
-msgstr "Lista de tipos de criterio"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:379
-msgid ""
-"Value is not valid.\n"
-" Code cannot contain chars like '_'."
-msgstr ""
-"El valor no es válido.\n"
-" El código no puede contener caracteres como '_'."
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java:121
+msgid "Edit order element {0}"
+msgstr "Editar elemento de pedido {0}"
 
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:25
 msgid "Profiles authorization"
 msgstr "Autorización de perfiles"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:157
-msgid "Hours Group"
-msgstr "Grupo de horas"
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:98
+msgid "Planning charts expanded"
+msgstr "Gráficos de planificación expandidos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:909
-msgid "Unallocated name"
-msgstr "Nombre no asignado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:496
-msgid "Move up"
-msgstr "Mover arriba"
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:76
+msgid "Assignation"
+msgstr "Asignación"
 
 #: 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/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:316
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:45
 msgid "Not deletable"
 msgstr "Imborrable"
 
@@ -3284,7 +4506,7 @@ msgid "Create quality form"
 msgstr "Crear formulario de calidad"
 
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:60
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:71
 #: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:34
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:26
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45
@@ -3292,7 +4514,7 @@ msgstr "Crear formulario de calidad"
 msgid "NIF"
 msgstr "NIF"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:187
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:194
 msgid ""
 "Templates can only be created from already existent order elements.\n"
 "Newly order elements cannot be used."
@@ -3301,28 +4523,10 @@ msgstr ""
 "existentes.\n"
 "No se pueden usar elementos de pedido nuevos."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:152
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java:249
 msgid "Doing {0} reassignations"
 msgstr "Realizando {0} reasignaciones"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55
-msgid "BCWP"
-msgstr "BCWP"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:196
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:256
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:117
-msgid "Scheduling"
-msgstr "Planificación"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:234
-msgid "Subcontract communication date"
-msgstr "Fecha de comunicación de la subcontratación"
-
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:118
-msgid "Dependencies have priority"
-msgstr "Las dependencias tienen prioridad"
-
 #: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45
 msgid "code not specified"
 msgstr "código no especificado"
@@ -3331,18 +4535,6 @@ msgstr "código no especificado"
 msgid "Confirmation"
 msgstr "Confirmación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58
-msgid "Budget At Completion"
-msgstr "Total coste planificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java:52
-msgid "Nif"
-msgstr "Nif"
-
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:76
-msgid "Assign Label"
-msgstr "Asignar etiqueta"
-
 #: 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."
@@ -3350,53 +4542,20 @@ msgstr ""
 "No se puede borrar el tipo de parte de trabajo. Hay algún parte de trabajo "
 "ligado a él."
 
-#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21
-msgid "Type of work hours listing"
-msgstr "Listado de tipos de horas de trabajo"
-
-#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21
-msgid "List label types"
-msgstr "Listar tipos de etiqueta"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:24
-#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50
-#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:151
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:35
-msgid "State"
-msgstr "Estado"
-
-#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62
-msgid "Work done from starting date:"
-msgstr "Trabajo realizado desde la fecha de inicio:"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:79
-msgid "Must start after"
-msgstr "Debe empezar después"
-
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:72
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:73
 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:47
 msgid "Password"
 msgstr "Contraseña"
 
 #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:68
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:87
 msgid "Observations"
 msgstr "Observaciones"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1010
-msgid "Confirm change"
-msgstr "Confirmar cambio"
-
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:37
-msgid "Single image"
-msgstr "Imagen simple"
-
 #: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:169
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:192
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:216
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:163
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:185
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:209
 msgid "Valid from"
 msgstr "Válido desde"
 
@@ -3404,92 +4563,63 @@ msgstr "Válido desde"
 msgid "There exists other template with the same name."
 msgstr "Ya existe otra plantilla con el mismo nombre."
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:214
+msgid "exception date already exists"
+msgstr "la fecha de excepción ya existe"
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:56
 msgid "Month"
 msgstr "Mes"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:463
-msgid "Exception"
-msgstr "Excepción"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:709
+msgid "Advanced assignment saved"
+msgstr "Asignación avanzada guardada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:122
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:124
 msgid "At least one order sequence is needed"
 msgstr "Se necesita al menos una secuencia de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:676
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:677
 msgid "Edit order"
 msgstr "Editar pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:194
-msgid "Send"
-msgstr "Enviar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:280
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:357
 msgid "Cannot insert material in general view. Please, select a category"
 msgstr ""
 "No se puede insertar material en la vista general. Por favor, seleccione una "
 "categoría"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:58
-msgid "user"
-msgstr "usuario"
-
 #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:194
 msgid "criterion satisfaction's start date not specified"
 msgstr "fecha de inicio del criterio satisfecho no especificada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:115
-msgid "The password for a new user cannot be empty"
-msgstr "La contraseña no puede ser vacía  para un usuario nuevo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:155
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:185
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:30
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13
-#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26
-msgid "All"
-msgstr "Todo"
-
-#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26
-msgid "Type name"
-msgstr "Nombre del tipo"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:50
 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:38
 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:42
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82
 #: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:65
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:273
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:86
 msgid "Accept"
 msgstr "Aceptar"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:21
-msgid "Calendars List"
-msgstr "Lista de calendarios"
-
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79
 msgid "Example: {0}"
 msgstr "Ejemplo: {0}"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:453
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:457
 msgid ""
 "Create new material assignment out of material assignment {0}. Are you sure?"
 msgstr ""
 "Crear nueva asignación de material fuera de la asignación de material {0}. "
 "¿Está seguro?"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:216
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:239
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:236
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:259
 msgid "Edit Worker"
 msgstr "Editar trabajador"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:183
-msgid "Cannot be higher than Ending date"
-msgstr "No puede ser mayor que la fecha de fin"
-
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:161
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:192
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:151
 msgid "Work report lines"
 msgstr "Líneas del parte de trabajo"
@@ -3498,46 +4628,18 @@ msgstr "Líneas del parte de trabajo"
 msgid "Calculated"
 msgstr "Calculado"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:221
-msgid "Create activation period"
-msgstr "Crear período de activación"
-
-#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:6
-msgid "Personal details"
-msgstr "Detalles personales"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205
-msgid "Workers List"
-msgstr "Lista de trabajadores"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:243
-msgid "Worker"
-msgstr "Trabajador"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:188
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168
-msgid "Criterion must be not-null"
-msgstr "El criterio no debe ser nulo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:152
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:147
-msgid "criterion name not specified"
-msgstr "nombre del criterio no especificado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:116
+msgid "Error setting up edition form for Criterion Type with id: {0}"
+msgstr ""
+"Error preparando el formulario de edición para el tipo de criterio con id: "
+"{0}"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:309
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:315
 msgid " The "
 msgstr " El "
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:134
-msgid "Value is not valid, the default max value must not be empty "
-msgstr "El valor no es válido, el valor máximo por defecto no debe ser nulo "
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:199
-msgid "the "
-msgstr "el "
-
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:44
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:45
 msgid "Access to the system"
 msgstr "Acceso al sistema"
 
@@ -3551,24 +4653,11 @@ msgstr "Acceso al sistema"
 msgid "Click on "
 msgstr "Click en"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74
-msgid "Advance Progress"
-msgstr "Progreso de avance"
-
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:28
-msgid "External overload"
-msgstr "Sobrecarga externa"
-
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:108
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:110
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:99
 msgid "Report data"
 msgstr "Datos del informe"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:69
-msgid "Authorize"
-msgstr "Autorizar"
-
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:43
 msgid "External load"
 msgstr "Carga externa"
@@ -3586,26 +4675,39 @@ msgstr "Notificar avance"
 msgid "instance not found"
 msgstr "instancia no encontrada"
 
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:78
+msgid "Priority"
+msgstr "Prioridad"
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:36
 msgid "Landscape"
 msgstr "Apaisado"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:387
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:392
 msgid "criterion names must be unique inside a criterion type"
 msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:168
-msgid "Create order from Template"
-msgstr "Crear pedido a partir de plantilla"
-
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:760
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:63
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:130
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:65
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:39
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:35
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43
 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:33
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:89
+#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:35
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:63
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:46
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25
-#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39
 #: 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
@@ -3618,7 +4720,7 @@ msgstr "Crear pedido a partir de plantilla"
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:7
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:72
 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:28
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:109
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:107
 msgid "Code"
 msgstr "Código"
 
@@ -3626,28 +4728,24 @@ msgstr "Código"
 msgid "Filters"
 msgstr "Filtros"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:289
-msgid "Materials saved"
-msgstr "Materiales guardados"
-
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:40
 msgid "Add stretch"
 msgstr "Añadir tramo"
 
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:55
-msgid "Quarter"
-msgstr "Cuarto"
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:75
+msgid "Assignation type"
+msgstr "Tipo de asignación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:217
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:202
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:216
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:201
 msgid ""
 "Start date is not valid, the new start date must be lower than the end date"
 msgstr ""
 "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior "
 "a la fecha de fin"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:539
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:980
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:501
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:934
 msgid "Hours for an exception day should be greater or equal than zero"
 msgstr ""
 "Las horas para un día de excepción deben ser mayores o iguales que cero"
@@ -3658,12 +4756,12 @@ msgstr ""
 msgid "Start date"
 msgstr "Fecha de inicio"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:138
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:133
 msgid "Update exception"
 msgstr "Actualizar excepción"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:189
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:202
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:196
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:209
 msgid "Operation cannot be done"
 msgstr "No se puede efectuar la operación"
 
@@ -3672,7 +4770,7 @@ msgstr "No se puede efectuar la operación"
 msgid "Budget"
 msgstr "Presupuesto"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:320
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:322
 msgid "Already exists other criterion with the same name"
 msgstr "Ya existe otro criterio con el mismo nombre"
 
@@ -3680,25 +4778,6 @@ msgstr "Ya existe otro criterio con el mismo nombre"
 msgid "Unit name"
 msgstr "Nombre de la unidad"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:217
-msgid "Could open generated PDF"
-msgstr "No se pudo abrir el PDF generado"
-
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:45
-msgid "Code cannot be null or empty"
-msgstr "El código no puede ser nulo o vacío"
-
-#: 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 "Nombre del perfil"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:106
-msgid "Disable Delete"
-msgstr "Deshabilitar borrado"
-
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68
 msgid "Write"
@@ -3708,7 +4787,7 @@ msgstr "Escribir"
 msgid "Number of applications"
 msgstr "Número de aplicaciones"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:41
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:42
 msgid "Filter type"
 msgstr "Tipo de filtro"
 
@@ -3720,71 +4799,41 @@ msgstr ""
 "Fecha después de la cual la tarea debe empezar (presione enter en el cuadro "
 "de texto para abrir el calendario o escriba la fecha directamente)"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67
-msgid "Assigned"
-msgstr "Asignado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:191
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:468
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:192
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:450
 msgid "Normal"
 msgstr "Normal"
 
-#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:39
-msgid "Details"
-msgstr "Detalles"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:281
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:282
 msgid "Date cannot be null"
 msgstr "La fecha no puede ser nula"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:158
-msgid ""
-"The name is not valid, there is another advance type with the same name. "
-msgstr ""
-"El nombre no es válido, ya hay otro tipo de avance con el mismo nombre. "
-
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84
 msgid "Advance type"
 msgstr "Tipo de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:239
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172
-msgid "Error: {0}"
-msgstr "Error: {0}"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:135
-msgid "Company saved"
-msgstr "Empresa guardada"
-
 #: 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 "Este tipo de etiqueta ya está asignado al tipo de parte de trabajo."
 
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52
-msgid "Do you want to delete &quot;{0}&quot;?"
-msgstr "¿Quiere borrar &quot;{0}&quot;?"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:421
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:282
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:410
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48
+msgid "Load"
+msgstr "Carga"
 
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27
 msgid "New criterion"
 msgstr "Criterio nuevo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:224
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:393
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48
-msgid "Load"
-msgstr "Carga"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168
-msgid "Parent"
-msgstr "Padre"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:644
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:648
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:61
 #: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:53
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:59
 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:90
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:86
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:31
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:112
 #: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
@@ -3793,60 +4842,40 @@ msgstr "Padre"
 msgid "Description"
 msgstr "Descripción"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:112
-msgid "Type of work hours saved"
-msgstr "Tipo de horas de trabajo guardado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:212
-msgid "Work report list"
-msgstr "Lista de partes de trabajo"
-
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:71
 msgid "Expand all taskgroups"
 msgstr "Expandir todos los grupos de tareas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63
-msgid "Not found converter for {0}"
-msgstr "No se encontró un conversor para {0}"
+#: navalplanner-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:22
+msgid "NavalPlan: External companies"
+msgstr "NavalPlan: Empresas externas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:86
-msgid "start in fixed date"
-msgstr "comenzar en fecha fija"
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:22
+msgid "NavalPlan: Criteria"
+msgstr "NavalPlan: Criterios"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:210
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:131
 msgid "Go to advanced Allocation"
 msgstr "Ir a asignación avanzada"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:261
-msgid "Material assignments"
-msgstr "Asignaciones de materiales"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:466
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:497
 msgid "already exists an allocation for criteria {0}"
 msgstr "ya existe una asignación para los criterios {0}"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:215
+msgid "Invalid queue element"
+msgstr "elemento de cola inválido"
+
 #: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:42
 msgid "Number of finished applications"
 msgstr "Número de aplicaciones finalizadas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:916
-msgid "Text field"
-msgstr "Campo de texto"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:120
-msgid ""
-"Value is not valid, the Precision value must be less than the defalt max "
-"value."
-msgstr ""
-"El valor no es válido, el valor de precisión debe ser menor que el valor "
-"máximo por defecto."
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:389
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:400
 msgid "At least one HoursGroup is needed"
 msgstr "Es necesario al menos un HoursGroup"
 
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:63
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:64
 #: navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java:156
 msgid "User"
 msgstr "Usuario"
@@ -3863,41 +4892,20 @@ msgstr "Múltiples valores por recurso"
 msgid "Hours:"
 msgstr "Horas:"
 
-#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:35
-#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:40
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:37
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:42
 msgid "Split"
 msgstr "Dividir"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:201
-msgid "Create new work week"
-msgstr "Crear nueva semana de trabajo"
-
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33
 msgid "Work report lines listing"
 msgstr "Listado de líneas de parte de trabajo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:136
-msgid "Create label type"
-msgstr "Crear tipo de etiqueta"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32
-msgid "Work record"
-msgstr "Registro de trabajo"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:287
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:100
 msgid "Select the calendar"
 msgstr "Seleccionar el calendario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174
-msgid "Criterion saved"
-msgstr "Criterio guardado"
-
-#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:129
-#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
-msgid "Output format"
-msgstr "Formato de salida"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:132
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java:134
 msgid "Order sequence prefixes can not be repeated"
 msgstr "Los prefijos de secuencia de pedido no pueden repetirse"
 
@@ -3914,84 +4922,14 @@ msgstr "Los prefijos de secuencia de pedido no pueden repetirse"
 msgid "Starting date"
 msgstr "Fecha de inicio"
 
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:77
-msgid "Print"
-msgstr "Imprimir"
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
+msgid "NavalPlan: Timeline material report"
+msgstr "NavalPlan: Informe de materiales a lo largo del tiempo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:153
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:113
-msgid "{0} not found type for criterion "
-msgstr "{0} no encontrado tipo para criterio "
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:368
-msgid "Hours cannot be null"
-msgstr "Las horas no pueden ser nulas"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:447
-msgid "resource type does not allow enabled criteria"
-msgstr "el tipo de recurso no permite criterios habilitados"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/assigntemplates/TemplateFinderPopup.java:51
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:185
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42
-#: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:175
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48
-#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:65
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:83
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:94
-#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84
-#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:94
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:130
-#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:40
-#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84
-#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:275
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:297
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46
-#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:139
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:84
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:745
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:873
 msgid "Function"
 msgstr "Función"
 
-#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:31
-msgid "Unschedule"
-msgstr "Quitar planificación"
-
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:32
-msgid "General user data"
-msgstr "Datos generales de usuario"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200
-msgid "Subcontracted task sent successfully"
-msgstr "Tarea subcontratada enviada con éxito"
-
-#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72
-msgid "Accumulated hours chart"
-msgstr "Gráfico de horas acumuladas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206
-msgid "Machines List"
-msgstr "Lista de máquinas"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21
-msgid "Virtual resources"
-msgstr "Recursos virtuales"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
-msgid "CPI"
-msgstr "CPI"
-
 #: 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
@@ -4005,25 +4943,26 @@ msgstr "Formato"
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java:529
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:68
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:487
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:899
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:644
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:904
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:370
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:74
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:76
 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:88
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:25
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:37
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:39
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:35
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:37
 #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:45
 #: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:45
-#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:46
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:49
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:48
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:42
+#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:23
 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24
-#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:34
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:36
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:40
 #: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:36
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:47
@@ -4037,14 +4976,6 @@ msgstr "Editar"
 msgid "Workers list"
 msgstr "Lista de trabajadores"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:91
-msgid ""
-"Some lines have not allocation periods.\n"
-"Below it shows the load all company resources"
-msgstr ""
-"Algunas líneas no tienen períodos de asignación.\n"
-"Debajo se muestra la carga de todos los recursos de la empresa"
-
 #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67
 msgid "Init date"
@@ -4054,50 +4985,20 @@ msgstr "Fecha de inicio"
 msgid "Responsible"
 msgstr "Responsable"
 
-#: 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 "Fechas"
-
-#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:8
-#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:9
-#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:17
-msgid "Units"
-msgstr "Unidades"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:159
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:153
 msgid "By default"
 msgstr "Por defecto"
 
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:39
-msgid "Create Calendar"
-msgstr "Crear Calendario"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:129
-msgid "At least one stretch is needed"
-msgstr "Se necesita al menos un tramo"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:182
-msgid "Satisfied"
-msgstr "Satisfecho"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:437
 msgid "percentage must be in range (0,100]"
 msgstr "el porcentaje debe pertenecer al rango (0,100]"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java:214
-msgid "Stretch date should be greater or equals than task start date"
-msgstr ""
-"La fecha de un tramo debe ser mayor o igual que la fecha de inicio de la "
-"tarea"
-
 #: 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 "Descripción nueva"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1028
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1043
 msgid ""
 "resources cost category assignment codes must be unique inside a resource"
 msgstr ""
@@ -4109,11 +5010,7 @@ msgstr ""
 msgid "XML"
 msgstr "XML"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60
-msgid "Task Properties"
-msgstr "Propiedades de la tarea"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:166
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:165
 msgid ""
 "CriterionType is not valid, the criterionType overlap other "
 "criterionSatisfaction whith same criterionType"
@@ -4121,36 +5018,14 @@ msgstr ""
 "CriterionType no válido, el criterionType se solapa con otro "
 "criterionSatisfaction con el mismo criterionType"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35
-msgid "Create new Work Report Type"
-msgstr "Crear nuevo tipo de parte de trabajo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:193
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:226
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:228
-msgid ""
-"End date is not valid, the new end date must be greater than the start date"
-msgstr ""
-"Fecha de fin inválida, la fecha de fin nueva debe ser posterior a la fecha "
-"de inicio"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:140
-msgid "Cost category saved"
-msgstr "Categoría de coste guardada"
-
-#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:12
-#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
-msgid "name"
-msgstr "nombre"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:61
 msgid "Unable to convert {0} value to {1} type"
 msgstr "No se pudo convertir el valor {0} al tipo {1}"
 
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:91
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87
 #: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:10
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:11
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:112
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:110
 msgid "Unit price"
 msgstr "Precio de la unidad"
 
@@ -4158,47 +5033,34 @@ msgstr "Precio de la unidad"
 msgid "Communication date"
 msgstr "Fecha de comunicación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:114
-msgid "{0} (max: {1})"
-msgstr "{0} (máx: {1})"
-
 #: navalplanner-webapp/src/main/webapp/planner/reassign.zul:29
 msgid "Reassigning"
 msgstr "Reasignando"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:388
-msgid "end"
-msgstr "fin"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:470
+msgid ""
+"Cannot delete that cost category because there are resources assigned to it."
+msgstr ""
+"No se puede borrar la categoría de coste porque hay recursos asignados a "
+"ella."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:442
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:473
 msgid "{0} already assigned to resource allocation list"
 msgstr "{0} ya está en la lista de asignación de recursos"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:62
-msgid "Log"
-msgstr "Diario"
+#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:26
+msgid "Unit Measure"
+msgstr "Unidad de medida"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:384
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:400
 msgid "The type of hours cannot be null."
 msgstr "El tipo de horas no puede ser nulo."
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56
-msgid "Authorizations"
-msgstr "Autorizaciones"
-
-#: navalplanner-webapp/src/main/webapp/common/event_error.zul:28
-#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:35
-msgid "Continue"
-msgstr "Continuar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:198
-msgid "Start date cannot be null"
-msgstr "La fecha de inicio no puede ser nula"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:52
 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:40
 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:62
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:126
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:40
@@ -4207,14 +5069,15 @@ msgstr "La fecha de inicio no puede ser nula"
 #: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
 #: navalplanner-webapp/src/main/webapp/templates/_advances.zul:35
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:24
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:121
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:42
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:47
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:149
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40
 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:42
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:179
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:173
 msgid "Type"
 msgstr "Tipo"
 
@@ -4222,53 +5085,23 @@ msgstr "Tipo"
 msgid "Associated Criteria"
 msgstr "Criterios asignados"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:930
-msgid "Value is not valid, the Precision value must be exact "
-msgstr "El valor no es válido, el valor de precisión debe ser exacto "
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49
-msgid "Generic"
-msgstr "Genérico"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53
 msgid "BCWS"
 msgstr "BCWS"
 
-#: 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 "La fecha de inicio de la excepción debe ser mayor que la fecha actual"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:271
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:275
 msgid " in the specified directory."
 msgstr " en el directorio especificado."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127
-msgid "Order does not exist"
-msgstr "El pedido no existe"
-
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76
 msgid "Autogenerated"
 msgstr "Autogenerado"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1022
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1037
 msgid "criterion satisfaction codes must be unique inside a resource"
 msgstr "el código del criterio debe ser único dentro de un recurso"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42
-#: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:45
-msgid "&gt;&gt;"
-msgstr "&gt;&gt;"
-
-#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:46
-msgid "Default max value"
-msgstr "Valor máximo por defecto"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
-msgid "Add criterion requirement"
-msgstr "Añadir criterio requerido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:239
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41
 msgid "Working progress per task"
 msgstr "Progreso de trabajo por tarea"
@@ -4278,61 +5111,33 @@ msgid "New order element name:"
 msgstr "Nombre del nuevo elemento de pedido:"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java:37
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:73
 msgid "Criterion"
 msgstr "Criterio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231
-msgid "Manage external companies"
-msgstr "Administrar empresas externas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84
-msgid "please, select a label"
-msgstr "por favor, seleccione una etiqueta"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:313
-msgid "Calculate End Date"
-msgstr "Calcular fecha de fin"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:226
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:228
 msgid "Manage types of work hours"
 msgstr "Administrar tipos de horas de trabajo"
 
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:106
-msgid "Add profile"
-msgstr "Añadir perfil"
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:65
+msgid "Generate code for"
+msgstr "Generar código para"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:162
-msgid "filter already exists"
-msgstr "el filtro ya existe"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:17
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45
-#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26
-msgid "Criterion name"
-msgstr "Nombre del criterio"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java:47
+msgid "Limiting resources (order)"
+msgstr "Recursos limitantes (pedido)"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:364
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:443
 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelConverter.java:102
 msgid "missing code in a label"
 msgstr "falta el código en una etiqueta"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:117
-msgid "values are not valid, the values must not be null"
-msgstr "los valores no son válidos, no deben ser nulos"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54
 msgid "Actual Cost Work Performed"
 msgstr "Coste de trabajo realizado"
 
-#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
-msgid "Task name"
-msgstr "Nombre de la tarea"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127
-msgid "cost assignment's resource not specified"
-msgstr "recurso de la asignación de coste no especificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:336
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:488
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
@@ -4350,61 +5155,26 @@ msgstr "Media de horas trabajadas"
 msgid "an authorization type must be set"
 msgstr "debe seleccionar un tipo de autorización"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78
-msgid "Unassigned"
-msgstr "No asignado"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:141
-msgid "Task information"
-msgstr "Información de tarea"
-
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100
-msgid "Add new criterion requirement"
-msgstr "Añadir nuevo criterio requerido"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24
-msgid "Select the date from which the new version will be valid"
-msgstr "Seleccione la fecha a partir de la cual la versión nueva será válida"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:82
 msgid "Must start after (days since beginning project)"
 msgstr "Debe empezar después de (días desde el inicio del proyecto)"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55
-msgid "Budgeted Cost Work Performed"
-msgstr "Coste presupuestado del trabajo realizado"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:123
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:54
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:82
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:48
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:78
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:34
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:162
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:165
 msgid "Add"
 msgstr "Añadir"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:272
-msgid "the name must be not empty"
-msgstr "el nombre no puede ser vacío"
-
-#: 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 "Deshabilitado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:225
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:394
-msgid "Earned value"
-msgstr "Valor ganado"
-
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:59
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:51
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:104
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:45
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:75
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:73
 msgid "Unselect"
 msgstr "Deseleccionar"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:495
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:464
 msgid "You should select the type of exception"
 msgstr "Debe seleccionar el tipo de excepción"
 
@@ -4419,7 +5189,8 @@ msgstr "Fecha límite"
 msgid "You don't have permissions to edit this order"
 msgstr "No tiene permisos para editar este pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:219
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java:91
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:264
 msgid "Advance measurements"
 msgstr "Medidas de avance"
 
@@ -4435,19 +5206,10 @@ msgstr "El porcentaje de cantidad de trabajo debe estar entre 0 y 100"
 msgid "Machine data"
 msgstr "Datos de la máquina"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42
-msgid "From Today"
-msgstr "A partir de hoy"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59
 msgid "VAC"
 msgstr "VAC"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:590
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:603
-msgid "{0} not supported yet"
-msgstr "{0} aún no soportado"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:177
 msgid "Advanced Allocation"
 msgstr "Asignación avanzada"
@@ -4462,143 +5224,104 @@ msgstr "Tipo de etiqueta"
 msgid "Template Tree"
 msgstr "Árbol de plantillas"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52
-msgid "New entry"
-msgstr "Entrada nueva"
-
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33
 msgid "Alpha"
 msgstr "Alfa"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:47
-msgid "Resources Load"
-msgstr "Carga de recursos"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:162
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:203
+msgid "inconsistent parent code."
+msgstr "código padre inconsistente."
 
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:31
-msgid "Overload due to current order"
-msgstr "Sobrecarga debido al pedido actual"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:45
-msgid "Overall Resources Load"
-msgstr "Carga global de recursos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:118
-msgid "Changes have been canceled"
-msgstr "Cambios cancelados"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:248
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:263
-msgid "Machine saved"
-msgstr "Máquina guardada"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:170
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:79
 msgid "Recommended Allocation"
 msgstr "Asignación recomendada"
 
-#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21
-msgid "Advance type list"
-msgstr "Lista de tipos de avance"
-
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:14
 msgid "Status"
 msgstr "Estado"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:30
-msgid "Assigned criterion requirements"
-msgstr "Criterios requeridos asignados"
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:112
+msgid "Resource load view"
+msgstr "Vista de carga de recursos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:507
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
+msgid "NavalPlan: Hours worked report"
+msgstr "NavalPlan: Informe de horas trabajadas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:524
 msgid "the date must be inside the visualization area"
 msgstr "la fecha debe estar dentro del área de visualización"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:707
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:739
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:752
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:867
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:69
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:73
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:45
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:43
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:96
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:82
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:122
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:185
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:150
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:48
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:77
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:113
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:127
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:158
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:110
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:123
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:152
 msgid "Hours"
 msgstr "Horas"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:372
+msgid "work report has not this label type assigned"
+msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:499
 msgid "date not specified."
 msgstr "fecha no especificada."
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:1108
+msgid "Limiting assignment"
+msgstr "Asignación limitante"
+
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:52
 msgid "Quality form type"
 msgstr "Tipo de formulario de calidad"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:334
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:158
+msgid " hours"
+msgstr " horas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:336
 msgid "The name of the criterion is empty."
 msgstr "El nombre del criterio está vacío."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:580
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:651
 msgid "The max value must be not empty"
 msgstr "el valor máximo no puede ser vacío"
 
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:55
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:66
 msgid "New label"
 msgstr "Nueva etiqueta"
 
-#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:16
-#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12
-#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:14
-msgid "Apply filtering to order elements satisfying required criteria"
-msgstr ""
-"Aplicar filtrado a los elementos de pedido que satisfacen los criterios "
-"requeridos"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:328
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:332
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:327
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:331
 msgid "The start date cannot be null"
 msgstr "La fecha de inicio no puede ser nula"
 
-#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:36
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:41
-msgid "Max value"
-msgstr "Valor máximo"
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:64
+msgid "Allocation configuration"
+msgstr "Configuración de asignación"
 
-#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:51
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:58
-msgid "No"
-msgstr "No"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154
-msgid "The name is not valid, the name must not be null "
-msgstr "El nombre no es válido, no debe ser nulo "
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:243
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:31
 msgid "Subcontract price"
 msgstr "Precio de subcontratación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:112
-msgid "A category must be selected"
-msgstr "Debe seleccionar una categoría"
-
-#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:37
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45
-msgid "Spread"
-msgstr "Propagación"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:229
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:249
 msgid "Edit virtual worker groups"
 msgstr "Editar grupos virtuales de trabajadores"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:145
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:187
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:625
-msgid "Removed {0}"
-msgstr "{0} borrado"
-
 #: 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
@@ -4606,7 +5329,7 @@ msgstr "{0} borrado"
 msgid "Assigned criteria"
 msgstr "Criterios asignados"
 
-#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:46
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:47
 msgid "Help on authentication (opens a new window)"
 msgstr "Ayuda sobre la identificación (abre una ventana nueva)"
 
@@ -4614,59 +5337,28 @@ msgstr "Ayuda sobre la identificación (abre una ventana nueva)"
 msgid "The length must be greater than 0, and not null."
 msgstr "La longitud debe ser mayor que cero y no nula."
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50
-msgid "Group name"
-msgstr "Nombre del grupo"
-
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
-msgid "Start date:"
-msgstr "Fecha de inicio:"
-
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57
-msgid "Role name"
-msgstr "Nombre del rol"
-
 #: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21
 msgid "Machines list"
 msgstr "Lista de máquinas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:469
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:479
 msgid "Could not save new calendar"
 msgstr "No se pudo guardar el calendario nuevo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:349
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:555
-msgid "h"
-msgstr "h"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:114
-msgid "Value is not valid, the precision value must not be empty"
-msgstr "El valor no es válido, el valor de precisión no debe ser vacío"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188
-msgid "Cannot delete profile: it does not exist anymore"
-msgstr "No se puede borrar el perfil: ya no existe"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:132
+msgid "Deleted unit type {0}"
+msgstr "Borrado tipo de unidad {0}"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135
 msgid "Couldn't find criterion {0}"
 msgstr "No se pudo encontrar el criterio {0}"
 
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95
-msgid "Create &amp; Assign"
-msgstr "Crear y asignar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99
-msgid "Add Milestone"
-msgstr "Añadir hito"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:367
-msgid "init"
-msgstr "inicio"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java:137
+msgid "Limiting resources error"
+msgstr "Error en recursos limitantes"
 
 #: 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/labels/LabelTypeCRUDController.java:329
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:353
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:40
 msgid "Confirm"
@@ -4675,14 +5367,15 @@ msgstr "Confirmar"
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:55
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:35
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:49
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:54
-#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:55
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:51
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:58
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:57
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:50
+#: navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul:31
 #: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:32
-#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:45
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:47
 #: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:49
-#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:45
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:48
 #: 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
@@ -4691,87 +5384,72 @@ msgstr "Confirmar"
 msgid "Create"
 msgstr "Crear"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1564
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1570
-msgid "please, select a work report type"
-msgstr "por favor, seleccione un tipo de parte de trabajo"
-
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:41
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:78
 msgid "Permissions"
 msgstr "Permisos"
 
-#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31
-msgid "Print layout"
-msgstr "Salida de impresión"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1646
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1652
+msgid "please, select a work report type"
+msgstr "por favor, seleccione un tipo de parte de trabajo"
 
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:23
-msgid "Edit User"
-msgstr "Editar usuario"
-
-#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:54
-msgid "Maximum/minimum of the estimated hours"
-msgstr "Máximo/mínimo de las horas estimadas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:41
-msgid "Filter pattern"
-msgstr "Patrón de filtro"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:477
+msgid "List of materials for category: {0}"
+msgstr "Lista de materiales para la categoría {0}"
 
 #: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:11
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:12
 msgid "Total price"
 msgstr "Precio total"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:220
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:221
 msgid "Manage advance types"
 msgstr "Gestionar tipos de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:974
-msgid ""
-"The date is not valid, the date must be unique for this advanced assignment"
-msgstr "La fecha no es válida, debe ser única para esta asignación de avance"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1068
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1080
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1149
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1161
 #: 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/resources/criterion/CriterionTreeController.java:313
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:262
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:283
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:140
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:160
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:219
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:384
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:556
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:562
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:247
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:412
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:426
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:583
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:589
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:366
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:545
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:383
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:674
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:387
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:384
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1024
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:915
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:685
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:895
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1108
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:1138
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:920
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:647
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:859
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1062
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:177
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:42
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:80
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:40
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:82
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:42
 #: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:62
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:66
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:65
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:69
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
-#: navalplanner-webapp/src/main/webapp/materials/materials.zul:110
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74
-#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:39
-#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:107
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:41
+#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:34
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:53
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:90
-#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:37
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:87
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:209
+#: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:39
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:90
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212
 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:101
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:66
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:53
@@ -4783,9 +5461,25 @@ msgstr "La fecha no es válida, debe ser única para esta asignación de avance"
 msgid "Delete"
 msgstr "Borrar"
 
-#: navalplanner-webapp/src/main/webapp/users/_listProfiles.zul:21
-msgid "Profiles listing"
-msgstr "Listado de perfiles"
+#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:30
+msgid "Number of assigned hours."
+msgstr "Número de horas asignadas."
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:31
+msgid "Number of hours calculated by clock."
+msgstr "número de horas calculado basado en reloj."
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java:32
+msgid "Number of assigned hours and the time."
+msgstr "Número de horas asignadas y hora."
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33
+msgid "heading"
+msgstr "cabecera"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33
+msgid "line"
+msgstr "línea"
 
 #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32
 msgid "RESOURCE"
@@ -4799,6 +5493,18 @@ msgstr "TRABAJADOR"
 msgid "MACHINE"
 msgstr "MÁQUINA"
 
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1068
+msgid "yes"
+msgstr "sí"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1068
+msgid "no"
+msgstr "no"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:53
+msgid "[generic all workers]"
+msgstr "[genérico todos los trabajadores]"
+
 #: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:71
 #: navalplanner-business/src/main/java/org/navalplanner/business/common/entities/OrderSequence.java:112
 msgid "You can not modifiy this order sequence, it is already in use"
@@ -4813,6 +5519,10 @@ msgstr "el número de dígitos debe estar entre {0} y {1}"
 msgid "Line"
 msgstr "Línea"
 
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/LimitingResourceQueueDependency.java:80
+msgid "A queue dependency has to have an origin different from destiny"
+msgstr "Una dependencia en la cola debe tener un origen distinto del destino"
+
 #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractState.java:31
 #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:29
 msgid "Pending"
@@ -4826,6 +5536,10 @@ msgstr "Fallo en el envío"
 msgid "Success sent"
 msgstr "Éxito en el envío"
 
+#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/QueuePosition.java:52
+msgid "Hour should be a value between 0 and 23"
+msgstr "La hora debe ser un valor entre 0 y 23"
+
 #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27
 msgid "Finished"
 msgstr "Terminado"
@@ -4838,19 +5552,19 @@ msgstr "En progreso"
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:185
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:186
 msgid "the resource type should be Worker or Machine"
 msgstr "el tipo de recurso debe ser Trabajador o Máquina"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:194
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:195
 msgid "Working hours shouldn't be negative"
 msgstr "Las horas de trabajo no pueden ser negativas"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:221
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:222
 msgid "Total percentage should be less than 100%"
 msgstr "El porcentaje total debe ser menor que 100%"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:270
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:271
 #, java-format
 msgid ""
 " The criterion {0} can not be assigned to this hoursGroup because its "
@@ -4859,7 +5573,7 @@ msgstr ""
 " El criterio {0} no se puede asignar a este grupo de horas porque su tipo de "
 "recurso es diferente."
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:276
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java:277
 #, java-format
 msgid ""
 " The criterion  {0} can not be assigned to this hoursGroup because it "
@@ -4868,44 +5582,44 @@ msgstr ""
 " El criterio {0} no se puede asignar a este grupo de horas porque ya existe "
 "en el grupo."
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:164
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:168
 #, java-format
 msgid "{0} is already child of another {1}"
 msgstr "{0} ya es hijo de otro {1}"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:210
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:214
 msgid "it's already somewhat scheduled"
 msgstr "ya está planificado de alguna manera"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:224
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:228
 msgid "it can't be unscheduled"
 msgstr "no se puede quitar la planificación"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:357
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:366
 msgid "Completely scheduled"
 msgstr "Completamente planificado"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:359
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:368
 msgid "Partially scheduled"
 msgstr "Parcialmente planificado"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:361
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:370
 msgid "Unscheduled"
 msgstr "No planificado"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:367
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:376
 msgid "C"
 msgstr "C"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:369
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:378
 msgid "P"
 msgstr "P"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:371
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SchedulingState.java:380
 msgid "U"
 msgstr "N"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:412
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:413
 msgid ""
 "Some ancestor has the same label assigned, so this element is already "
 "inheriting this label"
@@ -4913,13 +5627,13 @@ msgstr ""
 "Algún antecesor tiene la misma etiqueta asignada, así que este elemento ya "
 "está heredando esa etiqueta"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:461
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:774
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:462
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java:780
 msgid "Cannot spread two advances in the same order element"
 msgstr "No puede haber dos avances que propagan en un elemento de pedido"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:483
-#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:509
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:484
+#: navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java:510
 msgid "Duplicate Advance Assignment For Order Element"
 msgstr "Asignación de avance duplicada en el elemento de pedido"
 
@@ -4996,6 +5710,57 @@ msgstr "Permitida edición de todos los pedidos"
 msgid "Order creation allowed"
 msgstr "Permitida creación de pedidos"
 
+#~ msgid "type code has to be unique. It is already used"
+#~ msgstr "el código del tipo debe ser único. Ya está en uso"
+
+#~ msgid "Are you sure?"
+#~ msgstr "¿Está seguro?"
+
+#~ msgid "Is subcontracted"
+#~ msgstr "Está subcontratado"
+
+#~ msgid "Calculation type"
+#~ msgstr "Tipo de cálculo"
+
+#~ msgid "Templates"
+#~ msgstr "Plantillas"
+
+#~ msgid "&lt;&lt;"
+#~ msgstr "&lt;&lt;"
+
+#~ msgid ""
+#~ "As you are subcontracting this task, all the resource allocations related "
+#~ "with this task will be removed."
+#~ msgstr ""
+#~ "Al subcontratar esta tarea, todas sus asignaciones de recursos se "
+#~ "borrarán."
+
+#~ msgid "materialcode has to be unique. It is already used"
+#~ msgstr "el código del material debe ser único. Ya está en uso"
+
+#~ msgid "Code cannot be null or empty"
+#~ msgstr "El código no puede ser nulo o vacío"
+
+#~ msgid ""
+#~ "Some lines have not allocation periods.\n"
+#~ "Below it shows the load all company resources"
+#~ msgstr ""
+#~ "Algunas líneas no tienen períodos de asignación.\n"
+#~ "Debajo se muestra la carga de todos los recursos de la empresa"
+
+#~ msgid "Satisfied"
+#~ msgstr "Satisfecho"
+
+#~ msgid "Exception start date should be greater than current date"
+#~ msgstr ""
+#~ "La fecha de inicio de la excepción debe ser mayor que la fecha actual"
+
+#~ msgid "&gt;&gt;"
+#~ msgstr "&gt;&gt;"
+
+#~ msgid "Task information"
+#~ msgstr "Información de tarea"
+
 #~ msgid "Not Unindent"
 #~ msgstr "No desindentar"
 
@@ -5059,18 +5824,12 @@ msgstr "Permitida creación de pedidos"
 #~ msgid "The order {0} must be scheduled"
 #~ msgstr "El pedido {0} debe ser planificado"
 
-#~ msgid "include order elements"
-#~ msgstr "incluir elementos de pedido"
-
 #~ msgid "code is used by another machine being imported"
 #~ msgstr "código usado por otra máquina que está siendo importada"
 
 #~ msgid "Filter by label:"
 #~ msgstr "Filtrar por etiqueta:"
 
-#~ msgid "{0}: calendar not found"
-#~ msgstr "{0}: calendario no encontrado"
-
 #~ msgid "criterion type name is used by another criterion type being imported"
 #~ msgstr ""
 #~ "el nombre de tipo de criterio está siendo usado por otro tipo de criterio "