diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po
index 2b1d50737..7bcf9da09 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-01-28 11:13+0100\n"
-"PO-Revision-Date: 2010-01-28 11:45+0100\n"
+"POT-Creation-Date: 2010-02-03 13:36+0100\n"
+"PO-Revision-Date: 2010-02-03 13:57+0100\n"
 "Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
 "Language-Team: Spanish <>\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
-msgid "Show all labels"
-msgstr "Mostrar todas as etiquetas"
-
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:11
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:21
 msgid "Zoom level"
 msgstr "Nivel de zoom"
 
@@ -34,14 +30,6 @@ msgstr "Borrar"
 msgid "0% - 100%"
 msgstr "0% - 100%"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:17
-msgid "Filter"
-msgstr "Filtro"
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:33
-msgid "Critical path"
-msgstr "Camiño crítico"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:30
 msgid "Year"
 msgstr "Ano"
@@ -50,6 +38,10 @@ msgstr "Ano"
 msgid "Month"
 msgstr "Mes"
 
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:34
+msgid "Show/Hide resources"
+msgstr "Mostrar/ocultar recursos"
+
 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:206
 msgid "Set End-Start"
 msgstr "Definir Fin-Inicio"
@@ -66,10 +58,6 @@ msgstr "reducindo zoom"
 msgid "Hide critical path"
 msgstr "Ocultar camiño crítico"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39
-msgid "Show all resources"
-msgstr "Mostrar todos os recursos"
-
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:116
 msgid "+ 100%"
 msgstr "+ 100%"
@@ -78,11 +66,19 @@ msgstr "+ 100%"
 msgid "Day"
 msgstr "Día"
 
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:28
+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/resources/web/ganttz/zul/plannerLayout.zul:42
+#: 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"
 
@@ -110,9 +106,19 @@ msgstr "cambiando zoom"
 msgid "Quarter"
 msgstr "Cuarto"
 
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:14
+msgid "Refresh"
+msgstr "Actualizar"
+
 #: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:404
 msgid "Show critical path"
 msgstr "Mostrar camiño crítico"
 
+#~ msgid "Filter"
+#~ msgstr "Filtro"
+
+#~ msgid "Critical path"
+#~ msgstr "Camiño crítico"
+
 #~ msgid "Zoom increase"
 #~ msgstr "Aumentar zoom"
diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po
index 8bafb5e9c..bfbdffdb2 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-01-28 11:13+0100\n"
-"PO-Revision-Date: 2010-01-28 11:29+0100\n"
+"POT-Creation-Date: 2010-02-03 13:36+0100\n"
+"PO-Revision-Date: 2010-02-03 14:06+0100\n"
 "Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
 "Language-Team: Galician <>\n"
 "MIME-Version: 1.0\n"
@@ -107,7 +107,7 @@ msgstr "Crear traballador virtual"
 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:38
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:33
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:186
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:188
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48
@@ -155,7 +155,7 @@ msgstr "Campos de cabeceira"
 msgid "from"
 msgstr "desde"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:197
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:199
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -167,7 +167,7 @@ msgstr "debe haber {0} horas en lugar de {1}"
 #: 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:56
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:57
 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:32
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:1
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:43
@@ -190,6 +190,10 @@ 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:196
+msgid "Reassign"
+msgstr "Reasignar"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:181
 msgid "A type must be selected"
 msgstr "Debe seleccionar un tipo"
@@ -228,7 +232,7 @@ msgstr "Por favor, seleccione un calendario"
 msgid "Managing fields and labels"
 msgstr "Administrar campos e etiquetas"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:57
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:58
 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:33
 msgid "Quality Forms"
 msgstr "Formularios de calidade"
@@ -241,7 +245,7 @@ msgstr "Resumo"
 msgid "Order sequences"
 msgstr "Secuencias de pedido"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:252
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:254
 msgid "Exportation options"
 msgstr "Opcións de exportación"
 
@@ -299,10 +303,10 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:54
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:73
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:26
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:69
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:71
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:48
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:64
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:180
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:182
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:44
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:56
 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:26
@@ -323,7 +327,7 @@ msgstr "COMEZAR_NON_ANTES_DE"
 
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:80
 msgid "Criterion requirements"
-msgstr "Requisitos do criterio"
+msgstr "Criterios requiridos"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:180
 msgid ""
@@ -349,11 +353,11 @@ msgstr "Gráfico de dedicación"
 msgid "Day of week"
 msgstr "Día da semana"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:484
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:470
 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:619
+#: 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"
 
@@ -374,11 +378,15 @@ msgstr "a asignación de coste ten data de fin anterior á de inicio"
 msgid "Category name"
 msgstr "Nome da categoría"
 
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:62
+msgid "Maximum/minimum of the worked hours"
+msgstr "Máximo/mínimo das horas traballadas"
+
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:57
 msgid "hours type :"
 msgstr "tipo de horas :"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:636
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java:605
 msgid "Not the same material, impossible to update"
 msgstr "Non é o mesmo material, imposible actualizar"
 
@@ -390,7 +398,7 @@ msgstr "Lista de elementos do formulario de calidade"
 msgid "Name/Code"
 msgstr "Nome/Código"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:556
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:585
 msgid "Create order"
 msgstr "Crear pedido"
 
@@ -409,6 +417,10 @@ msgstr "Menú principal"
 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:684
+msgid "Hour start"
+msgstr "Hora de inicio"
+
 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:40
 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:39
 msgid "Create From Template"
@@ -418,13 +430,9 @@ msgstr "Crear a partir de modelo"
 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:684
-msgid "Hour start"
-msgstr "Hora de inicio"
-
 #: 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:147
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:149
 msgid "Start"
 msgstr "Comezo"
 
@@ -499,7 +507,7 @@ msgstr "Código do elemento de pedido"
 msgid "Changes saved"
 msgstr "Cambios gardados"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:736
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:766
 msgid "See scheduling"
 msgstr "Ver planificación"
 
@@ -518,7 +526,7 @@ msgstr "Parte de traballo gardado"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java:52
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:56
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:99
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:101
 msgid "Subcontract"
 msgstr "Subcontratar"
 
@@ -529,7 +537,7 @@ msgstr "Relación"
 
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:56
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:73
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:151
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:153
 msgid "End"
 msgstr "Fin"
 
@@ -547,10 +555,14 @@ 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:520
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:522
 msgid "Indent"
 msgstr "Indentar"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:144
+msgid "must be not empty"
+msgstr "non pode ser baleiro"
+
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:69
 msgid "Show all resource assignments"
 msgstr "Mostrar todas as asignacións de recursos"
@@ -595,7 +607,7 @@ 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:109
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:111
 msgid "Resource allocation"
 msgstr "Asignación de recursos"
 
@@ -655,7 +667,10 @@ 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/orders/OrderCRUDController.java:500
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:491
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:511
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:520
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:541
 msgid "Information"
 msgstr "Información"
 
@@ -686,7 +701,7 @@ msgstr "non se pode pasar mentres o elemento anterior non sexa pasado."
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:41
 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:39
 msgid "Criterion Requirement"
-msgstr "Requisito do criterio"
+msgstr "Criterio requirido"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java:320
 msgid "New hours group "
@@ -728,15 +743,15 @@ msgstr "Derivado"
 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/webapp/orders/_listOrderElementAdvances.zul:28
+msgid "Add new advance assignment"
+msgstr "engadir nova asignación de avance"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java:130
 msgid "there exist multiple calendars with name {0}"
 msgstr "existen múltiples calendarios co nome {0}"
@@ -793,7 +808,7 @@ msgstr "Crear traballador"
 msgid "Delete Milestone"
 msgstr "Borrar fito"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:499
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:510
 msgid "The order has no scheduled elements"
 msgstr "O pedido no ten elementos planificados"
 
@@ -881,7 +896,7 @@ msgstr ""
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1113
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:204
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:195
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:475
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:477
 msgid "Confirm deleting {0}. Are you sure?"
 msgstr "Confirmar o borrado de {0}. ¿Está seguro?"
 
@@ -913,7 +928,7 @@ msgstr ""
 "Criterion non válido, outro criterionSatisfaction solápase co mesmo "
 "criterionType"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:196
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:214
 msgid "The order {0} must be scheduled"
 msgstr "O pedido {0} debe ser planificado"
 
@@ -962,7 +977,7 @@ msgstr ""
 msgid "Work Report types"
 msgstr "Tipos de partes de traballo"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:132
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:134
 msgid "Total Estimated hours"
 msgstr "Horas totais estimadas"
 
@@ -995,7 +1010,7 @@ msgstr "Algún tramo ten valores maiores ou iguais có tramo anterior"
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
 #: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:248
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:250
 msgid "End date"
 msgstr "Data de fin"
 
@@ -1052,9 +1067,9 @@ msgstr "Lista de formularios de calidade"
 msgid "Order Details"
 msgstr "Detalles de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:510
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:511
 #: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:118
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:120
 msgid "Criteria"
 msgstr "Criterios"
 
@@ -1127,7 +1142,7 @@ msgstr "Prezo por defecto"
 msgid "Estimated hours"
 msgstr "Horas estimadas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:595
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:597
 msgid "Modified"
 msgstr "Modificado"
 
@@ -1135,7 +1150,7 @@ msgstr "Modificado"
 msgid "Edit virtual resource"
 msgstr "Editar recurso virtual"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:206
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:208
 msgid "Apply tab changes"
 msgstr "Aplicar cambios da pestana"
 
@@ -1169,7 +1184,7 @@ msgstr "os contrasinais non coinciden"
 msgid "Ending date"
 msgstr "Data de fin"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:260
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:262
 msgid "Hours groups"
 msgstr "Grupos de horas"
 
@@ -1194,6 +1209,10 @@ msgstr "Crear pedido novo"
 msgid "General resource allocation"
 msgstr "Asignación de recursos xeral"
 
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:60
+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
@@ -1316,7 +1335,7 @@ msgstr "Dedicación total"
 msgid "Year"
 msgstr "Ano"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:100
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:102
 msgid "Is subcontracted"
 msgstr "Está subcontratado"
 
@@ -1324,7 +1343,11 @@ msgstr "Está subcontratado"
 msgid "profile name not specified"
 msgstr "nome do perfil non especificado"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:226
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:842
+msgid "Value is not valid, the current value must be less than max value"
+msgstr "O valor non é válido, o valor actual debe ser menor que o valor máximo"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:228
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:42
 msgid "Subcontratation date"
 msgstr "Data de subcontratación"
@@ -1333,28 +1356,28 @@ msgstr "Data de subcontratación"
 msgid "Date Start"
 msgstr "Data de inicio"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:842
-msgid "Value is not valid, the current value must be less than max value"
-msgstr "O valor non é válido, o valor actual debe ser menor que o valor máximo"
-
-#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3
-msgid "Filter by label:"
-msgstr "Filtrar por etiqueta:"
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23
+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
 msgid "Day"
 msgstr "Día"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:23
-msgid "Edit external company"
-msgstr "Editar empresas externas"
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:3
+msgid "Filter by label:"
+msgstr "Filtrar por etiqueta:"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:33
 msgid "Report advances"
 msgstr "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"
@@ -1393,7 +1416,7 @@ msgstr "Prefixo"
 msgid "New Template element"
 msgstr "Novo elemento de modelo"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:244
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:246
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46
 msgid "Subcontracted code"
 msgstr "Código subcontratado"
@@ -1430,6 +1453,10 @@ msgstr "Datos do tipo"
 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/reassign.zul:33
+msgid "Reassigning type"
+msgstr "Tipo de reasignación"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:688
 msgid "Hour finish"
 msgstr "Hora de fin"
@@ -1556,11 +1583,11 @@ msgstr "Xestionar criterios"
 msgid "Total order element hours"
 msgstr "Total de horas en elementos de pedido"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:158
+#: 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:127
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:136
 msgid "Updated"
 msgstr "Actualizado"
 
@@ -1586,7 +1613,7 @@ msgid "Total capability"
 msgstr "Capacidade total"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:471
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:649
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:635
 msgid "Hours invested"
 msgstr "Horas invertidas"
 
@@ -1595,12 +1622,12 @@ msgid "Navalpro: Calendars"
 msgstr "Navalpro: Calendarios"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:467
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:648
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:516
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:634
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:517
 msgid "Advance"
 msgstr "Avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:227
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:233
 msgid "Problems connecting with client web service"
 msgstr "Problemas conectando co servizo web cliente"
 
@@ -1631,11 +1658,11 @@ msgstr "Excepción derivada"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:224
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:476
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:660
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:500
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:55
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:646
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:501
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:56
 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:31
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:256
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:258
 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:38
 msgid "Labels"
 msgstr "Etiquetas"
@@ -1644,7 +1671,7 @@ msgstr "Etiquetas"
 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:110
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:112
 msgid "Resources search"
 msgstr "Busca de recursos"
 
@@ -1677,11 +1704,15 @@ msgstr "Filtrar por estado da tarefa"
 msgid "Order element"
 msgstr "Elemento de pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:281
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:355
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:289
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:378
 msgid "Select date:"
 msgstr "Seleccione data:"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignController.java:155
+msgid "Doing Reassignation"
+msgstr "Realizando reasignación"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197
 msgid "Company view"
 msgstr "Vista da compañía"
@@ -1711,8 +1742,12 @@ msgstr "Código da empresa"
 msgid "Unknown attribute '{0}' in class {1}"
 msgstr "Atributo descoñecido '{0}' na clase {1}"
 
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:2
+msgid "Filter by"
+msgstr "Filtrar por"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:279
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:281
 msgid "Calendar allocation"
 msgstr "Asignación de calendario"
 
@@ -1741,7 +1776,7 @@ msgstr "Categoría"
 msgid "Edit cost category"
 msgstr "Editar categoría de coste"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:115
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:117
 msgid "Order Element Information"
 msgstr "Información de elemento de pedido"
 
@@ -1809,7 +1844,7 @@ msgstr "%"
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1442
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1604
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java:139
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:801
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:831
 msgid "must be lower than finish date"
 msgstr "debe ser anterior á data de fin"
 
@@ -1854,7 +1889,7 @@ 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:54
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:55
 #: navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul:30
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:39
 #: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:37
@@ -1871,7 +1906,7 @@ msgstr "Etiqueta por defecto"
 
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:176
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:76
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:198
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:200
 msgid "Close"
 msgstr "Pechar"
 
@@ -1894,7 +1929,11 @@ msgstr "Datos da empresa"
 
 #: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21
 msgid "Criterions Requirement"
-msgstr "Requisito do criterio"
+msgstr "Criterios requiridos"
+
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:46
+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"
@@ -2010,7 +2049,7 @@ msgstr "Algunhas asignacións a categorías de coste solápanse no tempo"
 #: 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:112
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:117
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:174
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:120
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40
@@ -2042,6 +2081,10 @@ msgstr "Saír da sesión"
 msgid "Enabled"
 msgstr "Activado"
 
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:29
+msgid "Statistics list "
+msgstr "Lista de estatísticas"
+
 #: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21
 msgid "Navalpro: QualityForms"
 msgstr "Navalpro: Formularios de calidade"
@@ -2050,7 +2093,7 @@ msgstr "Navalpro: Formularios de calidade"
 msgid "Edit advance type data"
 msgstr "Editar datos do tipo de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:124
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:133
 msgid "Pending update"
 msgstr "Actualización pendente"
 
@@ -2088,7 +2131,7 @@ msgstr "Autorización de usuarios"
 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:164
+#: 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"
 
@@ -2114,13 +2157,13 @@ msgstr "Data de fin"
 
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:38
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportQuery.zul:60
-#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:6
-#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:12
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:7
+#: navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul:13
 #: navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
 msgid "Filter"
 msgstr "Filtrar"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:184
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:186
 msgid "Resources Per Day"
 msgstr "Recursos por día"
 
@@ -2135,11 +2178,11 @@ msgstr ""
 "o nome de tipo de criterio está sendo usado por outro tipo de criterio "
 "importado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:412
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:413
 msgid "Order saved"
 msgstr "Pedido gardado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:456
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:458
 msgid "Move down"
 msgstr "Mover abaixo"
 
@@ -2161,7 +2204,7 @@ msgstr "Si"
 msgid "Assigned locations"
 msgstr "Ubicacións asignadas"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:52
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:36
 msgid "General data"
 msgstr "Datos xerais"
@@ -2179,7 +2222,7 @@ 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:292
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:294
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:34
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98
 #: navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:80
@@ -2190,8 +2233,8 @@ msgstr "Asignar"
 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/web/orders/OrderElementTreeController.java:429
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:751
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:430
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:781
 #: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
 msgid "Create Template"
 msgstr "Crear modelo"
@@ -2241,7 +2284,7 @@ msgstr "código da máquina non especificado"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1425
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1586
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:784
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:814
 msgid "must be greater than start date"
 msgstr "debe ser maior que a data de inicio"
 
@@ -2299,7 +2342,7 @@ msgstr "o criterio satisfeito ten data de fin anterior á de inicio"
 msgid "Stretches"
 msgstr "Tramos"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:173
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:175
 msgid "Allocations"
 msgstr "Asignacións"
 
@@ -2355,7 +2398,7 @@ msgstr "Navalpro: planificación"
 msgid "Removed calendar \"{0}\""
 msgstr "Borrado calendario \"{0}\""
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:254
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:256
 msgid "Node without children"
 msgstr "Nodo sen fillos"
 
@@ -2497,7 +2540,7 @@ msgstr "Traballadores atopados"
 msgid "All workers"
 msgstr "Todos os traballadores"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:236
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:238
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48
 msgid "Work description"
 msgstr "Descrición do traballo"
@@ -2511,6 +2554,10 @@ msgstr "Etiqueta gardada"
 msgid "Split assignment"
 msgstr "Dividir asignación"
 
+#: 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 "
@@ -2541,7 +2588,7 @@ msgstr "enlace directo"
 #: 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:114
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:119
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:176
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:123
 #: navalplanner-webapp/src/main/webapp/users/_editUser.zul:137
@@ -2583,7 +2630,7 @@ 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:377
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:378
 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"
 
@@ -2611,7 +2658,7 @@ msgid "Hours group"
 msgstr "Grupo de horas"
 
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:29
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:84
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:86
 msgid "Days from Beginning to Deadline"
 msgstr "Días desde o comezo ata a data límite"
 
@@ -2623,19 +2670,9 @@ msgstr "Os campos de índice e as etiquetas deben ser únicas e consecutivas"
 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: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-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:175
-msgid "Edit machine"
-msgstr "Editar máquina"
-
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
-msgid "Estimate To Complete"
-msgstr "Estimación do coste pendente"
+#: 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/AssignedCriterionRequirementToOrderElementController.java:233
 msgid ""
@@ -2645,13 +2682,23 @@ msgstr ""
 "¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente tipo "
 "de recurso perderanse."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:27
-msgid "Indirect"
-msgstr "Indirecto"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
+msgid "Estimate To Complete"
+msgstr "Estimación do coste pendente"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:175
+msgid "Edit machine"
+msgstr "Editar máquina"
+
+#: 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-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:29
 msgid "Assigned Criterion Requirements"
-msgstr "Requisitos do criterio asignados"
+msgstr "Criterios requiridos asignados"
 
 #: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:90
 msgid "cost assignment's start date not specified"
@@ -2676,9 +2723,9 @@ msgstr "Código de pedido"
 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/webapp/planner/_legendLoadChartOrder.zul:41
-msgid "Load due to other assignments"
-msgstr "Carga debido a outras asignacións"
+#: 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
@@ -2688,9 +2735,9 @@ msgstr "Carga debido a outras asignacións"
 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/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
@@ -2727,7 +2774,7 @@ 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:79
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:81
 msgid "Delay from beginning (days)"
 msgstr "Retraso desde o comezo (en días)"
 
@@ -2745,7 +2792,7 @@ msgstr "Todos os pedidos"
 
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:128
 msgid "Criterion Requirements"
-msgstr "Requisitos do criterio"
+msgstr "Criterios requiridos"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:127
 msgid "Confirm cancel"
@@ -2755,7 +2802,7 @@ msgstr "Confirmar cancelación"
 msgid "External companies listing"
 msgstr "Listado de empresas externas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:182
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java:186
 msgid "Order from client"
 msgstr "Pedido de cliente"
 
@@ -2795,7 +2842,7 @@ msgstr "empezar non antes de"
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:392
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:246
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:203
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:483
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:485
 #: 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: "
@@ -2880,7 +2927,7 @@ msgid "Finish hour"
 msgstr "Hora de fin"
 
 #: navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul:29
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:58
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:59
 msgid "Assignment log"
 msgstr "Histórico de asignacións"
 
@@ -2922,13 +2969,13 @@ msgstr "Activo"
 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:400
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:386
 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/resources/criterion/CriterionTreeController.java:261
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:500
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:502
 msgid "Unindent"
 msgstr "Desindentar"
 
@@ -2962,7 +3009,7 @@ msgstr "Accións"
 msgid "Order Scheduling"
 msgstr "Planificación de pedidos"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:215
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:217
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44
 msgid "External company"
 msgstr "Empresa externa"
@@ -2988,7 +3035,7 @@ msgstr "Hora de inicio"
 msgid "Exceptions"
 msgstr "Excepcións"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxMultipleSearch.java:163
+#: 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"
 
@@ -2996,6 +3043,11 @@ msgstr "o formato dos filtros non é válido"
 msgid "Indirect labels"
 msgstr "Etiquetas indirectas"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:519
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:540
+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:105
 msgid "Scheduling state"
 msgstr "Estado de planificación"
@@ -3074,7 +3126,7 @@ msgstr "Grupo de horas"
 msgid "Unallocated name"
 msgstr "Nome no asignado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:477
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:479
 msgid "Move up"
 msgstr "Mover arriba"
 
@@ -3106,7 +3158,7 @@ msgstr "NIF"
 msgid "Order element not found"
 msgstr "Elemento de pedido non atopado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:165
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:166
 msgid ""
 "Templates can only be created from already existent order elements.\n"
 "Newly order elements cannot be used."
@@ -3128,7 +3180,7 @@ msgstr "Non editable"
 msgid "Scheduling"
 msgstr "Planificación"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:231
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:233
 msgid "Subcontract communication date"
 msgstr "Data de comunicación da subcontratación"
 
@@ -3225,12 +3277,12 @@ msgstr "Excepción"
 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:523
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:552
 msgid "Edit order"
 msgstr "Editar pedido"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:147
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:152
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:191
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:196
 msgid "Send"
 msgstr "Enviar"
 
@@ -3254,6 +3306,7 @@ 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/worker/_criterions.zul:11
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13
 msgid "All"
@@ -3266,8 +3319,9 @@ 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:33
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:82
+#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:47
 #: navalplanner-webapp/src/main/webapp/planner/main.zul:65
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:270
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:272
 msgid "Accept"
 msgstr "Aceptar"
 
@@ -3380,11 +3434,6 @@ msgstr "o nome do criterio debe ser único dentro dun tipo de criterio"
 msgid "Create order from Template"
 msgstr "Crear pedido a partir de modelo"
 
-#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:8
-#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10
-msgid "Filters"
-msgstr "Filtros"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:74
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51
 #: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:50
@@ -3401,7 +3450,7 @@ msgstr "Filtros"
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74
 #: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:7
 #: navalplanner-webapp/src/main/webapp/templates/_list.zul:25
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:73
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:75
 #: navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul:7
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:60
 #: navalplanner-webapp/src/main/webapp/orders/_list.zul:27
@@ -3409,6 +3458,11 @@ msgstr "Filtros"
 msgid "Code"
 msgstr "Código"
 
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:8
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10
+msgid "Filters"
+msgstr "Filtros"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:289
 msgid "Materials saved"
 msgstr "Materiais gardados"
@@ -3444,7 +3498,7 @@ msgstr "Data de inicio"
 msgid "Update exception"
 msgstr "Actualizar excepción"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:167
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:168
 msgid "Operation cannot be done"
 msgstr "Non se pode realizar a operación"
 
@@ -3485,7 +3539,11 @@ msgstr "Deshabilitar borrado"
 msgid "Write"
 msgstr "Escribir"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:98
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:38
+msgid "Number of applications"
+msgstr "Número de aplicacións"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:101
 msgid "Filter type"
 msgstr "Tipo de filtro"
 
@@ -3516,8 +3574,8 @@ msgstr "O nome non é válido, xa hai outro tipo de avance co mesmo nome. "
 msgid "Advance type"
 msgstr "Tipo de avance"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:229
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:166
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesModel.java:235
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksModel.java:172
 msgid "Error: {0}"
 msgstr "Erro: {0}"
 
@@ -3537,8 +3595,8 @@ msgstr "¿Quere borrar &quot;{0}&quot;?"
 msgid "New criterion"
 msgstr "Criterio novo"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:207
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:298
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:215
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:321
 #: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48
 msgid "Load"
 msgstr "Carga"
@@ -3547,7 +3605,7 @@ msgstr "Carga"
 msgid "Parent"
 msgstr "Pai"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:653
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:639
 #: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:60
 #: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62
 #: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:53
@@ -3581,11 +3639,11 @@ msgstr "Non se atopou un conversor para {0}"
 msgid "start in fixed date"
 msgstr "comezar en data fixa"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:207
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:209
 msgid "Go to advanced Allocation"
 msgstr "Ir a asignación avanzada"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:258
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:260
 msgid "Material assignments"
 msgstr "Asignacións de materiais"
 
@@ -3593,6 +3651,10 @@ msgstr "Asignacións de materiais"
 msgid "already exists an allocation for criteria {0}"
 msgstr "xa existe unha asignación para os criterios {0}"
 
+#: 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"
@@ -3643,7 +3705,7 @@ msgstr "Crear tipo de etiqueta"
 msgid "Work record"
 msgstr "Rexistro de traballo"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:284
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:286
 msgid "Select the calendar"
 msgstr "Seleccionar o calendario"
 
@@ -3701,12 +3763,13 @@ msgstr "o tipo de recurso non permite criterios habilitados"
 #: 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:116
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:121
 #: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:34
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:84
+#: navalplanner-webapp/src/main/webapp/planner/reassign.zul:49
 #: navalplanner-webapp/src/main/webapp/planner/print_configuration.zul:78
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:272
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:294
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:274
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:296
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:178
 #: navalplanner-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:126
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42
@@ -3729,7 +3792,7 @@ msgstr "Quitar planificación"
 msgid "General user data"
 msgstr "Datos xerais do usuario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:156
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:200
 msgid "Subcontracted task sent successfully"
 msgstr "A tarefa subcontratada enviouse con éxito"
 
@@ -3762,8 +3825,8 @@ 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:77
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:416
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:705
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:417
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:734
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:370
 #: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:36
 #: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39
@@ -3828,6 +3891,12 @@ msgstr "Crear Calendario"
 msgid "At least one stretch is needed"
 msgstr "Necesítase alo menos un tramo"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/labels/impl/LabelServiceREST.java:92
+msgid "label type name is used by another label type being imported"
+msgstr ""
+"o nome de tipo de etiqueta está sendo usado por outro tipo de etiqueta "
+"importado"
+
 #: 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]"
@@ -3841,6 +3910,11 @@ msgstr "A data do tramo debe ser maior ou igual cá data de inicio da tarefa"
 msgid "New Description"
 msgstr "Nova descrición"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/SubcontractedTasksController.java:159
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:164
+msgid "XML"
+msgstr "XML"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesCommand.java:60
 msgid "Task Properties"
 msgstr "Propiedades da tarefa"
@@ -3892,6 +3966,10 @@ msgstr "Data de comunicación"
 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/planner/allocation/FormBinder.java:435
 msgid "{0} already assigned to resource allocation list"
 msgstr "{0} xa está na lista de asignación de recursos"
@@ -3929,7 +4007,7 @@ 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:119
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:121
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:44
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:129
@@ -3996,7 +4074,7 @@ msgstr "Valor máximo por defecto"
 
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:36
 msgid "Add criterion requirement"
-msgstr "Engadir requisito de criterio"
+msgstr "Engadir criterio requirido"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:237
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41
@@ -4027,6 +4105,10 @@ msgstr "Administrar tipos de horas de traballo"
 msgid "Add profile"
 msgstr "Engadir perfil"
 
+#: 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:19
 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:21
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:43
@@ -4050,7 +4132,7 @@ msgstr "Nome da tarefa"
 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:294
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:295
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
@@ -4060,6 +4142,10 @@ msgstr ""
 " O código non pode conter caracteres como '_' \n"
 " e non debe ser baleiro"
 
+#: navalplanner-webapp/src/main/webapp/templates/_historicalStatistics.zul:50
+msgid "Average of the worked hours"
+msgstr "Media de horas traballadas"
+
 #: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/OrderAuthorization.java:42
 msgid "an authorization type must be set"
 msgstr "Debe seleccionar un tipo de autorización"
@@ -4068,13 +4154,13 @@ msgstr "Debe seleccionar un tipo de autorización"
 msgid "Unassigned"
 msgstr "Non asignado"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:139
+#: 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 requisito de criterio"
+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"
@@ -4100,8 +4186,8 @@ msgstr "Engadir"
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:208
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:299
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:216
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:322
 msgid "Earned value"
 msgstr "Valor gañado"
 
@@ -4123,6 +4209,16 @@ msgstr "Debe seleccionar o tipo de excepción"
 msgid "Deadline"
 msgstr "data límite"
 
+#: 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/orders/OrderCRUDController.java:490
+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:213
 msgid "Advance measurements"
 msgstr "Medidas de avance"
@@ -4139,6 +4235,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"
@@ -4158,7 +4258,7 @@ msgstr "Asignación avanzada"
 msgid "Label type"
 msgstr "Tipo de etiqueta"
 
-#: navalplanner-webapp/src/main/webapp/templates/templates.zul:53
+#: navalplanner-webapp/src/main/webapp/templates/templates.zul:54
 msgid "Template Tree"
 msgstr "Árbore de modelos"
 
@@ -4191,7 +4291,7 @@ msgstr "Cambios cancelados"
 msgid "Machine saved"
 msgstr "Máquina gardada"
 
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:168
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:170
 msgid "Recommended Allocation"
 msgstr "Asignación recomendada"
 
@@ -4211,8 +4311,8 @@ msgstr "Estado"
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:68
 #: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:75
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:82
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:120
-#: navalplanner-webapp/src/main/webapp/planner/order.zul:182
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:122
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:184
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:130
 #: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
 #: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:113
@@ -4257,7 +4357,7 @@ msgstr "Non"
 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:240
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:242
 msgid "Subcontract price"
 msgstr "Prezo de subcontratación"
 
@@ -4276,7 +4376,7 @@ msgstr "Editar grupos virtuais de traballadores"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:140
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:206
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:490
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:501
 msgid "Removed {0}"
 msgstr "{0} borrado"
 
@@ -4316,8 +4416,8 @@ msgstr "Lista de máquinas"
 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:332
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:423
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:340
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:446
 msgid "h"
 msgstr "h"
 
@@ -4389,7 +4489,11 @@ msgstr "Saída de impresión"
 msgid "Edit User"
 msgstr "Editar usuario"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/MultipleFiltersFinder.java:98
+#: 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:101
 msgid "Filter pattern"
 msgstr "Patrón de filtro"
 
@@ -4417,14 +4521,14 @@ msgstr "A data non é válida, debe ser única para esta asignación de avance"
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:160
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:219
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:384
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:528
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeController.java:530
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java:360
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:543
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsController.java:381
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:196
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java:339
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:911
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:721
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:750
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:685
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:895
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1108