From c32d5ea88cd9a4bbd8e694fc643df84fb161bf2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Mon, 17 May 2010 13:55:40 +0200
Subject: [PATCH]  ItEr58S05DocumentacionFormacionItEr57S05: Updated Galician
 translation files.

---
 ganttzk/src/main/resources/i18n/gl.po         |  167 +-
 .../src/main/resources/i18n/gl.po             | 6096 +++++++++--------
 2 files changed, 3545 insertions(+), 2718 deletions(-)

diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po
index 99848db44..a0eaa143b 100644
--- a/ganttzk/src/main/resources/i18n/gl.po
+++ b/ganttzk/src/main/resources/i18n/gl.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 "Engadir dependencia"
 
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Worker"
+msgstr "Traballador"
+
+#: 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 "Definir Fin-Fin"
+
+#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Task"
+msgstr "Tarefa"
+
+#: 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 nome"
+
+#: 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 "Ningún"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41
+msgid "Flatten/Unflatten tree"
+msgstr "Aplanar/expandir árbore"
+
+#: 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 nomes"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:27
+msgid "Name"
+msgstr "Nome"
+
 #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
 msgid "Expand/Collapse all"
 msgstr "Expandir/pregar 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 "Ano"
@@ -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 "Definir Fin-Inicio"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:214
-msgid "Set End-End"
-msgstr "Definir 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 "reducindo 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 camiño 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 "Ocultar/ocultar camiño 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 "Porcentaxe 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 recursoss"
 
-#: 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 tódolos 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 camiño crítico"
 
-#~ msgid "Filter"
-#~ msgstr "Filtro"
+#~ msgid "0% - 100%"
+#~ msgstr "0% - 100%"
+
+#~ msgid "+ 100%"
+#~ msgstr "+ 100%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "Assignation percentage"
+#~ msgstr "Porcentaxe asignado"
 
 #~ msgid "Critical path"
 #~ msgstr "Camiño crítico"
diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po
index 1d13db39b..25f0c0c53 100644
--- a/navalplanner-webapp/src/main/resources/i18n/gl.po
+++ b/navalplanner-webapp/src/main/resources/i18n/gl.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:50+0100\n"
+"POT-Creation-Date: 2010-05-17 02:07+0200\n"
+"PO-Revision-Date: 2010-05-17 13:37+0200\n"
 "Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
 "Language-Team: Galician <>\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 traballo"
-
-#: 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 "O recurso non pode 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 "o código do criterio debe ser único dentro dun tipo de criterio"
 
@@ -42,54 +29,32 @@ msgstr "o código do criterio debe ser único dentro dun tipo de criterio"
 msgid "No authorizations were added because you did not select any."
 msgstr "Non se engadiron actualizacións porque non se seleccionou ningunha."
 
-#: 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 "gl"
 
-#: 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 "nome do tipo de criterio non especificado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:230
-msgid "Manage user accounts"
-msgstr "Administrar contas 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 á vista da compañía"
-
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45
 msgid "Select report data"
 msgstr "Seleccione data do informe"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:216
-msgid "Add Exception"
-msgstr "Engadir 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 co nome {0}"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:347
+msgid "Up to company view"
+msgstr "Arriba á vista da compañía"
 
 #: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:54
 msgid "Create Virtual Worker"
 msgstr "Crear traballador 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 co nome {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 traballador 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 traballador 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 "Operacións"
 
-#: 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 "non pode ser baleiro"
-
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:71
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:125
 msgid "New order sequence"
 msgstr "Nova secuencia de pedido"
 
@@ -154,6 +117,2616 @@ msgstr "Nova secuencia de pedido"
 msgid "Add criterion"
 msgstr "Engadir 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 "Non hai un tipo de horas de traballo 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 "Materiais"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:21
+msgid "NavalPlan: Virtual workers"
+msgstr "NavalPlan: Traballadores virtuais"
+
+#: 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 "A descrición non pode ser nula ou baleira"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:92
+msgid "Percentage of consumed budget hours / hours consumed"
+msgstr "Porcentaxe de horas de presuposto consumidas / horas consumidas"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:75
+msgid "login name not specified"
+msgstr "nome de usuario non especificado"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27
+msgid "Managing fields and labels"
+msgstr "Administrar campos e 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 "Resumo"
+
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:63
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52
+msgid "Quality Forms"
+msgstr "Formularios de calidade"
+
+#: 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 requiridos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:88
+msgid "START_NOT_EARLIER_THAN"
+msgstr "COMEZAR_NON_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 ""
+"O calendario por defecto non pode borrarse. Por favor, cambie antes o "
+"calendario por defecto na 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 "Non están no mesmo 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 do formulario de calidade"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
+msgid "Name/Code"
+msgstr "Nome/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 ""
+"A data de fin non é válida, a nova data de fin debe ser posterior á actual"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:63
+msgid "Select print visualization options"
+msgstr "Seleccione as opcións de impresión da 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 "Comezo"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118
+msgid "cost assignment's category not specified"
+msgstr "categoría da asignación de coste non especificada"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:71
+msgid "Delete Template element"
+msgstr "Borrar elemento de modelo"
+
+#: 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}': non atopado"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36
+msgid "Resources capability"
+msgstr "Capacidade 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 ""
+"O primeiro tramo debe estar despois do primeiro día para facer interpolación"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
+msgid "Filter quality forms by :"
+msgstr "Filtrar formularios de calidade 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 ""
+"Non se engadiron esas actualizacións ao perfil {0} porque xa 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: Perfís"
+
+#: navalplanner-webapp/src/main/webapp/common/error.zul:20
+msgid "NavalPlan: Error"
+msgstr "NavalPlan: Erro"
+
+#: 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 materiais en data"
+
+#: 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 "Novo modelo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127
+msgid "Base calendar \"{0}\" saved"
+msgstr "Calendario base \"{0}\" gardado"
+
+#: 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 "Ubicacións"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:90
+msgid "The advanceType cannot be modified"
+msgstr "O tipo de avance non pode ser modificado"
+
+#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70
+msgid "New quality form item"
+msgstr "Novo elemento de formulario de calidade"
+
+#: 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 modelos"
+
+#: 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 a interpolación necesítanse alo menos dous tramos"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:41
+msgid "Login name"
+msgstr "Nome 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 nunha 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 satisfeitos que pertencen a tipos de criterio non "
+"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 requirido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54
+msgid "Company Scheduling"
+msgstr "Planificación da 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 non se pode cambiar ou borrar, porque ten avances consolidados. "
+"Débense borrar as consolidacións de tódolos seus avances."
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22
+msgid "Create new version"
+msgstr "Crear versión nova"
+
+#: 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 ten subrecursos habilitados"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28
+msgid "Add new advance assignment"
+msgstr "engadir nova 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 ""
+"non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode "
+"engadir a asignación xené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 ""
+"o parte de traballo non ten ningún valor de descrición con ese nome 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 "o nome da categoría de materiais debe ser único. Xa 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 o borrado deste coste por hora. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58
+msgid "Delete Milestone"
+msgstr "Borrar fito"
+
+#: 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 "O pedido no ten elementos planificados"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47
+msgid "Non-assigned locations"
+msgstr "Ubicacións non asignadas"
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
+msgid "Application URI"
+msgstr "URI da 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} non é válido, criterionType solápase con outro criterionSatisfaction do "
+"mesmo 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 da planificación por recurso"
+
+#: 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 "Nome"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:225
+msgid "Could not execute print command"
+msgstr "Non se puido executar o 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 o 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 "os recursos por día deben ser non baleiros e maiores 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 traballo"
+
+#: 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 non válido, outro criterionSatisfaction solápase co mesmo "
+"criterionType"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:85
+msgid "Types of work hours"
+msgstr "Tipos de horas de traballo"
+
+#: 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 traballadores virtuais"
+
+#: 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 ten valores maiores ou iguais có 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 do 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 "Data 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 traballador nun parte de traballo"
+
+#: 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 ""
+"O valor non é válido, o valor máximo por defecto debe ser maior có 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 "o nome do perfil xa está a ser usado por outro 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 calidade"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:26
+msgid "User data"
+msgstr "Datos do usuario"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:118
+msgid "Resource / Criteria"
+msgstr "Recurso / 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_SEXA_POSIBLE"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:101
+msgid "Error setting up creation form."
+msgstr "Erro preparando o formulario de creación."
+
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43
+msgid "Lines"
+msgstr "Liñas"
+
+#: 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 ""
+"Erro ao mostrar mensaxe de advertencia borrando tipo de parte de traballo: "
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29
+msgid "Personal data"
+msgstr "Datos persoais"
+
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41
+msgid "Save Order"
+msgstr "Gardar pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:210
+msgid "Work reports"
+msgstr "Partes de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92
+msgid "{0} annotation required on {1}"
+msgstr "{0} anotación obrigatoria en {1}"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:215
+msgid "Add Criterion"
+msgstr "Engadir 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 "Árbore aplanada {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 "É 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 "Data 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 xeral"
+
+#: 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 traballo"
+
+#: 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 "Non pode ser baleiro ou 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 "Presuposto total"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:50
+msgid "Hierarchy"
+msgstr "Xerarquí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 outras asignacións"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148
+msgid "Time period saved"
+msgstr "Período de tiempo gardado"
+
+#: 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 traballo 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 "Traballadores"
+
+#: 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 do 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 traballo"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:54
+msgid "Year"
+msgstr "Ano"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/Profile.java:66
+msgid "profile name not specified"
+msgstr "nome do perfil non especificado"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:60
+msgid "Date Start"
+msgstr "Data 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 "O valor non é válido, o valor actual debe ser menor que o valor máximo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:54
+msgid "From Chosen"
+msgstr "A partir de elixidos"
+
+#: 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 "Engadir 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 ""
+"A data de fin dunha excepción debe ser maior ou igual cá data 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 no 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 ""
+"O {0} non se pode asignar a este recurso. O seu intervalo solápase con outro "
+"criterio"
+
+#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66
+msgid "Work done until ending date:"
+msgstr "Traballo realizado ata a data de fin:"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63
+msgid "Schedule Performance Index"
+msgstr "Índice de rendemento da planificación"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26
+msgid "Type data"
+msgstr "Datos do 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 "O código do elemento de pedido non pode 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 nunha 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 o borrado desta 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 non limitantes"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:189
+msgid "Error removing element: "
+msgstr "Erro ao borrar elemento: "
+
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39
+msgid "Company name"
+msgstr "Nome da 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 nova asignación"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:210
+msgid "Expiry date"
+msgstr "Data de vencemento"
+
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:52
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53
+msgid "Pagination"
+msgstr "Paxinació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 á saída directamente"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
+msgid "Add new hours group"
+msgstr "Engadir novo 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 "Porcentaxe"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:222
+msgid "Manage criteria"
+msgstr "Xestionar 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 traballador seleccionado"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:134
+msgid "Number of digits"
+msgstr "Número de díxitos"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28
+msgid "Total capability"
+msgstr "Capacidade total"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:232
+msgid "Problems connecting with client web service"
+msgstr "Problemas conectando co servizo 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: Tarefas subcontratadas"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:21
+msgid "NavalPlan: Materials"
+msgstr "NavalPlan: Materiais"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202
+msgid "Advances sent successfully"
+msgstr "Os avances enviáronse 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} da categoría {1} e {2} da categoría {3} teñen o mesmo 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 da tarefa"
+
+#: 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 data:"
+
+#: 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 unha data de fin para a excepción"
+
+#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:33
+msgid "Please try it again."
+msgstr "Por favor, volva a intentalo."
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:51
+msgid "Company code"
+msgstr "Código da empresa"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109
+msgid "Unknown attribute '{0}' in class {1}"
+msgstr "Atributo descoñecido '{0}' na clase {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:647
+msgid "NON LIMITING RESOURCE"
+msgstr "RECURSO NON LIMITANTE"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:96
+msgid "machine name not specified"
+msgstr "nome da máquina non 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 "xa 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 "Tipo de criterio e os seus criterios gardados"
+
+#: 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 "nome do traballador non especificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266
+msgid "date not specified"
+msgstr "data non 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 non pode ser cambiada ou borrada, porque está "
+"consolidada. Débese borrar a 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 axustar ao ancho de páxina"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:66
+msgid "Last name"
+msgstr "Apelidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:252
+msgid "cost category name not specified"
+msgstr "nome da categoría de coste non 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 "Nome nome"
+
+#: 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 calidade"
+
+#: 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} non 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 ""
+"A data de inicio non é válida, a data de inicio nova debe ser anterior data "
+"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 "o código non pode ser nulo ou baleiro"
+
+#: 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 calidade"
+
+#: 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 "Gardar"
+
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21
+msgid "NavalPlan: AdvanceTypes"
+msgstr "NavalPlan: Tipos de avance"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:87
+msgid "Material categories"
+msgstr "Categorías de materiais"
+
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
+msgid "Edit advance type data"
+msgstr "Editar datos do tipo de avance"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131
+msgid "Pending update"
+msgstr "Actualización pendente"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59
+msgid "End date:"
+msgstr "Data 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 ""
+"O valor non é válido, o valor debe ser maior có valor dos avances previos."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:296
+msgid "Order Element code cannot be null"
+msgstr "O código do elemento de pedido non pode 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 das tarefas de planificacion dun pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:170
+msgid "Problems connecting with subcontractor web service"
+msgstr "Problemas conectando co servizo 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 "Data de fin"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68
+msgid "Filter by workers"
+msgstr "Filtrar por traballadores"
+
+#: 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 ""
+"Data de fin estimada para a tarefa (presione enter no cadro de texto para "
+"abrir o calendario ou escriba a data 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 non debe ser nulo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:240
+msgid "Expand/Collapse all"
+msgstr "Expandir/Pregar todo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:460
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:502
+msgid "Move down"
+msgstr "Mover abaixo"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26
+msgid "Report structure"
+msgstr "Estrutura do parte"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:84
+msgid "password not specified"
+msgstr "contrasinal non especificado"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56
+msgid "Yes"
+msgstr "Si"
+
+#: 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 xerais"
+
+#: 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 ás máquinas que satisfán os 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 nun 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 modelo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:168
+msgid "Advance type saved"
+msgstr "Tipo de avance gardado"
+
+#: 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: Non olvide comunicar ao subcontratista que o seu contrato foi "
+"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 "O servizo non xestiona recursos de tipo: {0}"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39
+msgid "Edit worker"
+msgstr "Editar traballador"
+
+#: 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 o calendario pai"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67
+msgid "Hours of day"
+msgstr "Horas do 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 "o criterio satisfeito ten data de fin anterior á 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 "Erro ao 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 sen fillos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:134
+msgid "Profile saved"
+msgstr "Perfil gardado"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:71
+msgid "Task properties"
+msgstr "Propiedades da tarefa"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:33
+msgid "Surname"
+msgstr "Apelidos"
+
+#: 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 algunha 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 "Data"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:362
+msgid "the name must be not null or not empty"
+msgstr "o nome non pode ser nulo ou baleiro"
+
+#: 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 "Os recursos asignados para esta tarefa 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 liñas 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 "O criterio e o seu tipo non poden 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 "O código non é válido. Hai outro tipo de unidade co mesmo 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 "Erro ao borrar elemento: "
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:63
+msgid "Cannot calculate charts for current data"
+msgstr "Non se poden calcular gráficos para os datos actuais"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57
+msgid "Found workers"
+msgstr "Traballadores atopados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:464
+msgid "The cost category had already been removed."
+msgstr "A categoría de coste xa fora borrada."
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:27
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48
+msgid "Work description"
+msgstr "Descrición do traballo"
+
+#: 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} : O pedido ten 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 "Abaixo"
+
+#: 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 do 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 "O valor non é válido, tendo en conta a lista actual de HoursGroup"
+
+#: 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 tipo de horas de traballo nunha liña do parte"
+
+#: 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 calidade"
+
+#: 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 o comezo ata a data 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 "data de inicio da asignación de coste non 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 saída:"
+
+#: 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 "Data 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 traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:126
+msgid "You will lose the changes. Are you sure?"
+msgstr "Perderanse os cambios. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:162
+msgid "Unit type name cannot be empty"
+msgstr "O nome do tipo de unidade non pode ser baleiro"
+
+#: 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 virtuais de traballadores"
+
+#: 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 o comezo (en días)"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:289
+msgid "Resource cannot be null"
+msgstr "O recurso non pode ser nulo"
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52
+msgid "Do you want to delete "
+msgstr "¿Quere borrar "
+
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
+msgid "Total Hours"
+msgstr "Horas totais"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71
+msgid "All orders"
+msgstr "Todos os 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 "Erro ao mostrar o elemento a borrar: "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:83
+msgid "start not earlier than"
+msgstr "empezar non 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 o código nun parte de traballo"
+
+#: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
+msgid "Criterion requirement"
+msgstr "Criterios requiridos"
+
+#: 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 ""
+"Os cambios que non foron gardados perderanse. ¿Está seguro de que quere ir á "
+"creación de modelos?"
+
+#: 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 tipos 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 gardada"
+
+#: 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 "Engadir nova 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 no calendario de recursos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138
+msgid "Could not save new criterion"
+msgstr "Non se puido gardar o novo 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óns"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyCaptTimeout.java:44
+msgid "CutycaptTimeout thread exception"
+msgstr "Excepción no thread CutycaptTimeout"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46
+msgid "Load due to current order"
+msgstr "Carga debido ao pedido actual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:93
+msgid "Deadline (days since beggining project)"
+msgstr "Data límite (días desde o inicio do proxecto)"
+
+#: navalplanner-webapp/src/main/webapp/materials/unitTypes.zul:38
+msgid "Edit unit type data"
+msgstr "Editar datos do tipo de unidade"
+
+#: 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 non calculado correctamente basado en reloxo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:807
+msgid "Value is not valid, the type must be not empty"
+msgstr "O valor non é válido, o tipo non pode estar baleiro"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:411
+msgid "criterion type name is already being used"
+msgstr "o nome de tipo de criterio está sendo usado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:393
+msgid "Could not get order code, please try again later"
+msgstr ""
+"Non se puido obter o código de pedido, por favor volva intentalo máis tarde"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java:46
+msgid "worker"
+msgstr "traballador"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:102
+msgid "Error setting up creation form for Criterion Type"
+msgstr "Erro preparando o 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 "Accións"
+
+#: 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 "Novo elemento de pedido"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:75
+msgid "Exceptions"
+msgstr "Excepcións"
+
+#: 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 ""
+"Non se pode borrar o elemento de pedido \"{0}\" porque algún dos seus fillos "
+"está a usarse nalgún parte de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:201
+msgid "format filters are not valid"
+msgstr "o formato dos filtros non é válido"
+
+#: 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 "Non ten 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 "A data de inicio non pode ser baleira"
+
+#: 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 "Contrasinal da nosa 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 ""
+"O valor non é válido.\n"
+" o código no pode conter 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 "Nome 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 "Data de comunicación da 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 "As dependencias teñen prioridade"
+
+#: 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 traballo"
+
+#: 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 "Traballo realizado desde a data 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 despois"
+
+#: 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 "Imaxe simple"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:201
+msgid "missing date in a calendar exception"
+msgstr "falta a data nunha 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 unidades"
+
+#: 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 "O contrasinal non pode ser baleiro para un usuario novo"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26
+msgid "Type name"
+msgstr "Nome do 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 "Non pode ser posterior á data 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 persoais"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206
+msgid "Workers List"
+msgstr "Lista de traballadores"
+
+#: 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 "O criterio non debe ser nulo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:293
+msgid "Worker"
+msgstr "Traballador"
+
+#: 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 ""
+"Non se pode asignar o elemento seleccionado. Non hai ningunha cola que "
+"coincida cos criterios de asignación de recursos en ningún intervalo de tempo"
+
+#: 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 "nome do criterio non 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 ""
+"O valor non é válido, o valor máximo por defecto non debe estar baleiro "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:206
+msgid "the "
+msgstr "o "
+
+#: 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 modelo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:366
+msgid "Materials saved"
+msgstr "Materiais gardados"
+
+#: 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 duplicado verdadeiro para o atributo 'informar avance global' no "
+"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 "Nome do perfil"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:221
+msgid "Could open generated PDF"
+msgstr "Non se puido abrir o PDF xerado"
+
+#: 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 "O nome non é válido, xa hai outro tipo de avance co mesmo nome. "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:135
+msgid "Company saved"
+msgstr "Empresa gardada"
+
+#: 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 "Erro: {0}"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:162
+msgid "Parent"
+msgstr "Pai"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:213
+msgid "Work report list"
+msgstr "Lista de partes de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:114
+msgid "Type of work hours saved"
+msgstr "Tipo de horas de traballo gardado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63
+msgid "Not found converter for {0}"
+msgstr "Non se atopou un conversor para {0}"
+
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul:49
+msgid "Material assignments"
+msgstr "Asignacións de materiais"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:94
+msgid "start in fixed date"
+msgstr "comezar en data fixa"
+
+#: 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 ""
+"O valor non é válido, o valor de precisión debe ser menor que o 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 nova semana de traballo"
+
+#: 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 ""
+"O nome da medida non é válido. Hai outro tipo de unidade co mesmo nome de "
+"medida"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32
+msgid "Work record"
+msgstr "Rexistro de traballo"
+
+#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:129
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
+msgid "Output format"
+msgstr "Formato de saída"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174
+msgid "Criterion saved"
+msgstr "Criterio gardado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:115
+msgid "Error setting up edition form."
+msgstr "Erro preparando o 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 "As horas non poden 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} non atopado 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 "o tipo de recurso non permite criterios habilitados"
+
+#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
+msgid "NavalPlan: Scheduling progress report"
+msgstr "NavalPlan: Informe de avance de planificación"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:32
+msgid "General user data"
+msgstr "Datos xerais do 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 "A tarefa subcontratada enviouse 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 "Datas"
+
+#: 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 "Necesítase alo 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 non é 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 "A data do tramo debe ser maior ou igual cá data de inicio da tarefa"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60
+msgid "Task Properties"
+msgstr "Propiedades da tarefa"
+
+#: 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 "Non hai un 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 "nome"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35
+msgid "Create new Work Report Type"
+msgstr "Crear novo tipo de parte de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:168
+msgid "Cost category saved"
+msgstr "Categoría de coste gardada"
+
+#: 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 ""
+"Data de fin inválida, a data de fin nova debe ser posterior á data 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 "Autorizacións"
+
+#: 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 "A data de inicio non pode ser nula"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:50
+msgid "Generic"
+msgstr "Xené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 "O valor non é válido, o 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 "O pedido non existe"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
+msgid "Add criterion requirement"
+msgstr "Engadir criterio requirido"
+
+#: 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 "Tarefa"
+
+#: 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 etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:392
+msgid "Calculate End Date"
+msgstr "Calcular data de fin"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsController.java:84
+msgid "please, select a label"
+msgstr "por favor, seleccione unha etiqueta"
+
+#: navalplanner-webapp/src/main/webapp/users/users.zul:22
+msgid "NavalPlan: User accounts"
+msgstr "NavalPlan: Contas de usuario"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:106
+msgid "Add profile"
+msgstr "Engadir 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 "Nome do criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:233
+msgid "missing code in a calendar data version"
+msgstr "falta código nos datos de versión dun calendario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:190
+msgid "filter already exists"
+msgstr "o filtro xa 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 "os valores non son válidos, non deben ser nulos"
+
+#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
+msgid "Task name"
+msgstr "Nome da tarefa"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127
+msgid "cost assignment's resource not specified"
+msgstr "recurso da asignación de coste non especificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78
+msgid "Unassigned"
+msgstr "Non asignado"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24
+msgid "Select the date from which the new version will be valid"
+msgstr "Seleccione a data a partir da cal a versión nova será válida"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100
+msgid "Add new criterion requirement"
+msgstr "Engadir novo criterio requirido"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:79
+msgid "Work report"
+msgstr "Parte de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55
+msgid "Budgeted Cost Work Performed"
+msgstr "Coste presupostado do traballo realizado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:272
+msgid "the name must be not empty"
+msgstr "o nome non pode ser baleiro"
+
+#: 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 gañado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42
+msgid "From Today"
+msgstr "A partir de hoxe"
+
+#: 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índa non soportado"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52
+msgid "New entry"
+msgstr "Entrada nova"
+
+#: 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 ao 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 gardada"
+
+#: 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 requiridos 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 aos elementos de pedido que satisfán os 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 "Non"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:120
+msgid "Hours to allocate"
+msgstr "Horas a 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 "O nome non é válido, non debe ser nulo "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:112
+msgid "A category must be selected"
+msgstr "Debe seleccionar unha 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 traballo"
+
+#: 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 "Nome do grupo"
+
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
+msgid "Start date:"
+msgstr "Data de inicio:"
+
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81
+#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57
+msgid "Role name"
+msgstr "Nome do 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 "O valor non é válido, o valor de precisión non debe estar baleiro"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java:157
+msgid "Workable capacity for this period "
+msgstr "Capacidade de traballo 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 "Non se pode borrar o perfil: xa non existe"
+
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:91
+msgid "Unit Types"
+msgstr "Tipos de unidade"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99
+msgid "Add Milestone"
+msgstr "Engadir fito"
+
+#: 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 e asignar"
+
+#: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:31
+msgid "Print layout"
+msgstr "Saída 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 das 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 "A data non é 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 perfís"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:211
+msgid "Work report types"
+msgstr "Tipos de partes de traballo"
+
+#: navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:69
+msgid "Apply filtering to resource load satisfying required criteria"
+msgstr ""
+"Aplicar filtrado á carga de recursos que satisfai os criterios requeridos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:216
+msgid "missing code in a material"
+msgstr "falta o código nun 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 "nome do tipo de criterio non especificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:232
+msgid "Manage user accounts"
+msgstr "Administrar contas 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 "Engadir 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 "non pode ser baleiro"
+
 #: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41
 msgid "Completed estimated hours per task"
 msgstr "Horas estimadas completadas por tarefa"
@@ -165,34 +2738,11 @@ msgstr "Horas estimadas completadas por tarefa"
 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 cabeceira"
 
-#: 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 "Materiais"
-
 #: 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 +2751,12 @@ msgstr ""
 "O período de tempo contén datos inválidos. A data de fin debe ser maior cá "
 "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 "A descrición non pode ser nula ou baleira"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:92
-msgid "Percentage of consumed budget hours / hours consumed"
-msgstr "Porcentaxe de horas de presuposto consumidas / horas consumidas"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:75
-msgid "login name not specified"
-msgstr "nome de usuario non 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 unha data de inicio para a excepción"
 
@@ -231,44 +2765,14 @@ msgid "Variance At Completion"
 msgstr "Desviación ó 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 "Axuda"
 
-#: 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 e 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 calidade"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:171
-msgid "Summary"
-msgstr "Resumo"
-
-#: 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 "Opcións 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 +2787,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 +2806,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 +2825,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 "Nome"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:80
-msgid "START_NOT_EARLIER_THAN"
-msgstr "COMEZAR_NON_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 requiridos"
-
-#: 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 ""
-"O calendario por defecto non pode borrarse. Por favor, cambie antes o "
-"calendario por defecto na 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 "A hora de inicio non pode 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 da 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 "Outros pedidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:481
 msgid "It not could remove the order element "
 msgstr "Non se puido borrar o 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 "Non están no mesmo 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 "A data de fin non pode ser anterior á data 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 "a asignación de coste ten data de fin anterior á de inicio"
@@ -398,77 +2897,28 @@ msgstr "Nome da categoría"
 msgid "Maximum/minimum of the worked hours"
 msgstr "Máximo/mínimo das horas traballadas"
 
-#: 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 "Non é o mesmo material, imposible actualizar"
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:67
-msgid "Quality form items list"
-msgstr "Lista de elementos do formulario de calidade"
-
-#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
-msgid "Name/Code"
-msgstr "Nome/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 ""
-"A data de fin non é válida, a nova data de fin debe ser posterior á 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 "non se pode asignar un avance do mesmo tipo dúas 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 as opcións de impresión da 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 modelo"
 
-#: 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 "Comezo"
-
-#: 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 "Xa existe outro tipo de parte de traballo co mesmo nome."
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:118
-msgid "cost assignment's category not specified"
-msgstr "categoría da asignación de coste non especificada"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:71
-msgid "Delete Template element"
-msgstr "Borrar elemento de modelo"
-
-#: 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"
@@ -488,44 +2938,11 @@ msgstr ""
 "Completa, parcialmente ou non planificado. (Pinche e 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}': non atopado"
-
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36
-msgid "Resources capability"
-msgstr "Capacidade 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 ""
-"O primeiro tramo debe estar despois do primeiro día para facer 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 calidade 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 ""
-"Non se engadiron esas actualizacións ao perfil {0} porque xa 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 do elemento de pedido"
@@ -534,11 +2951,11 @@ msgstr "Código do elemento de pedido"
 msgid "Changes saved"
 msgstr "Cambios gardados"
 
-#: 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"
@@ -547,13 +2964,13 @@ msgstr ""
 "actualizar a táboa de secuencia de pedido. Por favor, volva intentalo máis "
 "tarde"
 
-#: 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 traballo gardado"
 
+#: 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"
 
@@ -562,13 +2979,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 "Non hai ningún avance asignado á 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 "A data non é válida, non debe ser baleira"
 
@@ -576,19 +2996,22 @@ msgstr "A data non é válida, non debe ser baleira"
 msgid "User login name"
 msgstr "Nome 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 materiais en data"
+#: 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 "Non hai ningún elemento 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 non 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 ""
+"Outro usuario modificou os mesmos datos, polo tanto a operación non se pode "
+"completar con seguridade."
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:142
 msgid "must be not empty"
@@ -598,76 +3021,29 @@ msgstr "non pode ser baleiro"
 msgid "Show all resource assignments"
 msgstr "Mostrar todas as asignacións de recursos"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:50
-msgid "New template"
-msgstr "Novo modelo"
-
-#: 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 "o código do tipo debe ser único. Xa 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 calidade de tarefa"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127
-msgid "Base calendar \"{0}\" saved"
-msgstr "Calendario base \"{0}\" gardado"
-
-#: 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 non 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 "O tipo de avance non pode ser modificado"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31
-msgid "Locations"
-msgstr "Ubicacións"
-
-#: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:70
-msgid "New quality form item"
-msgstr "Novo elemento de formulario de calidade"
-
-#: 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 modelos"
-
 #: 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 calidade"
 
-#: 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 "Xa existe outro tipo de parte de traballo co mesmo 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 a interpolación necesítanse alo menos dous 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 "Nome de usuario"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:90
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul:53
 msgid "Constraint"
 msgstr "Restrición"
 
@@ -679,11 +3055,7 @@ msgstr "Código de referencia do cliente"
 msgid "Add New Label Type Field"
 msgstr "Engadir novo 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 "A hora de fin non pode ser nula"
 
@@ -692,58 +3064,36 @@ msgstr "A hora de fin non pode ser nula"
 msgid "Customer reference"
 msgstr "Referencia del 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 "Traballador gardado"
 
-#: 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 satisfeitos que pertencen a tipos de criterio non "
-"aplicables a este recurso"
-
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36
-msgid "Create new advance type"
-msgstr "Crear un novo 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 "non se pode pasar mentres o elemento anterior non sexa 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 requirido"
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36
+msgid "Create new advance type"
+msgstr "Crear un novo tipo de avance"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java:205
 msgid "New hours group "
 msgstr "novo grupo de horas "
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54
-msgid "Company Scheduling"
-msgstr "Planificación da 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
@@ -756,36 +3106,15 @@ msgstr "Filtrar por pedidos"
 msgid "percentage cannot be duplicated"
 msgstr "a porcentaxe non pode estar duplicada"
 
-#: 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 "Cabeceira"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22
-msgid "Create new version"
-msgstr "Crear versión nova"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/materials/impl/MaterialConverter.java:121
+msgid "There is no material category with this code"
+msgstr "Non hai ningunha categoría de materiais 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 ten 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 "engadir nova 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 "Non se puido gardar a máquina"
 
@@ -793,93 +3122,52 @@ msgstr "Non se puido gardar a máquina"
 msgid "Unable to convert value to {0} type"
 msgstr "No se puido convertir o 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 non atopado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:184
 msgid "Worker must be not-null"
 msgstr "O traballador non 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 ""
-"non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode "
-"engadir a asignación xené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 "Algúns criterios satisfeitos solápanse no tempo"
 
-#: 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 "o nome da categoría de materiais debe ser único. Xa 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 "Asignacións de traballador"
 
-#: 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 o borrado deste 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} xa 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 traballador"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/DeleteMilestoneCommand.java:58
-msgid "Delete Milestone"
-msgstr "Borrar fito"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:636
-msgid "The order has no scheduled elements"
-msgstr "O pedido no ten elementos planificados"
-
-#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47
-msgid "Non-assigned locations"
-msgstr "Ubicacións non 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} non é válido, criterionType solápase con outro criterionSatisfaction do "
-"mesmo criterionType"
-
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
-msgid "Application URI"
-msgstr "URI da aplicación"
+#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52
+msgid "Password confirmation"
+msgstr "Confirmación de contrasinal"
 
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:41
 msgid "Paper size"
 msgstr "Tamaño de papel"
 
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:52
-msgid "Password confirmation"
-msgstr "Confirmación de contrasinal"
-
-#: 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 "Ningún"
 
@@ -887,35 +3175,14 @@ msgstr "Ningún"
 msgid "Work Report"
 msgstr "Parte de traballo"
 
-#: 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 da planificación por recurso"
-
-#: 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 "Traballo"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:32
-msgid "First name"
-msgstr "Nome"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:221
-msgid "Could not execute print command"
-msgstr "Non se puido executar o 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 "Erro"
@@ -924,7 +3191,7 @@ msgstr "Erro"
 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"
@@ -932,15 +3199,6 @@ msgstr ""
 "Criterion non é válido, outro criterionSatisfaction solápase co mesmo "
 "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 o borrado de {0}. ¿Está seguro?"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60
 msgid "ETC"
 msgstr "ETC"
@@ -953,10 +3211,6 @@ msgstr "Saír"
 msgid "Edit template"
 msgstr "Editar modelo"
 
-#: 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 "engadir nova unidade de configuración"
@@ -965,7 +3219,7 @@ msgstr "engadir nova unidade de configuración"
 msgid "Main preferences"
 msgstr "Preferencias principais"
 
-#: 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"
@@ -973,21 +3227,22 @@ msgstr ""
 "Criterion non válido, outro criterionSatisfaction solápase co mesmo "
 "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 gardado"
 
+#: 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 o nome de campo nun valor de descrición"
+
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:45
 msgid "Add new worker assignment"
 msgstr "Engadir nova asignación de traballador"
 
-#: 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 "os recursos por día deben ser non baleiros e maiores que cero"
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:64
+msgid "Limited resource"
+msgstr "Recursos limitantes"
 
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86
 msgid "Show dependencies:"
@@ -997,22 +3252,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 traballo"
-
-#: 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 non válido, outro criterionSatisfaction solápase co mesmo "
-"criterionType"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21
 msgid "Work Report types"
 msgstr "Tipos de partes de traballo"
@@ -1023,7 +3262,8 @@ msgstr ""
 "A súa sesión expirou tras un tiempo de inactividade. Por favor, inicie "
 "sesión de novo."
 
-#: 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 totais estimadas"
 
@@ -1036,44 +3276,11 @@ msgstr "PROPAGACIÓN"
 msgid "Budgeted Cost Work Scheduled"
 msgstr "Coste de traballo presupostado 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 traballadores virtuais"
-
-#: 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 "O nome non pode ser nulo ou baleiro"
 
-#: 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 ten valores maiores ou iguais có 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 do 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 ""
-"O valor non é válido, o valor máximo por defecto debe ser maior có 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 "Data de fin"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:102
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:101
 msgid "Start Date"
 msgstr "Data de inicio"
 
@@ -1085,10 +3292,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 "o tipo de criterio non permite xerarquí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
@@ -1099,72 +3308,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 "o nome do perfil xa está a ser usado por outro 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 calidade"
-
-#: 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 do usuario"
-
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109
 msgid "Budget hours"
 msgstr "Horas do presuposto"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java:69
-msgid "AS_SOON_AS_POSSIBLE"
-msgstr "TAN_PRONTO_COMO_SEXA_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 tarefa: {0}"
 
-#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43
-msgid "Lines"
-msgstr "Liñas"
-
-#: 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 "Elemento de pedido non atopado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:189
-msgid "Error on showing warning message removing workReportType: "
-msgstr ""
-"Erro ao mostrar mensaxe de advertencia borrando tipo de parte de traballo: "
-
 #: 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 "
@@ -1182,33 +3342,17 @@ msgstr "debe ser maior cá data 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 persoais"
-
-#: 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 traballo"
-
 #: 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 "Gardar pedido"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:92
-msgid "{0} annotation required on {1}"
-msgstr "{0} anotación obrigatoria 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 "Prezo por defecto"
 
@@ -1216,122 +3360,44 @@ msgstr "Prezo 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 da pestana"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212
-msgid "Add Criterion"
-msgstr "Engadir criterio"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:201
-msgid "Fattened Tree {0}"
-msgstr "Árbore aplanada {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 "É necesario un MessagesContainer"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:234
 msgid "passwords don't match"
 msgstr "os contrasinais non coinciden"
 
-#: 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 "Data 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 tarefas 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 novo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:198
-msgid "General resource allocation"
-msgstr "Asignación de recursos xeral"
-
-#: 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 traballo"
-
-#: 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 "Non pode ser baleiro ou 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 "Presuposto total"
-
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:50
-msgid "Hierarchy"
-msgstr "Xerarquí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 "A unidade {0} non pode borrarse porque está a ser usada en materiais"
 
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65
 msgid "Reference date"
 msgstr "Data 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 outras asignacións"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148
-msgid "Time period saved"
-msgstr "Período de tiempo gardado"
-
 #: 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 "Orixinal"
+
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30
 msgid "Stretches function configuration"
 msgstr "Configuración da función de tramos"
@@ -1340,17 +3406,18 @@ msgstr "Configuración da 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 traballo 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 "Non 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 materiais paa tódalas categorías (seleccione unha para filtrar)"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:93
 msgid "User disabled"
 msgstr "Usuario deshabilitado"
 
@@ -1362,24 +3429,10 @@ msgstr "Nome do elemento de pedido"
 msgid "Association with profiles"
 msgstr "Asociación con perfís"
 
-#: 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 "Traballadores"
-
-#: 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 "data de fin: {0} debe ser posterior á data 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 do 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 "apelidos do traballador non especificados"
@@ -1393,31 +3446,15 @@ msgstr "Erro ao borrar tipo de parte de traballo: "
 msgid "Save changes"
 msgstr "Gardar 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 "Ano"
-
-#: 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 "nome do perfil non 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 "O valor non é válido, o valor actual debe ser menor que o valor máximo"
-
-#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:60
-msgid "Date Start"
-msgstr "Data 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 "Data de subcontratación"
@@ -1427,54 +3464,29 @@ msgid "Edit external company"
 msgstr "Editar empresas 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 elixidos"
-
-#: 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 "Engadir 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 ""
-"A data de fin dunha excepción debe ser maior ou igual cá data de inicio"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:176
 msgid "Work report type saved"
 msgstr "Tipo de partes de traballo gardado"
 
-#: 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 "Non pode ser posterior á data de fin"
 
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:79
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:133
 msgid "Prefix"
 msgstr "Prefixo"
 
@@ -1482,57 +3494,28 @@ msgstr "Prefixo"
 msgid "New Template element"
 msgstr "Novo elemento de modelo"
 
-#: 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 ""
-"O {0} non se pode asignar a este recurso. O seu intervalo solápase con outro "
-"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 pai non atopado"
 
-#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66
-msgid "Work done until ending date:"
-msgstr "Traballo realizado ata a data de fin:"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63
-msgid "Schedule Performance Index"
-msgstr "Índice de rendemento da 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 do tipo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:343
-msgid "The order element code cannot be null"
-msgstr "O código do elemento de pedido non pode ser nulo"
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:106
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:109
+msgid "Non Consolidated"
+msgstr "Non 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"
@@ -1548,23 +3531,19 @@ msgstr "O nome do campo debe ser único, non nulo e non baleiro"
 msgid "Position"
 msgstr "Posición"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:189
-msgid "Error removing element: "
-msgstr "Erro ao borrar elemento: "
-
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39
-msgid "Company name"
-msgstr "Nome da 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 traballo"
 
-#: 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 as tarefas do pedido"
@@ -1573,23 +3552,15 @@ msgstr "Todas as tarefas do 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 "Xa existe un campo de descrición co mesmo nome."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:458
-msgid "Split new assignment"
-msgstr "Dividir nova 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"
@@ -1599,100 +3570,32 @@ msgstr "Nivel de zoom"
 msgid "Quality form"
 msgstr "Formulario de calidade"
 
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:170
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:217
-msgid "Expiry date"
-msgstr "Data de vencemento"
-
 #: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:26
 msgid "Profile data"
 msgstr "Datos do 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 á saída directamente"
-
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:163
-msgid "Add new hours group"
-msgstr "Engadir novo 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 "Porcentaxe"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:221
-msgid "Manage criteria"
-msgstr "Xestionar criterios"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeModel.java:76
+msgid "It was not possible load entity. Not found. Id: "
+msgstr "Non foi posible cargar a entidade. Non atopada. 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 traballador seleccionado"
-
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:80
-msgid "Number of digits"
-msgstr "Número de díxitos"
-
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28
-msgid "Total capability"
-msgstr "Capacidade 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 conectando co servizo web cliente"
-
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:21
-msgid "Templates"
-msgstr "Modelos"
+#: 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"
@@ -1702,43 +3605,24 @@ msgstr "Porcentaxe de cantidade de traballo"
 msgid "Date last advance reported"
 msgstr "Data ú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 do criterio satisfeito non especificado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:202
-msgid "Advances sent successfully"
-msgstr "Os avances enviáronse 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} da categoría {1} e {2} da categoría {3} teñen o mesmo 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 "Busca 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 "Non se puido atopar o elemento: {0}"
 
@@ -1746,156 +3630,84 @@ msgstr "Non se puido atopar o elemento: {0}"
 msgid "Confirm deleting this profile. Are you sure?"
 msgstr "Confirmar o borrado deste perfil. ¿Está seguro?"
 
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21
-msgid "NavalPlan: AdvanceTypes"
-msgstr "NavalPlan: Tipos de avance"
+#: 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 unidade non atopado"
 
-#: 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 da tarefa"
-
-#: 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 data:"
-
 #: 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 da 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 unha data de fin para a 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 "Só pode estar activo unha secuencia de pedido"
 
-#: navalplanner-webapp/src/main/webapp/common/configuration.zul:51
-msgid "Company code"
-msgstr "Código da empresa"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109
-msgid "Unknown attribute '{0}' in class {1}"
-msgstr "Atributo descoñecido '{0}' na 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 "nome da máquina non 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 "Seleccione un elemento de pedido a partir do que crear unha 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 "xa 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 maior que a data 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 "[xenérico todos os traballadores]"
-
 #: 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 "Tipo de criterio e os seus criterios gardados"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115
 msgid "Add New Complementary Field"
 msgstr "Engadir novo 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"
@@ -1905,15 +3717,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 anterior á data de fin"
 
@@ -1921,13 +3733,9 @@ msgstr "debe ser anterior á data 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 "nome do traballador non 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
@@ -1939,19 +3747,15 @@ msgstr "Recurso"
 msgid "Could not load any resource"
 msgstr "Non se puido cargar un recurso"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266
-msgid "date not specified"
-msgstr "data non especificada"
+#: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
+msgid "NavalPlan: Working arrangements report"
+msgstr "NavalPlan: Informe de plans de traballo"
 
-#: 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 materiais"
 
-#: 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"
@@ -1959,43 +3763,24 @@ msgstr ""
 "Debe permitir múltiples criterios activos para este tipo para usar esta "
 "estratexia 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 axustar ao ancho de páxina"
-
 #: 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 "Pechar"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:55
-msgid "Last name"
-msgstr "Apelidos"
-
-#: 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 "nome da categoría de coste non especificado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:298
+msgid "Time filter"
+msgstr "Filtrado de tempo"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:354
 msgid "Create copy"
@@ -2005,6 +3790,10 @@ msgstr "Crear copia"
 msgid "Company data"
 msgstr "Datos da empresa"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:185
+msgid "Unit type code cannot be empty"
+msgstr "O código de tipo de unidade non pode ser baleiro"
+
 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21
 msgid "Criterions Requirement"
 msgstr "Criterios requiridos"
@@ -2013,10 +3802,6 @@ msgstr "Criterios requiridos"
 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"
@@ -2030,31 +3815,10 @@ msgstr "Porcentaxe de lonxitude"
 msgid "Label Type fields"
 msgstr "Campos de tipo de etiqueta"
 
-#: navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul:47
-msgid "Name name"
-msgstr "Nome nome"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:163
-msgid "Edit quality form"
-msgstr "Editar formulario de calidade"
-
 #: 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 "Tarefas subcontratadas"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:292
-msgid "{0} must not be before {1}"
-msgstr "{0} non 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 "o nome da empresa debe ser único. Xa está a ser usado"
@@ -2064,26 +3828,14 @@ msgstr "o nome da empresa debe ser único. Xa está a ser usado"
 msgid "Template saved"
 msgstr "Modelo gardado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:375
-msgid "the code must be not null or not empty"
-msgstr "o código non pode ser nulo ou baleiro"
-
-#: 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 ""
-"A data de inicio non é válida, a data de inicio nova debe ser anterior data "
-"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 ""
+"o parte de traballo non ten ningún valor de descrición con ees valor de campo"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:160
 msgid "User saved"
@@ -2093,42 +3845,14 @@ msgstr "Usuario gardado"
 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 traballo"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:968
 msgid "Some cost category assignments overlap in time"
 msgstr "Algunhas asignacións a categorías de coste solápanse no tempo"
 
-#: 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 "Gardar"
-
 #: 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
@@ -2143,11 +3867,11 @@ msgstr "Saír da 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"
@@ -2156,60 +3880,23 @@ msgstr "Activado"
 msgid "Statistics list "
 msgstr "Lista de estatísticas"
 
-#: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21
-msgid "NavalPlan: QualityForms"
-msgstr "NavalPlan: Formularios de calidade"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:276
+msgid "Filter by worker"
+msgstr "Filtrar por traballadores"
 
-#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
-msgid "Edit advance type data"
-msgstr "Editar datos do tipo de avance"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:131
-msgid "Pending update"
-msgstr "Actualización pendente"
-
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59
-msgid "End date:"
-msgstr "Data 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 ""
-"O valor non é válido, o valor debe ser maior có valor dos avances previos."
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:295
-msgid "Order Element code cannot be null"
-msgstr "O código do elemento de pedido non pode 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 das tarefas de planificacion dun 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 "Vai cambiar a 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 co servizo 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 alo menos dous tramos para facer interpolación"
@@ -2218,120 +3905,68 @@ msgstr "Debe haber alo menos dous tramos para facer interpolación"
 msgid "Show all labels"
 msgstr "Mostrar todas as 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: i recurso almacenado non é 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 traballadores"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:108
-msgid "End Date"
-msgstr "Data 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 "Gardar e 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 non 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 ""
-"Data de fin estimada para a tarefa (presione enter no cadro de texto para "
-"abrir o calendario ou escriba a data directamente)"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519
 msgid "Order saved"
 msgstr "Pedido gardado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:475
-msgid "Move down"
-msgstr "Mover abaixo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26
-msgid "Report structure"
-msgstr "Estrutura do parte"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:84
-msgid "password not specified"
-msgstr "contrasinal non especificado"
-
-#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56
-msgid "Yes"
-msgstr "Si"
-
 #: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:25
 msgid "Assigned locations"
 msgstr "Ubicacións asignadas"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:57
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39
-msgid "General data"
-msgstr "Datos xerais"
-
-#: 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 traballadas por traballador"
 
-#: 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 unidade gardado"
 
-#: navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul:13
-msgid "Apply filtering to machines satisfying required criteria"
-msgstr "Aplicar filtrado ás máquinas que satisfán os criterios requeridos"
+#: 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 ""
+"Elemento de pedido {0} : Grupo de liñas de pedido con 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 "Dous costes por hora co mesmo tipo solápanse no tempo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:129
-msgid "missing code in a criterion"
-msgstr "falta código nun 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 modelo"
-
 #: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:63
 msgid "Ok"
 msgstr "Aceptar"
@@ -2340,49 +3975,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 gardado"
-
 #: 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 non 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 maior que a data 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 "O servizo non xestiona recursos de tipo: {0}"
-
 #: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:35
 msgid "Work report listing"
 msgstr "Listado de partes de traballo"
@@ -2396,83 +4023,44 @@ msgstr "Cancelar e volver"
 msgid "Assign quality form"
 msgstr "Asignar formulario de calidade"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:39
-msgid "Edit worker"
-msgstr "Editar traballador"
-
-#: 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 o calendario pai"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:67
-msgid "Hours of day"
-msgstr "Horas do día"
+#: navalplanner-webapp/src/main/webapp/materials/_editUnitType.zul:49
+msgid "Unit measure name"
+msgstr "Nome da unidade de medida"
 
 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:37
 msgid "worked hours"
 msgstr "horas traballadas"
 
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java:297
-msgid "criterion satisfaction with end date less than start date"
-msgstr "o criterio satisfeito ten data de fin anterior á 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 "unha liña de parte de traballo non ten este tipo de etiqueta asignado"
 
-#: 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 "Asignacións"
 
-#: 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 "Capacidade"
-
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
 msgid "Length"
 msgstr "Lonxitude"
 
+#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:33
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:83
+msgid "Capacity"
+msgstr "Capacidade"
+
 #: 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 maior 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 "Erro ao 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"
@@ -2481,40 +4069,14 @@ msgstr "debe ser un número real positivo"
 msgid "No Allocations have been done"
 msgstr "Non se fixeron asignacións"
 
-#: 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 sen fillos"
-
-#: 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 "COMEZAR_EN_DATA_FIXA"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:134
-msgid "Profile saved"
-msgstr "Perfil gardado"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:53
-msgid "Task properties"
-msgstr "Propiedades da tarefa"
-
 #: 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 "
@@ -2523,41 +4085,10 @@ msgstr ""
 "Non se pode borrar o elemento de pedido \"{0}\" porque algún dos seus "
 "elementos está a usarse nalgún parte de traballo"
 
-#: 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 algunha 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 sexa posible"
 
-#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27
-#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:33
-msgid "Surname"
-msgstr "Apelidos"
-
-#: 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 "Data"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:360
-msgid "the name must be not null or not empty"
-msgstr "o nome non pode ser nulo ou baleiro"
-
 #: 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 "o NIF da empresa debe ser único. Xa está a ser usado"
@@ -2577,20 +4108,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 "Novo parte de traballo"
 
-#: 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 liñas 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"
@@ -2599,133 +4120,64 @@ msgstr "A3"
 msgid "Date Finish"
 msgstr "Data 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 "O criterio e o seu tipo non poden 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 "Erro ao 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 "Non se poden calcular gráficos para os datos actuais"
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:145
+msgid "missing code in a hour cost"
+msgstr "falta código nun coste por hora"
 
-#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57
-msgid "Found workers"
-msgstr "Traballadores atopados"
-
-#: 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 os traballadores"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:239
-#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48
-msgid "Work description"
-msgstr "Descrición do traballo"
-
-#: 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 gardada"
 
-#: 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 conxunto de criterios requeridos e pulse o 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 ""
-"Ao subcontratar esta tarefa, todas as súas asignacións de recursos "
-"borraranse."
-
-#: 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 "Gardar e 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 "Abaixo"
-
-#: 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 do 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
@@ -2734,51 +4186,20 @@ msgstr "Costes do pedido por recurso"
 msgid "cannot be null or empty"
 msgstr "non pode ser nulo ou baleiro"
 
-#: 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 "O valor non é válido, tendo en conta a lista actual de HoursGroup"
-
 #: 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 "Novo código"
 
-#: 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 calidade"
-
-#: 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 "Os campos de índice e as etiquetas deben ser únicas e 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 o comezo ata a data 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."
@@ -2790,136 +4211,68 @@ msgstr ""
 msgid "Estimate To Complete"
 msgstr "Estimación do coste pendente"
 
-#: 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 "Non se pode borrar ese material porque está a 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 "data de inicio da asignación de coste non 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 unidade"
 
-#: 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 "o código do material debe ser único. Xa 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 saída:"
+#: navalplanner-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:22
+msgid "NavalPlan: Type of work hours"
+msgstr "NavalPlan: Tipos de horas de traballo"
 
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41
 msgid "Load due to other assignments"
 msgstr "Carga debido a outras asignacións"
 
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55
-#: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55
-msgid "Reference date:"
-msgstr "Data de referencia:"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:76
-msgid "Work week"
-msgstr "Semana de traballo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:126
-msgid "You will lose the changes. Are you sure?"
-msgstr "Perderanse os 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 virtuais de traballadores"
-
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:25
 msgid "Calendar data"
 msgstr "Datos do calendario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:288
-msgid "Resource cannot be null"
-msgstr "O recurso non pode 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 o comezo (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 "o nome de usuario xa está sendo usado"
 
-#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
-msgid "Total Hours"
-msgstr "Horas totais"
-
-#: 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 "o código xa está a ser usado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java:71
-msgid "All orders"
-msgstr "Todos os pedidos"
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:66
+msgid "Task start :"
+msgstr "Inicio da tarefa :"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:148
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:151
 msgid "Criterion Requirements"
 msgstr "Criterios requiridos"
 
-#: 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 "Os avances calculados non se poden 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 de 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 do 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 perfís 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 ""
 "os valores de propagación non son válidos, alo menos un debe ser verdadeiro"
@@ -2932,22 +4285,7 @@ msgstr "Crear e 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 non 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 "Erro ao mostrar o 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 traballo"
 
@@ -2963,50 +4301,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 requiridos"
-
-#: 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 ""
-"Os cambios que non foron gardados perderanse. ¿Está seguro de que quere ir á "
-"creación de modelos?"
-
-#: 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 "Prezo 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 gardada"
+#: navalplanner-webapp/src/main/webapp/common/page_not_found.zul:20
+msgid "NavalPlan: Page not found"
+msgstr "NavalPlan: Páxina non atopada"
 
-#: 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 "A data non pode 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 "Engadir nova fila"
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:22
+msgid "NavalPlan: Work report types"
+msgstr "NavalPlan: Tipos de partes de traballo"
 
-#: 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 "Erro ao mostrar a confirmación de borrado"
 
@@ -3014,54 +4329,32 @@ msgstr "Erro ao mostrar a confirmación de borrado"
 msgid "Show only current satisfied criteria"
 msgstr "Mostrar só os criterios satisfeitos actualmente"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138
-msgid "Could not save new criterion"
-msgstr "Non se puido gardar o novo 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 as 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 as 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óns"
-
-#: 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 "Feito {0} de {1}"
 
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46
-msgid "Load due to current order"
-msgstr "Carga debido ao pedido actual"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeComponent.java:93
-msgid "Deadline (days since beggining project)"
-msgstr "Data límite (días desde o inicio do proxecto)"
-
-#: 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 "Non se pode borrar esta secuencia de pedido, está a ser 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"
 
@@ -3073,40 +4366,23 @@ msgstr ""
 "O último tramo debe ter 100% de porcentaxes de lonxitude e cantidade de "
 "traballo"
 
-#: 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 non calculado correctamente basado en reloxo"
-
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31
 msgid "Each worker configuration unit name"
 msgstr "Nome da unidade de configuración de cada traballador"
 
-#: 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 "O valor non é válido, o tipo non pode estar baleiro"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:406
-msgid "criterion type name is already being used"
-msgstr "o nome de tipo de criterio está sendo usado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:393
-msgid "Could not get order code, please try again later"
-msgstr ""
-"Non se puido obter o código de pedido, por favor volva intentalo máis tarde"
-
-#: 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 "O valor non é válido, o valor actual non debe estar baleiro"
 
-#: 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"
 
@@ -3118,38 +4394,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 "Accións"
-
 #: 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 "Novo elemento de pedido"
-
 #: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:52
 msgid "Precision"
 msgstr "Precisión"
@@ -3158,44 +4410,28 @@ msgstr "Precisión"
 msgid "Date last advance measurement"
 msgstr "Data da ú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 "Excepcións"
-
-#: 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 ""
-"Non se pode borrar o elemento de pedido \"{0}\" porque algún dos seus fillos "
-"está a usarse nalgún parte de traballo"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:173
-msgid "format filters are not valid"
-msgstr "o formato dos filtros non é válido"
+#: 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 nunha liña de parte de traballo"
 
 #: 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 "Non ten 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 "A data de inicio non pode ser baleira"
+#: 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 "Xerar código"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:172
 msgid ""
@@ -3205,10 +4441,6 @@ msgstr ""
 "O calendario non foi borrado porque aínda ten fillos. Algún outro calendario "
 "deriva deste."
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88
-msgid "Our company password"
-msgstr "Contrasinal da nosa empresa"
-
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:27
 msgid "Select print page properties"
 msgstr "Seleccione as propiedades da páxina de impresión"
@@ -3217,15 +4449,7 @@ msgstr "Seleccione as propiedades da páxina de impresión"
 msgid "criterion satisfaction's criterion not specified"
 msgstr "criterio do criterio satisfeito non 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"
 
@@ -3234,37 +4458,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 ""
-"O valor non é válido.\n"
-" o código no pode conter 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 perfís"
 
-#: 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áficas de planificación expandidas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:909
-msgid "Unallocated name"
-msgstr "Nome 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"
 
@@ -3277,7 +4489,7 @@ msgid "Create quality form"
 msgstr "Crear formulario de calidade"
 
 #: 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
@@ -3285,7 +4497,7 @@ msgstr "Crear formulario de calidade"
 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."
@@ -3293,28 +4505,10 @@ msgstr ""
 "Os modelos só poden crearse a partir de elementos de pedido existentes.\n"
 "Non se poden usar elementos de pedido novos."
 
-#: 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} reasignacións"
 
-#: 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 "Data de comunicación da subcontratación"
-
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:118
-msgid "Dependencies have priority"
-msgstr "As dependencias teñen prioridade"
-
 #: navalplanner-business/src/main/java/org/navalplanner/business/common/IntegrationEntity.java:45
 msgid "code not specified"
 msgstr "código non especificado"
@@ -3323,18 +4517,6 @@ msgstr "código non 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."
@@ -3342,53 +4524,20 @@ msgstr ""
 "Non se pode borrar o tipo de parte de traballo. Hai algún parte de traballo "
 "ligado a el."
 
-#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21
-msgid "Type of work hours listing"
-msgstr "Listado de tipos de horas de traballo"
-
-#: 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 "Traballo realizado desde a data de inicio:"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java:79
-msgid "Must start after"
-msgstr "Debe empezar despois"
-
-#: 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 "Contrasinal"
 
 #: 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 "Observacións"
 
-#: 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 "Imaxe 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"
 
@@ -3396,92 +4545,63 @@ msgstr "Válido desde"
 msgid "There exists other template with the same name."
 msgstr "Xa existe outro modelo co mesmo nome."
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/calendars/impl/CalendarConverter.java:214
+msgid "exception date already exists"
+msgstr "a data de excepción xa 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 gardada"
 
-#: 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 "Necesítase alo menos unha 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 ""
 "Non se pode insertar material na vista xeral. Por favor, seleccione unha "
 "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 "data de inicio do criterio satisfeito non especificada"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java:115
-msgid "The password for a new user cannot be empty"
-msgstr "O contrasinal non pode ser baleiro para un usuario novo"
-
-#: 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 "Nome do 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 "Exemplo: {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 nova asignación de material fóra da 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 traballador"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:183
-msgid "Cannot be higher than Ending date"
-msgstr "Non pode ser posterior á data 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 "Liñas do parte de traballo"
@@ -3490,47 +4610,17 @@ msgstr "Liñas do parte de traballo"
 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 persoais"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:205
-msgid "Workers List"
-msgstr "Lista de traballadores"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:243
-msgid "Worker"
-msgstr "Traballador"
-
-#: 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 "O criterio non 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 "nome do criterio non 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 ""
+"Erro preparando o formulario de edición para o 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 " O "
 
-#: 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 ""
-"O valor non é válido, o valor máximo por defecto non debe estar baleiro "
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:199
-msgid "the "
-msgstr "o "
-
-#: 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 ao sistema"
 
@@ -3544,24 +4634,11 @@ msgstr "Acceso ao 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 do 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"
@@ -3579,26 +4656,39 @@ msgstr "Notificar avance"
 msgid "instance not found"
 msgstr "instancia non atopada"
 
+#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:78
+msgid "Priority"
+msgstr "Prioridade"
+
 #: 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 "o nome do criterio debe ser único dentro dun 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 modelo"
-
+#: 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
@@ -3611,7 +4701,7 @@ msgstr "Crear pedido a partir de modelo"
 #: 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"
 
@@ -3619,28 +4709,24 @@ msgstr "Código"
 msgid "Filters"
 msgstr "Filtros"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:289
-msgid "Materials saved"
-msgstr "Materiais gardados"
-
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:40
 msgid "Add stretch"
 msgstr "Engadir 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 ""
 "A data de inicio non é válida, a data de inicio nova debe ser anterior á "
 "data 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 "As horas para un día de excepción deben ser maiores o iguais a cero"
 
@@ -3650,12 +4736,12 @@ msgstr "As horas para un día de excepción deben ser maiores o iguais a cero"
 msgid "Start date"
 msgstr "Data 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 "Non se pode realizar a operación"
 
@@ -3664,7 +4750,7 @@ msgstr "Non se pode realizar a operación"
 msgid "Budget"
 msgstr "Presuposto"
 
-#: 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 "Xa existe outro criterio co mesmo nome"
 
@@ -3672,25 +4758,6 @@ msgstr "Xa existe outro criterio co mesmo nome"
 msgid "Unit name"
 msgstr "Nome da unidade"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java:217
-msgid "Could open generated PDF"
-msgstr "Non se puido abrir o PDF xerado"
-
-#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:45
-msgid "Code cannot be null or empty"
-msgstr "O código non pode ser nulo ou baleiro"
-
-#: 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 "Nome do 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"
@@ -3700,7 +4767,7 @@ msgstr "Escribir"
 msgid "Number of applications"
 msgstr "Número de aplicacións"
 
-#: 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"
 
@@ -3712,70 +4779,41 @@ msgstr ""
 "Data despois da cal a tarefa debe empezar (presione enter no cadro de texto "
 "para abrir o calendario ou escriba a data 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 "A data non pode 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 "O nome non é válido, xa hai outro tipo de avance co mesmo nome. "
-
 #: 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 "Erro: {0}"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyCRUDController.java:135
-msgid "Company saved"
-msgstr "Empresa gardada"
-
 #: 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 xa está asignado ao tipo de parte de traballo."
 
-#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52
-msgid "Do you want to delete &quot;{0}&quot;?"
-msgstr "¿Quere 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 novo"
 
-#: 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 "Pai"
-
-#: 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
@@ -3784,60 +4822,40 @@ msgstr "Pai"
 msgid "Description"
 msgstr "Descrición"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:112
-msgid "Type of work hours saved"
-msgstr "Tipo de horas de traballo gardado"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:212
-msgid "Work report list"
-msgstr "Lista de partes de traballo"
-
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:71
 msgid "Expand all taskgroups"
 msgstr "Expandir todos os grupos de tarefas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63
-msgid "Not found converter for {0}"
-msgstr "Non se atopou 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 "comezar en data fixa"
+#: 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 "Asignacións de materiais"
-
-#: 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 "xa existe unha asignación para os 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 aplicacións 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 ""
-"O valor non é válido, o valor de precisión debe ser menor que o 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 "É necesario alo 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"
@@ -3854,41 +4872,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 nova semana de traballo"
-
 #: navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul:33
 msgid "Work report lines listing"
 msgstr "Listado de liñas de parte de traballo"
 
-#: 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 "Rexistro de traballo"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:287
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:100
 msgid "Select the calendar"
 msgstr "Seleccionar o calendario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174
-msgid "Criterion saved"
-msgstr "Criterio gardado"
-
-#: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:129
-#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
-msgid "Output format"
-msgstr "Formato de saída"
-
-#: 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 "Os prefixos das secuencias de pedido non poden repetirse"
 
@@ -3905,84 +4902,14 @@ msgstr "Os prefixos das secuencias de pedido non poden repetirse"
 msgid "Starting date"
 msgstr "Data 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 materiais ao longo do tempo"
 
-#: 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} non atopado tipo para criterio "
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:368
-msgid "Hours cannot be null"
-msgstr "As horas non poden ser nulas"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:447
-msgid "resource type does not allow enabled criteria"
-msgstr "o tipo de recurso non 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 xerais do usuario"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200
-msgid "Subcontracted task sent successfully"
-msgstr "A tarefa subcontratada enviouse 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 virtuais"
-
-#: 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
@@ -3996,25 +4923,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
@@ -4028,14 +4956,6 @@ msgstr "Editar"
 msgid "Workers list"
 msgstr "Lista de traballadores"
 
-#: 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 ""
-"Algunhas liñas non teñen períodos de asignación.\n"
-"Debaixo móstrase a carga de tódolos recursos da empresa"
-
 #: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67
 msgid "Init date"
@@ -4045,48 +4965,20 @@ msgstr "Data 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 "Datas"
-
-#: 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 "Necesítase alo menos un tramo"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:182
-msgid "Satisfied"
-msgstr "Satisfeito"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java:437
 msgid "percentage must be in range (0,100]"
 msgstr "a porcentaxe debe estar no 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 "A data do tramo debe ser maior ou igual cá data de inicio da tarefa"
-
 #: 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 "Nova descrición"
 
-#: 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 ""
@@ -4098,11 +4990,7 @@ msgstr ""
 msgid "XML"
 msgstr "XML"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60
-msgid "Task Properties"
-msgstr "Propiedades da tarefa"
-
-#: 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"
@@ -4110,35 +4998,14 @@ msgstr ""
 "CriterionType non válido, o criterionType solápase con outro "
 "criterionSatisfaction co mesmo criterionType"
 
-#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35
-msgid "Create new Work Report Type"
-msgstr "Crear novo tipo de parte de traballo"
-
-#: 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 ""
-"Data de fin inválida, a data de fin nova debe ser posterior á data de inicio"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:140
-msgid "Cost category saved"
-msgstr "Categoría de coste gardada"
-
-#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:12
-#: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
-msgid "name"
-msgstr "nome"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ResourceEnumConverter.java:61
 msgid "Unable to convert {0} value to {1} type"
 msgstr "Non se puido convertir o valor {0} ao 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 "Prezo da unidade"
 
@@ -4146,47 +5013,33 @@ msgstr "Prezo da unidade"
 msgid "Communication date"
 msgstr "Data 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 ""
+"Non se pode borrara categoría de coste porque hai recursos asignados a ela."
 
-#: 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} xa está na 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 "Unidade 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 "O tipo de horas no pode ser nulo."
 
-#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56
-msgid "Authorizations"
-msgstr "Autorizacións"
-
-#: 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 "A data de inicio non pode 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
@@ -4195,14 +5048,15 @@ msgstr "A data de inicio non pode 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"
 
@@ -4210,53 +5064,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 "O valor non é válido, o valor de precisión debe ser exacto "
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49
-msgid "Generic"
-msgstr "Xené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 "A data de inicio da excepción debe ser maior cá data 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 " no directorio especificado."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java:127
-msgid "Order does not exist"
-msgstr "O pedido non existe"
-
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:76
 msgid "Autogenerated"
 msgstr "Autoxerado"
 
-#: 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 "o código do criterio debe ser único dentro dun 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 "Engadir criterio requirido"
-
-#: 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 traballo por tarefa"
@@ -4266,61 +5090,33 @@ msgid "New order element name:"
 msgstr "Nome do novo 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 unha etiqueta"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:313
-msgid "Calculate End Date"
-msgstr "Calcular data 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 traballo"
 
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:106
-msgid "Add profile"
-msgstr "Engadir perfil"
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:65
+msgid "Generate code for"
+msgstr "Xerar código para"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:162
-msgid "filter already exists"
-msgstr "o filtro xa 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 "Nome do 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 o código nunha 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 "os valores non son válidos, non deben ser nulos"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54
 msgid "Actual Cost Work Performed"
 msgstr "Coste de traballo realizado"
 
-#: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
-msgid "Task name"
-msgstr "Nome da tarefa"
-
-#: navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:127
-msgid "cost assignment's resource not specified"
-msgstr "recurso da asignación de coste non 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"
@@ -4338,61 +5134,26 @@ msgstr "Media de horas traballadas"
 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 "Non asignado"
-
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:141
-msgid "Task information"
-msgstr "Información de tarefa"
-
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100
-msgid "Add new criterion requirement"
-msgstr "Engadir novo criterio requirido"
-
-#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24
-msgid "Select the date from which the new version will be valid"
-msgstr "Seleccione a data a partir da cal a versión nova 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 despois de (días desde o inicio do proxecto)"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55
-msgid "Budgeted Cost Work Performed"
-msgstr "Coste presupostado do traballo 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 "Engadir"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java:272
-msgid "the name must be not empty"
-msgstr "o nome non pode ser baleiro"
-
-#: 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 gañado"
-
-#: 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 o tipo de excepción"
 
@@ -4407,7 +5168,8 @@ msgstr "data límite"
 msgid "You don't have permissions to edit this order"
 msgstr "Non ten 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"
 
@@ -4423,19 +5185,10 @@ msgstr "A porcentaxe de cantidade de traballo debe estar entre 0 y 100"
 msgid "Machine data"
 msgstr "Datos da máquina"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/Type.java:42
-msgid "From Today"
-msgstr "A partir de hoxe"
-
 #: 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índa non soportado"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:177
 msgid "Advanced Allocation"
 msgstr "Asignación avanzada"
@@ -4450,142 +5203,104 @@ msgstr "Tipo de etiqueta"
 msgid "Template Tree"
 msgstr "Árbore de modelos"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52
-msgid "New entry"
-msgstr "Entrada nova"
-
 #: 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 pai inconsistente."
 
-#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:31
-msgid "Overload due to current order"
-msgstr "Sobrecarga debido ao 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 gardada"
-
-#: 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 requiridos 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 traballadas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:524
 msgid "the date must be inside the visualization area"
 msgstr "a data debe estar dentro da á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 "o parte de traballo non ten este tipo de etiqueta asignado"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:499
 msgid "date not specified."
 msgstr "data non 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 calidade"
 
-#: 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 "O nome do criterio está baleiro."
 
-#: 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 "O valor máximo non pode ser baleiro"
 
-#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:55
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:66
 msgid "New label"
 msgstr "Nova 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 aos elementos de pedido que satisfán os 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 "A data de inicio non pode 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 "Non"
-
-#: 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 "O nome non é válido, non 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 "Prezo de subcontratación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:112
-msgid "A category must be selected"
-msgstr "Debe seleccionar unha 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 virtuais de traballadores"
 
-#: 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
@@ -4593,7 +5308,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 "Axuda sobre a identificación (abre unha ventana nova)"
 
@@ -4601,59 +5316,28 @@ msgstr "Axuda sobre a identificación (abre unha ventana nova)"
 msgid "The length must be greater than 0, and not null."
 msgstr "A lonxitude debe ser maior que cero e non nula."
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50
-msgid "Group name"
-msgstr "Nome do grupo"
-
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
-msgid "Start date:"
-msgstr "Data de inicio:"
-
-#: navalplanner-webapp/src/main/webapp/users/_editUser.zul:81
-#: navalplanner-webapp/src/main/webapp/users/_editProfile.zul:57
-msgid "Role name"
-msgstr "Nome do 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 "Non se puido gardar o calendario novo"
 
-#: 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 "O valor non é válido, o valor de precisión non debe estar baleiro"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/ProfileCRUDController.java:188
-msgid "Cannot delete profile: it does not exist anymore"
-msgstr "Non se pode borrar o perfil: xa non existe"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:132
+msgid "Deleted unit type {0}"
+msgstr "Borrado tipo de unidade {0}"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135
 msgid "Couldn't find criterion {0}"
 msgstr "Non se puido atopar o criterio {0}"
 
-#: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:95
-msgid "Create &amp; Assign"
-msgstr "Crear e asignar"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99
-msgid "Add Milestone"
-msgstr "Engadir fito"
-
-#: 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 "Erro 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"
@@ -4662,14 +5346,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
@@ -4678,87 +5363,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 traballo"
-
 #: 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 "Saída 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 traballo"
 
-#: 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 das 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 materiais para a 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 "Prezo 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 "Xestionar 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 "A data non é 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
@@ -4770,9 +5440,25 @@ msgstr "A data non é 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 perfís"
+#: 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 calculadas en base a reloxo."
+
+#: 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 e hora."
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33
+msgid "heading"
+msgstr "cabeceira"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java:33
+msgid "line"
+msgstr "liña"
 
 #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java:32
 msgid "RESOURCE"
@@ -4786,6 +5472,18 @@ msgstr "TRABALLADOR"
 msgid "MACHINE"
 msgstr "MÁQUINA"
 
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1068
+msgid "yes"
+msgstr "si"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:1068
+msgid "no"
+msgstr "non"
+
+#: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:53
+msgid "[generic all workers]"
+msgstr "[xenérico todos os traballadores]"
+
 #: 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"
@@ -4800,6 +5498,10 @@ msgstr "o número de díxitos debe estar entre {0} e{1}"
 msgid "Line"
 msgstr "Liña"
 
+#: 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 "A dependencia de cola debe ter unha orixe diferente do 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"
@@ -4813,6 +5515,10 @@ msgstr "Fallo no envío"
 msgid "Success sent"
 msgstr "Éxito no 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 "A hora debe ser un valor entre 0 e 23"
+
 #: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:27
 msgid "Finished"
 msgstr "Rematado"
@@ -4825,19 +5531,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 "o tipo de recurso debe ser Traballador ou 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 "As horas de traballo non poden 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 "A porcentaxe 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 "
@@ -4846,7 +5552,7 @@ msgstr ""
 " O criterio {0} non se pode asignar a este grupo de horas porque o seu tipo "
 "de recurso é distinto."
 
-#: 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 "
@@ -4855,44 +5561,44 @@ msgstr ""
 " O criterio {0} non se pode asignar a este grupo de horas porque xa existe "
 "no 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} xa é fillo doutro {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 "xa está planificado dalgún xeito"
 
-#: 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 "non se pode quitar a 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 "Non 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"
@@ -4900,13 +5606,13 @@ msgstr ""
 "Algún antecesor ten a mesma etiqueta asignada, así que este elemento xa está "
 "herdando 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 "Non pode haber dous avances que propagan nun 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 no elemento de pedido"
 
@@ -4983,6 +5689,56 @@ msgstr "Permitida edición de tódolos pedidos"
 msgid "Order creation allowed"
 msgstr "Permitida creación de pedidos"
 
+#~ msgid "type code has to be unique. It is already used"
+#~ msgstr "o código do tipo debe ser único. Xa 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 "Modelos"
+
+#~ 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 ""
+#~ "Ao subcontratar esta tarefa, todas as súas asignacións de recursos "
+#~ "borraranse."
+
+#~ msgid "materialcode has to be unique. It is already used"
+#~ msgstr "o código do material debe ser único. Xa está en uso"
+
+#~ msgid "Code cannot be null or empty"
+#~ msgstr "O código non pode ser nulo ou baleiro"
+
+#~ msgid ""
+#~ "Some lines have not allocation periods.\n"
+#~ "Below it shows the load all company resources"
+#~ msgstr ""
+#~ "Algunhas liñas non teñen períodos de asignación.\n"
+#~ "Debaixo móstrase a carga de tódolos recursos da empresa"
+
+#~ msgid "Satisfied"
+#~ msgstr "Satisfeito"
+
+#~ msgid "Exception start date should be greater than current date"
+#~ msgstr "A data de inicio da excepción debe ser maior cá data actual"
+
+#~ msgid "&gt;&gt;"
+#~ msgstr "&gt;&gt;"
+
+#~ msgid "Task information"
+#~ msgstr "Información de tarefa"
+
 #~ msgid "Not Unindent"
 #~ msgstr "Non desindentar"
 
@@ -5046,18 +5802,12 @@ msgstr "Permitida creación de pedidos"
 #~ msgid "The order {0} must be scheduled"
 #~ msgstr "O 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 outra máquina que está sendo importada"
 
 #~ msgid "Filter by label:"
 #~ msgstr "Filtrar por etiqueta:"
 
-#~ msgid "{0}: calendar not found"
-#~ msgstr "{0}: calendario non atopado"
-
 #~ msgid "criterion type name is used by another criterion type being imported"
 #~ msgstr ""
 #~ "o nome de tipo de criterio está sendo usado por outro tipo de criterio "