diff --git a/AUTHORS b/AUTHORS
index 332c5d53d..04a0d968e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,16 +1,46 @@
+
 Authors
 =======
 
-* Cristina Alavariño Pérez <cristina.alvarino@comtecsf.es>
+
+LibrePlan Team
+--------------
+
+* Cristina Alavariño Pérez <cristina.alvarino@cafedered.es>
 * Jacobo Aragunde Pérez <jaragunde@igalia.com>
-* Fernando Bellas Permuy <fbellas@udc.es>
-* José María Casanova Crespo <jmcasanova@igalia.com>
+* Nacho Barrientos Arias <nacho@igalia.com>
 * Xavier Castaño García <xcastanho@igalia.com>
-* Ignacio Díaz Teijido <ignacio.diaz@comtecsf.es>
-* Óscar González Fernández <ogonzalez@igalia.com>
+* Ignacio Díaz Teijido <ignacio.diaz@cafedered.es>
 * Susana Montes Pedreira <smontes@wirelessgalicia.com>
 * Francisco Javier Morán Rúa <jmoran@igalia.com>
 * Diego Pino García <dpino@igalia.com>
-* Manuel Rego Casasnovas <mrego@igalia.com>
-* Farruco Sanjurjo Arcay <fsanjurjo@igalia.com>
+* Manuel Rego Casasnovas <rego@igalia.com>
 * Lorenzo Tilve Álvaro <ltilve@igalia.com>
+
+
+Previous Team Members
+---------------------
+
+* Fernando Bellas Permuy <fbellas@udc.es>
+* José María Casanova Crespo <jmcasanova@igalia.com>
+* Óscar González Fernández <ogonzalez@igalia.com>
+* Pablo Fernández de la Cigoña Nóvoa <pcigonha@igalia.com>
+* Farruco Sanjurjo Arcay <fsanjurjo@igalia.com>
+
+
+Translators
+-----------
+
+* [es] Manuel Rego Casasnovas <rego@igalia.com>
+* [gl] Manuel Rego Casasnovas <rego@igalia.com>
+* [ru] Pavel Rudensky <prudensky@gmail.com>
+
+
+Contributors
+------------
+
+* Eloy Calatayud <ecalatayud@wirelessgalicia.com>
+* Sergio Carracedo <cto@opsou.com>
+* Pedro Figueras <sales@opsou.com>
+* Dmytro Melanchenko <melanchenko@gmail.com>
+* Adrián Pérez <aperez@igalia.com>
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index 759459893..d18a72c2e 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -482,7 +482,9 @@ public class Planner extends HtmlMacroComponent  {
     private void insertGlobalCommands() {
         Component commontoolbar = getCommonCommandsInsertionPoint();
         Component plannerToolbar = getSpecificCommandsInsertionPoint();
-        commontoolbar.getChildren().removeAll(commontoolbar.getChildren());
+        if (!contextualizedGlobalCommands.isEmpty()) {
+            commontoolbar.getChildren().removeAll(commontoolbar.getChildren());
+        }
         for (CommandContextualized<?> c : contextualizedGlobalCommands) {
             // Comparison through icon as name is internationalized
             if (c.getCommand().getImage()
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java
index 2c3bad395..6d8e60ac2 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java
@@ -96,7 +96,6 @@ public abstract class Task implements ITaskFundamentalProperties {
             fundamentalPropertiesListeners.firePropertyChange("beginDate",
                     previousStart, fundamentalProperties.getBeginDate());
             fireEndDate(previousEnd);
-            reloadResourcesTextIfChange(newStart, previousStart);
         }
 
         @Override
@@ -204,13 +203,6 @@ public abstract class Task implements ITaskFundamentalProperties {
                 newStart);
     }
 
-    private void reloadResourcesTextIfChange(GanttDate newDate,
-            GanttDate previousDate) {
-        if (!ObjectUtils.equals(newDate, previousDate)) {
-            reloadResourcesText();
-        }
-    }
-
     public void fireChangesForPreviousValues(GanttDate previousStart,
             GanttDate previousEnd) {
         dependenciesEnforcerHook.setStartDate(previousStart, previousStart,
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailOneTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailOneTimeTrackerState.java
index ccd1fc1b1..24aa02adc 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailOneTimeTrackerState.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailOneTimeTrackerState.java
@@ -36,7 +36,7 @@ import org.joda.time.Years;
 public class DetailOneTimeTrackerState extends
         TimeTrackerStateWithSubintervalsFitting {
 
-    public static final Period MINIMUN_PERIOD = PeriodType.YEARS.amount(4);
+    public static final Period MINIMUN_PERIOD = PeriodType.YEARS.amount(6);
 
     private static final int FIRST_LEVEL_ITEM_SIZE = 200;
     private static final int SECOND_LEVEL_ITEM_SIZE = 100;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java
index df6ac7943..086b73a9f 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java
@@ -35,7 +35,7 @@ import org.zkoss.util.Locales;
 public class DetailThreeTimeTrackerState extends
         TimeTrackerStateWithSubintervalsFitting {
 
-    private static final int NUMBER_OF_MONTHS_MINIMUM = 20;
+    private static final int NUMBER_OF_MONTHS_MINIMUM = 30;
 
     DetailThreeTimeTrackerState(IDetailItemModificator firstLevelModificator,
             IDetailItemModificator secondLevelModificator) {
@@ -125,4 +125,4 @@ public class DetailThreeTimeTrackerState extends
         return SECOND_LEVEL_SIZE;
     }
 
-}
\ No newline at end of file
+}
diff --git a/ganttzk/src/main/resources/i18n/es.po b/ganttzk/src/main/resources/i18n/es.po
index 8a40f06b1..afffe548f 100644
--- a/ganttzk/src/main/resources/i18n/es.po
+++ b/ganttzk/src/main/resources/i18n/es.po
@@ -1,5 +1,5 @@
-# Spanish translations for LibrePlan package
-# Traducciones al español para el paquete LibrePlan.
+# Spanish translations for LibrePlan - GanttZK module
+# Traducciones al español para LibrePlan - módulo GanttZK
 # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
 #                         Desenvolvemento Tecnolóxico de Galicia
 # Copyright (C) 2010-2011 Igalia, S.L.
@@ -10,11 +10,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1.0\n"
+"Project-Id-Version: 1.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-09 16:17+0200\n"
-"PO-Revision-Date: 2011-08-09 16:29+0200\n"
-"Last-Translator: Manuel Rego Casasnovas <mrego@igalia.com>\n"
+"POT-Creation-Date: 2011-11-10 20:11+0100\n"
+"PO-Revision-Date: 2011-11-10 20:18+0100\n"
+"Last-Translator: Manuel Rego Casasnovas <rego@igalia.com>\n"
 "Language-Team: Spanish <>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Erase"
 msgstr "Borrar"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319
+#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299
 msgid "Add Dependency"
 msgstr "Añadir dependencia"
 
@@ -39,20 +39,20 @@ msgstr "Trabajador"
 msgid "Start"
 msgstr "Inicio"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:629
 msgid "Show reported hours"
 msgstr "Mostrar horas reportadas"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90
 msgid "by criteria"
 msgstr "por criterios"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:72
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85
 msgid "Show/Hide reported hours"
 msgstr "Mostrar/Ocultar horas reportardas"
 
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -60,7 +60,7 @@ msgstr "Zoom"
 msgid "Limiting resources"
 msgstr "Recursos limitantes"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67
 msgid "The specified dependency is not allowed"
 msgstr "La dependencia especificada no está permitida"
 
@@ -68,15 +68,15 @@ msgstr "La dependencia especificada no está permitida"
 msgid "Set End-End"
 msgstr "Definir Fin-Fin"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:80
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78
 msgid "Show/Hide progress"
 msgstr "Mostrar/Ocultar progreso"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:188
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199
 msgid "available effort: {0}, assigned effort: {1}"
 msgstr "esfuerzo disponible: {0}, esfuerzo asignado: {1}"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89
 msgid "by resources"
 msgstr "por recursos"
 
@@ -88,7 +88,7 @@ msgstr "Tarea"
 msgid "Criterion"
 msgstr "Criterio"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44
 msgid "Print"
 msgstr "Imprimir"
 
@@ -96,7 +96,7 @@ msgstr "Imprimir"
 msgid "Week"
 msgstr "Semana"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:501
 msgid "filtering by name"
 msgstr "filtrando por nombre"
 
@@ -108,10 +108,6 @@ msgstr "Ver planificación"
 msgid "End"
 msgstr "Fin"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
-msgid "Choosing Template"
-msgstr "Selección de plantilla"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243
 msgid "changing zoom"
 msgstr "cambiando zoom"
@@ -124,7 +120,7 @@ msgstr "Trimestre"
 msgid "None"
 msgstr "Ninguno"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
 msgid "Flatten/Unflatten tree"
 msgstr "Aplanar/Expandir árbol"
 
@@ -136,7 +132,7 @@ msgstr "Filtro"
 msgid "Project"
 msgstr "Proyecto"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:67
 #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
 msgid "Name"
 msgstr "Nombre"
@@ -145,27 +141,23 @@ msgstr "Nombre"
 msgid "Name filter"
 msgstr "Filtro por nombres"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:609
 msgid "Show progress"
 msgstr "Mostrar progreso"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:66
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
 msgid "Expand/Collapse all"
 msgstr "Expandir/Plegar todo"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:56
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58
 msgid "Show/Hide critical path"
 msgstr "Mostrar/Ocultar camino crítico"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
-msgid "Create Project"
-msgstr "Crear proyecto"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32
 msgid "Year"
 msgstr "Año"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:145
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150
 msgid "showing criteria"
 msgstr "mostrando criterios"
 
@@ -173,7 +165,7 @@ msgstr "mostrando criterios"
 msgid "Month"
 msgstr "Mes"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64
 msgid "Show/Hide resources"
 msgstr "Mostrar/Ocultar recursos"
 
@@ -181,11 +173,11 @@ msgstr "Mostrar/Ocultar recursos"
 msgid "Set End-Start"
 msgstr "Definir Fin-Inicio"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:298
 msgid "decreasing zoom"
 msgstr "reduciendo zoom"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:590
 msgid "Hide critical path"
 msgstr "Ocultar camino crítico"
 
@@ -193,19 +185,19 @@ msgstr "Ocultar camino crítico"
 msgid "Day"
 msgstr "Día"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:636
 msgid "Hide reported hours"
 msgstr "Ocultar horas reportadas"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:182
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:193
 msgid "Load: {0}%"
 msgstr "Carga: {0}%"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:147
 msgid "showing resources"
 msgstr "mostrando recursos"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61
 msgid "Show/Hide labels"
 msgstr "Mostrar/Ocultar etiquetas"
 
@@ -213,8 +205,8 @@ msgstr "Mostrar/Ocultar etiquetas"
 msgid "Hour"
 msgstr "Hora"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114
 msgid "Graphics"
 msgstr "Gráficas"
 
@@ -222,30 +214,30 @@ msgstr "Gráficas"
 msgid "Set Start-Start"
 msgstr "Definir Inicio-Inicio"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:141
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152
 msgid "See resource allocation"
 msgstr "Ver asignación de recursos"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:281
 msgid "increasing zoom"
 msgstr "aumentando zoom"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:467
 msgid "Show all elements"
 msgstr "Mostrar todos los elementos"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:466
 msgid "All"
 msgstr "Todos"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:585
 msgid "Show critical path"
 msgstr "Mostrar camino crítico"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:614
 msgid "Hide progress"
 msgstr "Ocultar progreso"
diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po
index 798294f78..b284d0d42 100644
--- a/ganttzk/src/main/resources/i18n/gl.po
+++ b/ganttzk/src/main/resources/i18n/gl.po
@@ -1,20 +1,20 @@
-# Galician translations for LibrePlan package
-# Traducciones al español para el paquete LibrePlan.
+# Galician translations for LibrePlan - GanttZK module
+# Traducciones al español para LibrePlan - módulo GanttZK
 # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
 #                         Desenvolvemento Tecnolóxico de Galicia
 # Copyright (C) 2010-2011 Igalia, S.L.
 # This file is distributed under the same license as the LibrePlan package.
 # Igalia <dpino@igalia.com>, 2009.
 # Jacobo Aragunde Pérez <jaragunde@igalia.com>, 2010.
-# Manuel Rego Casasnovas <mrego@igalia.com>, 2010, 2011.
+# Manuel Rego Casasnovas <rego@igalia.com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1.0\n"
+"Project-Id-Version: 1.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-09 16:17+0200\n"
-"PO-Revision-Date: 2011-08-09 16:30+0200\n"
-"Last-Translator: Manuel Rego Casasnovas <mrego@igalia.com>\n"
+"POT-Creation-Date: 2011-11-10 20:11+0100\n"
+"PO-Revision-Date: 2011-11-10 20:20+0100\n"
+"Last-Translator: Manuel Rego Casasnovas <rego@igalia.com>\n"
 "Language-Team: Galician <>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Erase"
 msgstr "Borrar"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319
+#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299
 msgid "Add Dependency"
 msgstr "Engadir dependencia"
 
@@ -39,20 +39,20 @@ msgstr "Traballador"
 msgid "Start"
 msgstr "Inicio"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:629
 msgid "Show reported hours"
 msgstr "Mostrar horas reportadas"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90
 msgid "by criteria"
 msgstr "por criterios"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:72
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85
 msgid "Show/Hide reported hours"
 msgstr "Mostrar/Ocultar horas reportadas"
 
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -60,7 +60,7 @@ msgstr "Zoom"
 msgid "Limiting resources"
 msgstr "Recursos limitantes"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67
 msgid "The specified dependency is not allowed"
 msgstr "A dependencia especificada non está permitida"
 
@@ -68,15 +68,15 @@ msgstr "A dependencia especificada non está permitida"
 msgid "Set End-End"
 msgstr "Definir Fin-Fin"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:80
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78
 msgid "Show/Hide progress"
 msgstr "Mostrar/Ocultar progreso"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:188
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199
 msgid "available effort: {0}, assigned effort: {1}"
 msgstr "esforzo dispoñible: {0}, esforzo asignado: {1}"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89
 msgid "by resources"
 msgstr "por recursos"
 
@@ -88,7 +88,7 @@ msgstr "Tarefa"
 msgid "Criterion"
 msgstr "Criterio"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44
 msgid "Print"
 msgstr "Imprimir"
 
@@ -96,7 +96,7 @@ msgstr "Imprimir"
 msgid "Week"
 msgstr "Semana"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:501
 msgid "filtering by name"
 msgstr "filtrando por nome"
 
@@ -108,10 +108,6 @@ msgstr "Ver planificación"
 msgid "End"
 msgstr "Fin"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
-msgid "Choosing Template"
-msgstr "Selección de modelo"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243
 msgid "changing zoom"
 msgstr "cambiando zoom"
@@ -124,7 +120,7 @@ msgstr "Trimestre"
 msgid "None"
 msgstr "Ningún"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
 msgid "Flatten/Unflatten tree"
 msgstr "Aplanar/Expandir árbore"
 
@@ -136,7 +132,7 @@ msgstr "Filtro"
 msgid "Project"
 msgstr "Proxecto"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:67
 #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
 msgid "Name"
 msgstr "Nome"
@@ -145,27 +141,23 @@ msgstr "Nome"
 msgid "Name filter"
 msgstr "Filtro por nomes"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:609
 msgid "Show progress"
 msgstr "Mostrar progreso"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:66
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
 msgid "Expand/Collapse all"
 msgstr "Expandir/Pregar todo"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:56
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58
 msgid "Show/Hide critical path"
 msgstr "Mostrar/Ocultar camiño crítico"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
-msgid "Create Project"
-msgstr "Crear proxecto"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32
 msgid "Year"
 msgstr "Ano"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:145
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150
 msgid "showing criteria"
 msgstr "mostrando criterios"
 
@@ -173,7 +165,7 @@ msgstr "mostrando criterios"
 msgid "Month"
 msgstr "Mes"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64
 msgid "Show/Hide resources"
 msgstr "Mostrar/Ocultar recursos"
 
@@ -181,11 +173,11 @@ msgstr "Mostrar/Ocultar recursos"
 msgid "Set End-Start"
 msgstr "Definir Fin-Inicio"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:298
 msgid "decreasing zoom"
 msgstr "reducindo zoom"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:590
 msgid "Hide critical path"
 msgstr "Ocultar camiño crítico"
 
@@ -193,19 +185,19 @@ msgstr "Ocultar camiño crítico"
 msgid "Day"
 msgstr "Día"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:636
 msgid "Hide reported hours"
 msgstr "Ocultar horas reportadas"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:182
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:193
 msgid "Load: {0}%"
 msgstr "Carga: {0}%"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:147
 msgid "showing resources"
 msgstr "mostrando recursos"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61
 msgid "Show/Hide labels"
 msgstr "Mostrar/Ocultar etiquetas"
 
@@ -213,8 +205,8 @@ msgstr "Mostrar/Ocultar etiquetas"
 msgid "Hour"
 msgstr "Hora"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114
 msgid "Graphics"
 msgstr "Gráficas"
 
@@ -222,30 +214,30 @@ msgstr "Gráficas"
 msgid "Set Start-Start"
 msgstr "Definir Inicio-Inicio"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:141
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152
 msgid "See resource allocation"
 msgstr "Ver asignación de recursoss"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:281
 msgid "increasing zoom"
 msgstr "aumentando zoom"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:467
 msgid "Show all elements"
 msgstr "Mostrar tódolos elementos"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:466
 msgid "All"
 msgstr "Todos"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:585
 msgid "Show critical path"
 msgstr "Mostrar camiño crítico"
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:614
 msgid "Hide progress"
 msgstr "Ocultar progreso"
diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot
index 661bea98e..9485c0326 100644
--- a/ganttzk/src/main/resources/i18n/keys.pot
+++ b/ganttzk/src/main/resources/i18n/keys.pot
@@ -5,14 +5,14 @@
 # This file is distributed under the same license as the LibrePlan package.
 # Diego Pino García <dpino@igalia.com>, 2009.
 # Jacobo Aragunde Pérez <jaragunde@igalia.com>, 2009, 2010.
-# Manuel Rego Casasnovas <mrego@igalia.com>, 2010, 2011.
+# Manuel Rego Casasnovas <rego@igalia.com>, 2010, 2011.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1.3\n"
+"Project-Id-Version: 1.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-09 16:17+0200\n"
+"POT-Creation-Date: 2011-11-10 20:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "Erase"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:319
+#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299
 msgid "Add Dependency"
 msgstr ""
 
@@ -38,20 +38,20 @@ msgstr ""
 msgid "Start"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:592
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:629
 msgid "Show reported hours"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:90
 msgid "by criteria"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:72
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:85
 msgid "Show/Hide reported hours"
 msgstr ""
 
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49
 msgid "Zoom"
 msgstr ""
 
@@ -59,7 +59,7 @@ msgstr ""
 msgid "Limiting resources"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:68
+#: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:67
 msgid "The specified dependency is not allowed"
 msgstr ""
 
@@ -67,15 +67,15 @@ msgstr ""
 msgid "Set End-End"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:80
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78
 msgid "Show/Hide progress"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:188
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199
 msgid "available effort: {0}, assigned effort: {1}"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:91
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89
 msgid "by resources"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 msgid "Criterion"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:44
 msgid "Print"
 msgstr ""
 
@@ -95,7 +95,7 @@ msgstr ""
 msgid "Week"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:489
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:501
 msgid "filtering by name"
 msgstr ""
 
@@ -107,10 +107,6 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
-msgid "Choosing Template"
-msgstr ""
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java:243
 msgid "changing zoom"
 msgstr ""
@@ -123,7 +119,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
 msgid "Flatten/Unflatten tree"
 msgstr ""
 
@@ -135,7 +131,7 @@ msgstr ""
 msgid "Project"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:68
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:67
 #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
 msgid "Name"
 msgstr ""
@@ -144,27 +140,23 @@ msgstr ""
 msgid "Name filter"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:572
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:609
 msgid "Show progress"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:66
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
 msgid "Expand/Collapse all"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:56
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58
 msgid "Show/Hide critical path"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
-msgid "Create Project"
-msgstr ""
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:32
 msgid "Year"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:145
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:150
 msgid "showing criteria"
 msgstr ""
 
@@ -172,7 +164,7 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64
 msgid "Show/Hide resources"
 msgstr ""
 
@@ -180,11 +172,11 @@ msgstr ""
 msgid "Set End-Start"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:302
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:298
 msgid "decreasing zoom"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:559
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:590
 msgid "Hide critical path"
 msgstr ""
 
@@ -192,19 +184,19 @@ msgstr ""
 msgid "Day"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:599
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:636
 msgid "Hide reported hours"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:182
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:193
 msgid "Load: {0}%"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:147
 msgid "showing resources"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61
 msgid "Show/Hide labels"
 msgstr ""
 
@@ -212,8 +204,8 @@ msgstr ""
 msgid "Hour"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:90
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114
 msgid "Graphics"
 msgstr ""
 
@@ -221,30 +213,30 @@ msgstr ""
 msgid "Set Start-Start"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:141
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:152
 msgid "See resource allocation"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:285
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:281
 msgid "increasing zoom"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:455
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:467
 msgid "Show all elements"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:454
+#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:466
 msgid "All"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38
 msgid "Refresh"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:554
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:585
 msgid "Show critical path"
 msgstr ""
 
-#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:577
+#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:614
 msgid "Hide progress"
 msgstr ""
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index e479f3e65..c86c7a858 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -32,7 +32,6 @@ planner = self;
 
         <separator/>
         <!--  Commands -->
-        <templateFinderPopup id="templateFinderPopup" acceptButtonLabel="${ganttzk_i18n:_('Create Project')}" caption="${i18n:_('Choosing Template')}" />
 
         <button onClick="planner.invalidate()"
             image="/common/img/ico_refresh.png"
diff --git a/ganttzk/src/main/resources/web/js/ganttz/TaskComponent.js b/ganttzk/src/main/resources/web/js/ganttz/TaskComponent.js
index 533654b37..09daa881c 100644
--- a/ganttzk/src/main/resources/web/js/ganttz/TaskComponent.js
+++ b/ganttzk/src/main/resources/web/js/ganttz/TaskComponent.js
@@ -60,7 +60,13 @@ ganttz.TaskComponent = zk.$extends(zul.Widget, {
     $define :{
         resourcesText    : null,
         labelsText    : null,
-        tooltipText : null
+        tooltipText : null,
+        left: function() {
+            this.$supers('setLeft', arguments);
+            this._getRelatedDependencies().forEach(function(dependency) {
+                dependency.draw();
+            });
+        }
     },
     $init : function(){
         this.$supers('$init', arguments);
@@ -114,6 +120,14 @@ ganttz.TaskComponent = zk.$extends(zul.Widget, {
     consolidateNewDependency : function(task){
         zAu.send(new zk.Event(this, 'onAddDependency', {dependencyId : task.id}));
     },
+    _getRelatedDependencies: function() {
+        return jq('.dependency[idtaskorig='+ this.uuid + ']')
+                .add('.dependency[idtaskend='+ this.uuid + ']')
+                .get()
+                .map(function(dep) {
+                    return ganttz.DependencyComponentBase.$(dep);
+                });
+    },
     _addDragDrop : function(){
         var dragdropregion = this._getDragDropRegion();
         var thisTaskId = this.$n().id;
diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/PredefinedCalendarExceptionTypes.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/PredefinedCalendarExceptionTypes.java
index f8c6617c3..d25442180 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/PredefinedCalendarExceptionTypes.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/PredefinedCalendarExceptionTypes.java
@@ -29,12 +29,11 @@ package org.libreplan.business.calendars.entities;
  */
 public enum PredefinedCalendarExceptionTypes {
 
-    HOLIDAY("HOLIDAY", CalendarExceptionTypeColor.DEFAULT, true),
-    SICK_LEAVE("SICK_LEAVE", CalendarExceptionTypeColor.DEFAULT, true),
-    LEAVE("LEAVE", CalendarExceptionTypeColor.DEFAULT, true),
-    STRIKE("STRIKE", CalendarExceptionTypeColor.DEFAULT, true),
+    RESOURCE_HOLIDAY("RESOURCE_HOLIDAY", CalendarExceptionTypeColor.YELLOW, true),
+    LEAVE("LEAVE", CalendarExceptionTypeColor.MAGENTA, true),
+    STRIKE("STRIKE", CalendarExceptionTypeColor.PURPLE, true),
     BANK_HOLIDAY("BANK_HOLIDAY", CalendarExceptionTypeColor.DEFAULT, true),
-    WORKABLE_BANK_HOLIDAY("WORKABLE_BANK_HOLIDAY", CalendarExceptionTypeColor.DEFAULT, false);
+    HALF_DAY_HOLIDAY("HALF_DAY_HOLIDAY", CalendarExceptionTypeColor.ORANGE, false);
 
     private CalendarExceptionType calendarExceptionType;
 
diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/ITypeOfWorkHoursDAO.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/ITypeOfWorkHoursDAO.java
index 5475dba9d..e61a2aea8 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/ITypeOfWorkHoursDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/ITypeOfWorkHoursDAO.java
@@ -46,6 +46,8 @@ public interface ITypeOfWorkHoursDAO extends
 
     boolean existsByCode(TypeOfWorkHours typeOfWorkHours);
 
+    boolean existsByName(TypeOfWorkHours typeOfWorkHours);
+
     boolean existsTypeWithCodeInAnotherTransaction(String code);
 
     List<TypeOfWorkHours> findActive();
diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java
index 176a6328f..587aa4016 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/daos/TypeOfWorkHoursDAO.java
@@ -167,4 +167,11 @@ public class TypeOfWorkHoursDAO extends IntegrationEntityDAO<TypeOfWorkHours>
         }
     }
 
+    @Override
+    public boolean existsByName(TypeOfWorkHours typeOfWorkHours) {
+        Criteria c = getSession().createCriteria(TypeOfWorkHours.class).add(
+                Restrictions.eq("name", typeOfWorkHours.getName()));
+        return c.uniqueResult() != null;
+    }
+
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ITypeOfWorkHoursBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ITypeOfWorkHoursBootstrap.java
new file mode 100644
index 000000000..91b02afe7
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ITypeOfWorkHoursBootstrap.java
@@ -0,0 +1,32 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.libreplan.business.costcategories.entities;
+
+import org.libreplan.business.IDataBootstrap;
+
+/**
+ * Interface for {@link TypeOfWorkHoursBootstrap}.
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
+ */
+public interface ITypeOfWorkHoursBootstrap extends IDataBootstrap {
+
+    void loadRequiredData();
+
+}
diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/PredefinedTypeOfWorkHours.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/PredefinedTypeOfWorkHours.java
new file mode 100644
index 000000000..a2631a832
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/PredefinedTypeOfWorkHours.java
@@ -0,0 +1,56 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.libreplan.business.costcategories.entities;
+
+import java.math.BigDecimal;
+
+/**
+ * Defines the default {@link TypeOfWorkHours}.
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
+ */
+public enum PredefinedTypeOfWorkHours {
+
+    DEFAULT("Default", 30), OVERTIME("Overtime", 50);
+
+    private TypeOfWorkHours typeOfWorkHours;
+
+
+    private PredefinedTypeOfWorkHours(String name, double price) {
+        typeOfWorkHours = TypeOfWorkHours.create();
+        typeOfWorkHours.setName(name);
+        typeOfWorkHours.setDefaultPrice(new BigDecimal(price).setScale(2));
+    }
+
+    public TypeOfWorkHours getTypeOfWorkHours() {
+        return typeOfWorkHours;
+    }
+
+    public static boolean contains(TypeOfWorkHours typeOfWorkHours) {
+        PredefinedTypeOfWorkHours[] types = PredefinedTypeOfWorkHours.values();
+        for (PredefinedTypeOfWorkHours each : types) {
+            if (each.getTypeOfWorkHours().getName()
+                    .equals(typeOfWorkHours.getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHoursBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHoursBootstrap.java
new file mode 100644
index 000000000..7fd2685e4
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHoursBootstrap.java
@@ -0,0 +1,62 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.libreplan.business.costcategories.entities;
+
+import org.libreplan.business.common.daos.IEntitySequenceDAO;
+import org.libreplan.business.common.entities.EntityNameEnum;
+import org.libreplan.business.costcategories.daos.ITypeOfWorkHoursDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Creates the default {@link TypeOfWorkHours}.
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
+ */
+@Component
+@Scope("singleton")
+public class TypeOfWorkHoursBootstrap implements ITypeOfWorkHoursBootstrap {
+
+    @Autowired
+    private ITypeOfWorkHoursDAO typeOfWorkHoursDAO;
+
+    @Autowired
+    private IEntitySequenceDAO entitySequenceDAO;
+
+    @Override
+    @Transactional
+    public void loadRequiredData() {
+        for (PredefinedTypeOfWorkHours predefinedTypeOfWorkHours : PredefinedTypeOfWorkHours
+                .values()) {
+            TypeOfWorkHours typeOfWorkHours = predefinedTypeOfWorkHours
+                    .getTypeOfWorkHours();
+            if (!typeOfWorkHoursDAO.existsByName(typeOfWorkHours)) {
+                typeOfWorkHours.setCodeAutogenerated(true);
+                typeOfWorkHours
+                        .setCode(entitySequenceDAO
+                                .getNextEntityCodeWithoutTransaction(EntityNameEnum.WORK_HOURS_TYPE));
+                typeOfWorkHoursDAO.save(typeOfWorkHours);
+            }
+        }
+    }
+
+}
diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/daos/ILabelDAO.java b/libreplan-business/src/main/java/org/libreplan/business/labels/daos/ILabelDAO.java
index b916c53a6..3e272fe71 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/labels/daos/ILabelDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/labels/daos/ILabelDAO.java
@@ -37,4 +37,6 @@ public interface ILabelDAO extends IIntegrationEntityDAO<Label> {
     Label findByNameAndType(String labelName, LabelType labelType);
 
     List<Label> findByType(LabelType labelType);
+
+    boolean existsByName(String labelName);
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/daos/LabelDAO.java b/libreplan-business/src/main/java/org/libreplan/business/labels/daos/LabelDAO.java
index 77c8f2e27..a2bb91668 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/labels/daos/LabelDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/labels/daos/LabelDAO.java
@@ -59,4 +59,13 @@ public class LabelDAO extends IntegrationEntityDAO<Label> implements ILabelDAO {
                 Restrictions.eq("type", labelType));
         return ((List<Label>) c.list());
     }
+
+    @Override
+    public boolean existsByName(String labelName) {
+        Criteria c = getSession().createCriteria(Label.class).add(
+                Restrictions.eq("name", labelName));
+        if (c.uniqueResult() != null)
+            return true;
+        return false;
+    }
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/ILabelBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/ILabelBootstrap.java
new file mode 100644
index 000000000..d00583632
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/ILabelBootstrap.java
@@ -0,0 +1,32 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.libreplan.business.labels.entities;
+
+import org.libreplan.business.IDataBootstrap;
+
+/**
+ * Interface for {@link LabelBootstrap}.
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
+ */
+public interface ILabelBootstrap extends IDataBootstrap {
+
+    void loadRequiredData();
+
+}
\ No newline at end of file
diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelBootstrap.java
new file mode 100644
index 000000000..b9cebe14a
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelBootstrap.java
@@ -0,0 +1,64 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.libreplan.business.labels.entities;
+
+import org.libreplan.business.common.daos.IEntitySequenceDAO;
+import org.libreplan.business.common.entities.EntityNameEnum;
+import org.libreplan.business.labels.daos.ILabelTypeDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Creates the default {@link Label}.
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
+ */
+@Component
+@Scope("singleton")
+public class LabelBootstrap implements ILabelBootstrap {
+
+    @Autowired
+    private ILabelTypeDAO labelTypeDAO;
+
+    @Autowired
+    private IEntitySequenceDAO entitySequenceDAO;
+
+    @Override
+    @Transactional
+    public void loadRequiredData() {
+        LabelType priorityType = LabelType.create("Priority");
+        if (!labelTypeDAO.existsByName(priorityType)) {
+            priorityType.setCodeAutogenerated(true);
+            priorityType.setCode(entitySequenceDAO
+                    .getNextEntityCodeWithoutTransaction(EntityNameEnum.LABEL));
+            for (PredefinedLabels predefinedLabel : PredefinedLabels.values()) {
+                Label label = predefinedLabel.getLabel();
+                priorityType.addLabel(label);
+            }
+            priorityType.generateLabelCodes(entitySequenceDAO
+                    .getNumberOfDigitsCode(EntityNameEnum.LABEL));
+
+            labelTypeDAO.save(priorityType);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/PredefinedLabels.java b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/PredefinedLabels.java
new file mode 100644
index 000000000..1ff04f62f
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/PredefinedLabels.java
@@ -0,0 +1,42 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.libreplan.business.labels.entities;
+
+
+/**
+ * Defines the default {@link Label}.
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
+ */
+public enum PredefinedLabels {
+
+    HIGH_URGENCY("High urgency"), MEDIUM_URGENCY("Medium urgency"), LOW_URGENCY(
+            "Low urgency");
+
+    private Label label;
+
+    private PredefinedLabels(String name) {
+        label = Label.create(name);
+    }
+
+    public Label getLabel() {
+        return label;
+    }
+
+}
\ No newline at end of file
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
index 835321c68..97defeead 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java
@@ -28,7 +28,6 @@ import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.Query;
-import org.hibernate.criterion.MatchMode;
 import org.hibernate.criterion.Restrictions;
 import org.joda.time.LocalDate;
 import org.libreplan.business.common.IAdHocTransactionService;
@@ -290,9 +289,7 @@ public class OrderDAO extends IntegrationEntityDAO<Order> implements
         }
 
         Order order = (Order) getSession().createCriteria(getEntityClass())
-                .add(
-                        Restrictions.ilike("infoComponent.name", name,
-                                MatchMode.EXACT))
+                .add(Restrictions.eq("infoComponent.name", name).ignoreCase())
                 .uniqueResult();
 
         if (order == null) {
@@ -409,7 +406,7 @@ public class OrderDAO extends IntegrationEntityDAO<Order> implements
     public boolean existsByNameAnotherTransaction(String name) {
         try {
             Order order = findByName(name);
-            return order.getName().equals(name);
+            return order != null;
         } catch (InstanceNotFoundException e) {
             return false;
         }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
index a4452917b..b19af9561 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
@@ -395,6 +395,13 @@ public abstract class OrderElement extends IntegrationEntity implements
         removeChildrenTaskSource(result);
         if (getOnDBTaskSource() != null) {
             result.add(taskSourceRemoval());
+        } else {
+            TaskSource taskSource = getTaskSource();
+            if (taskSource != null) {
+                taskSource.getTask().detachFromDependencies();
+                taskSource.getTask().detachFromParent();
+                getCurrentSchedulingData().taskSourceRemovalRequested();
+            }
         }
     }
 
@@ -1448,4 +1455,8 @@ public abstract class OrderElement extends IntegrationEntity implements
         return new ArrayList<OrderVersion>(schedulingDatasForVersion.keySet());
     }
 
+    public String toString() {
+        return super.toString() + " :: " + getName();
+    }
+
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/DependencyDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/DependencyDAO.java
index 4ea0d8fb4..a9660c2cb 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/DependencyDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/DependencyDAO.java
@@ -20,21 +20,40 @@
  */
 package org.libreplan.business.planner.daos;
 
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.libreplan.business.common.daos.GenericDAOHibernate;
+import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.planner.entities.Dependency;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * DAO for entity @{link Dedenpency}
+ *
  * @author Javier Moran Rua <jmoran@igalia.com>
  *
  */
 
 @Repository
 @Scope(BeanDefinition.SCOPE_SINGLETON)
-public class DependencyDAO extends GenericDAOHibernate<Dependency,Long>
-    implements IDependencyDAO {
+public class DependencyDAO extends GenericDAOHibernate<Dependency, Long>
+        implements IDependencyDAO {
+
+    @Override
+    @Transactional
+    public void deleteUnattachedDependencies() throws InstanceNotFoundException {
+        Criteria c = getSession().createCriteria(Dependency.class);
+        c.add(Restrictions.or(Restrictions.isNull("origin"),
+                Restrictions.isNull("destination")));
+        List<Dependency> results = c.list();
+        for (Dependency each : results) {
+            remove(each.getId());
+        }
+    }
 
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/IDependencyDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/IDependencyDAO.java
index 027570306..3dc80d8f9 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/IDependencyDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/IDependencyDAO.java
@@ -21,6 +21,7 @@
 package org.libreplan.business.planner.daos;
 
 import org.libreplan.business.common.daos.IGenericDAO;
+import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.planner.entities.Dependency;
 
 /**
@@ -28,8 +29,9 @@ import org.libreplan.business.planner.entities.Dependency;
  * entity
  *
  * @author Javier Moran Rua <jmoran@igalia.com>
- *
  */
-public interface IDependencyDAO extends IGenericDAO<Dependency,Long> {
+public interface IDependencyDAO extends IGenericDAO<Dependency, Long> {
+
+    void deleteUnattachedDependencies() throws InstanceNotFoundException;
 
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/LeaveCriterions.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CategoryCriteria.java
similarity index 61%
rename from libreplan-business/src/main/java/org/libreplan/business/resources/entities/LeaveCriterions.java
rename to libreplan-business/src/main/java/org/libreplan/business/resources/entities/CategoryCriteria.java
index 208c0698c..3499c9925 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/LeaveCriterions.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CategoryCriteria.java
@@ -1,9 +1,7 @@
 /*
  * This file is part of LibrePlan
  *
- * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
- *                         Desenvolvemento Tecnolóxico de Galicia
- * Copyright (C) 2010-2011 Igalia, S.L.
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -25,18 +23,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Predefined leave criterions<br />
- * @author Lorenzo Tilve <ltilve@igalia.com>
- * @author Diego Pino García <dpino@igalia.com>
+ * Predefined categories<br />
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
  */
-public enum LeaveCriterions {
-    MEDICAL_LEAVE("medicalLeave"),
-    PATERNITY_LEAVE("paternityLeave");
+public enum CategoryCriteria {
+    MANAGER("Manager"), SENIOR_WORKER("Senior worker"), JUNIOR_WORKER(
+            "Junior worker");
 
     public static List<String> getCriterionNames() {
         ArrayList<String> result = new ArrayList<String>();
-        for (LeaveCriterions leaveCriterions: values()) {
-            result.add(leaveCriterions.criterionName);
+        for (CategoryCriteria category : values()) {
+            result.add(category.criterionName);
         }
         return result;
     }
@@ -44,10 +42,11 @@ public enum LeaveCriterions {
     private final String criterionName;
 
     public Criterion criterion() {
-        return Criterion.create(criterionName, CriterionType.asCriterionType(PredefinedCriterionTypes.LEAVE));
+        return Criterion.create(criterionName, CriterionType
+                .asCriterionType(PredefinedCriterionTypes.CATEGORY));
     }
 
-    private LeaveCriterions(String name) {
+    private CategoryCriteria(String name) {
         this.criterionName = name;
     }
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/WorkingRelationship.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/LocationCriteria.java
similarity index 56%
rename from libreplan-business/src/main/java/org/libreplan/business/resources/entities/WorkingRelationship.java
rename to libreplan-business/src/main/java/org/libreplan/business/resources/entities/LocationCriteria.java
index d272bda7d..35360ba64 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/WorkingRelationship.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/LocationCriteria.java
@@ -1,9 +1,7 @@
 /*
  * This file is part of LibrePlan
  *
- * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
- *                         Desenvolvemento Tecnolóxico de Galicia
- * Copyright (C) 2010-2011 Igalia, S.L.
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -25,18 +23,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Predefined working relationships<br />
- * @author Óscar González Fernández <ogonzalez@igalia.com>
- * @author Diego Pino García <dpino@igalia.com>
+ * Predefined location criterions<br />
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
  */
-public enum WorkingRelationship {
-    HIRED("hiredResourceWorkingRelationship"),
-    FIRED("firedResourceWorkingRelationship");
+public enum LocationCriteria {
+    AFRICA("Africa"), AMERICA("America"), ASIA("Asia"), AUSTRALIA("Australia"), EUROPE(
+            "Europe");
 
     public static List<String> getCriterionNames() {
         ArrayList<String> result = new ArrayList<String>();
-        for (WorkingRelationship workingRelationship : values()) {
-            result.add(workingRelationship.criterionName);
+        for (LocationCriteria locationCriterions : values()) {
+            result.add(locationCriterions.criterionName);
         }
         return result;
     }
@@ -44,14 +42,11 @@ public enum WorkingRelationship {
     private final String criterionName;
 
     public Criterion criterion() {
-        return Criterion.create(criterionName, CriterionType.asCriterionType(PredefinedCriterionTypes.WORK_RELATIONSHIP));
+        return Criterion.create(criterionName, CriterionType
+                .asCriterionType(PredefinedCriterionTypes.LOCATION));
     }
 
-    public String getCriterionName() {
-        return criterionName;
-    }
-
-    private WorkingRelationship(String name) {
+    private LocationCriteria(String name) {
         this.criterionName = name;
     }
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java
index fa71ac24b..f06832c62 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java
@@ -29,51 +29,29 @@ import org.libreplan.business.common.Registry;
 
 /**
  * This class defines some criterion types known a priori<br />
+ *
  * @author Óscar González Fernández <ogonzalez@igalia.com>
  * @author Diego Pino García <dpino@igalia.com>
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
  */
 public enum PredefinedCriterionTypes implements ICriterionType<Criterion> {
 
-   WORK_RELATIONSHIP(_("WORK_RELATIONSHIP"), "Relationship of the resource with the enterprise ",false, false,true, ResourceEnum.WORKER) {
-        @Override
-        public List<String> getPredefined() {
-            return WorkingRelationship.getCriterionNames();
-        }
-    },
-    LOCATION_GROUP(_("LOCATION_GROUP"), "Location where the workers work",
+    LOCATION(_("LOCATION"), "Worker location",
             false, true, true, ResourceEnum.WORKER) {
         @Override
         public List<String> getPredefined() {
-            return Arrays.asList();
+            return LocationCriteria.getCriterionNames();
         }
     },
-    MACHINE_LOCATION_GROUP(_("MACHINE LOCATION_GROUP"),
-            "Location where there are machines", false, true, true,
-            ResourceEnum.MACHINE) {
+    CATEGORY(_("CATEGORY"), "Professional category", true, true, true,
+            ResourceEnum.WORKER) {
         @Override
         public List<String> getPredefined() {
-            return Arrays.asList();
+            return CategoryCriteria.getCriterionNames();
         }
     },
-    LEAVE(_("LEAVE"), "Leave",false, false, true, ResourceEnum.WORKER) {
-        @Override
-        public List<String> getPredefined() {
-            return LeaveCriterions.getCriterionNames();
-        }
-    },
-    TRAINING(_("TRAINING"), "Training courses and labor training",true, true, true, ResourceEnum.WORKER) {
-        @Override
-        public List<String> getPredefined() {
-            return Arrays.asList();
-        }
-    },
-    JOB(_("JOB"),"Job",true, true, true, ResourceEnum.WORKER) {
-        @Override
-        public List<String> getPredefined() {
-            return Arrays.asList();
-        }
-    },
-    CATEGORY(_("CATEGORY"),"Professional category",true, true, true, ResourceEnum.WORKER) {
+    SKILL(_("SKILL"), "Worker skill", true, true, true,
+            ResourceEnum.WORKER) {
         @Override
         public List<String> getPredefined() {
             return Arrays.asList();
diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/IWorkReportTypeBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/IWorkReportTypeBootstrap.java
new file mode 100644
index 000000000..793d1bbbd
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/IWorkReportTypeBootstrap.java
@@ -0,0 +1,32 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.libreplan.business.workreports.entities;
+
+import org.libreplan.business.IDataBootstrap;
+
+
+/**
+ * Interface for {@link WorkReportTypeBootstrap}.
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
+ */
+
+public interface IWorkReportTypeBootstrap extends IDataBootstrap {
+    void loadRequiredData();
+}
diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PredefinedWorkReportTypes.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PredefinedWorkReportTypes.java
new file mode 100644
index 000000000..1aa8d5281
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PredefinedWorkReportTypes.java
@@ -0,0 +1,44 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.libreplan.business.workreports.entities;
+
+/**
+ * Defines the default {@link WorkReportType}.
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
+ */
+public enum PredefinedWorkReportTypes {
+    DEFAULT("Default", false, false, false);
+
+    private WorkReportType workReportType;
+
+    private PredefinedWorkReportTypes(String name, boolean dateIsSharedByLines,
+            boolean resourceIsSharedInLines, boolean orderElementIsSharedInLines) {
+        workReportType = WorkReportType.create();
+        workReportType.setName(name);
+        workReportType.setDateIsSharedByLines(dateIsSharedByLines);
+        workReportType.setResourceIsSharedInLines(resourceIsSharedInLines);
+        workReportType
+                .setOrderElementIsSharedInLines(orderElementIsSharedInLines);
+    }
+
+    public WorkReportType getWorkReportType() {
+        return workReportType;
+    }
+}
diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportTypeBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportTypeBootstrap.java
new file mode 100644
index 000000000..991001704
--- /dev/null
+++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportTypeBootstrap.java
@@ -0,0 +1,63 @@
+/*
+ * This file is part of LibrePlan
+ *
+ * Copyright (C) 2011 CafédeRed Solutions, S.L.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.libreplan.business.workreports.entities;
+
+import org.libreplan.business.common.daos.IEntitySequenceDAO;
+import org.libreplan.business.common.entities.EntityNameEnum;
+import org.libreplan.business.workreports.daos.IWorkReportTypeDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Creates the default {@link WorkReportType}.
+ *
+ * @author Ignacio Díaz Teijido <ignacio.diaz@cafedered.com>
+ */
+
+@Component
+@Scope("singleton")
+public class WorkReportTypeBootstrap implements IWorkReportTypeBootstrap {
+
+    @Autowired
+    private IWorkReportTypeDAO workReportTypeDAO;
+
+    @Autowired
+    private IEntitySequenceDAO entitySequenceDAO;
+
+    @Override
+    @Transactional
+    public void loadRequiredData() {
+        for (PredefinedWorkReportTypes predefinedWorkReportType : PredefinedWorkReportTypes
+                .values()) {
+            WorkReportType workReportType = predefinedWorkReportType
+                    .getWorkReportType();
+            if (!workReportTypeDAO
+                    .existsOtherWorkReportTypeByName(workReportType)) {
+                workReportType.setCodeAutogenerated(true);
+                workReportType
+                        .setCode(entitySequenceDAO
+                                .getNextEntityCodeWithoutTransaction(EntityNameEnum.WORKREPORTTYPE));
+                workReportTypeDAO.save(workReportType);
+            }
+        }
+    }
+
+}
diff --git a/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/Tasks.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/Tasks.hbm.xml
index a9e5c0685..34d83d7cd 100644
--- a/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/Tasks.hbm.xml
+++ b/libreplan-business/src/main/resources/org/libreplan/business/planner/entities/Tasks.hbm.xml
@@ -36,13 +36,13 @@
         <one-to-one name="taskSource" cascade="delete" />
 
         <!-- Indexed on the other side -->
-        <set name="dependenciesWithThisOrigin" cascade="all-delete-orphan">
+        <set name="dependenciesWithThisOrigin" cascade="all">
             <key column="origin"></key>
             <one-to-many class="Dependency" />
         </set>
 
         <!-- Not indexed -->
-        <set name="dependenciesWithThisDestination" cascade="all-delete-orphan">
+        <set name="dependenciesWithThisDestination" cascade="all">
             <key column="destination"></key>
             <one-to-many class="Dependency" />
         </set>
diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/resources/bootstrap/CriterionsBootstrapTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/resources/bootstrap/CriterionsBootstrapTest.java
index d89d4f6bb..b9d113e01 100644
--- a/libreplan-business/src/test/java/org/libreplan/business/test/resources/bootstrap/CriterionsBootstrapTest.java
+++ b/libreplan-business/src/test/java/org/libreplan/business/test/resources/bootstrap/CriterionsBootstrapTest.java
@@ -32,8 +32,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.libreplan.business.resources.bootstrap.ICriterionsBootstrap;
 import org.libreplan.business.resources.daos.ICriterionDAO;
+import org.libreplan.business.resources.entities.CategoryCriteria;
 import org.libreplan.business.resources.entities.Criterion;
-import org.libreplan.business.resources.entities.WorkingRelationship;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -59,8 +59,8 @@ public class CriterionsBootstrapTest {
 
     private List<Criterion> getSomePredefinedCriterions() {
         List<Criterion> result = new ArrayList<Criterion>();
-        for (WorkingRelationship workingRelationship : WorkingRelationship.values()) {
-            result.add(workingRelationship.criterion());
+        for (CategoryCriteria category : CategoryCriteria.values()) {
+            result.add(category.criterion());
         }
         return result;
     }
diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/CriterionTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/CriterionTest.java
index c2a6c85ff..5964daded 100644
--- a/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/CriterionTest.java
+++ b/libreplan-business/src/test/java/org/libreplan/business/test/resources/entities/CriterionTest.java
@@ -48,10 +48,9 @@ import org.libreplan.business.resources.entities.Worker;
 public class CriterionTest {
     @Test
     public void testCreateWithAType() {
-        Criterion firedCriterion = PredefinedCriterionTypes.WORK_RELATIONSHIP
-                .createCriterion("fired");
-        assertTrue(PredefinedCriterionTypes.WORK_RELATIONSHIP
-                .contains(firedCriterion));
+        Criterion managerCriterion = PredefinedCriterionTypes.CATEGORY
+                .createCriterion("Manager");
+        assertTrue(PredefinedCriterionTypes.CATEGORY.contains(managerCriterion));
     }
 
     @Test
@@ -190,9 +189,9 @@ public class CriterionTest {
 
     @Test
     public void testCanBeRelatedTo() {
-        assertTrue(PredefinedCriterionTypes.LOCATION_GROUP
+        assertTrue(PredefinedCriterionTypes.LOCATION
                 .criterionCanBeRelatedTo(Worker.class));
-        assertTrue(PredefinedCriterionTypes.WORK_RELATIONSHIP
+        assertTrue(PredefinedCriterionTypes.CATEGORY
                 .criterionCanBeRelatedTo(Worker.class));
     }
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TemplateFinder.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TemplateFinder.java
index e58caa025..92d69663b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TemplateFinder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TemplateFinder.java
@@ -79,7 +79,7 @@ public abstract class TemplateFinder<T extends OrderElementTemplate> extends
     }
 
     protected String extractStringFor(T template) {
-        return template.getCode() + " :: " + template.getName();
+        return template.getName() + " (" + template.getCode() + ")";
     }
 
     @Override
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java
index 39b8d29e7..bc05a3d61 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java
@@ -20,8 +20,6 @@
  */
 package org.libreplan.web.materials;
 
-import static org.libreplan.web.I18nHelper._;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -96,8 +94,8 @@ public class UnitTypeModel extends IntegrationEntityModel implements
         try {
             return unitTypeDAO.find(unitType.getId());
         } catch (InstanceNotFoundException e) {
-            LOG.error(_("It was not possible load entity. Not found. Id: " +
-                    unitType.getId()), e);
+            LOG.error("It was not possible load entity. Not found. Id: "
+                    + unitType.getId(), e);
             throw new RuntimeException(e);
         }
     }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java
index 349f2d965..af621524e 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java
@@ -341,7 +341,7 @@ public class ManageOrderElementAdvancesController extends
             return _("Progress measurements");
         }
 
-        return _("Progress measurements: ") + infoAdvanceAssignment;
+        return _("Progress measurements") + ": " + infoAdvanceAssignment;
     }
 
     public boolean isReadOnlyAdvanceMeasurements() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index da048bde0..000382f69 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -53,8 +53,6 @@ import org.libreplan.web.common.Util;
 import org.libreplan.web.common.components.bandboxsearch.BandboxMultipleSearch;
 import org.libreplan.web.common.components.bandboxsearch.BandboxSearch;
 import org.libreplan.web.common.components.finders.FilterPair;
-import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup;
-import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup.IOnResult;
 import org.libreplan.web.orders.criterionrequirements.AssignedCriterionRequirementToOrderElementController;
 import org.libreplan.web.orders.labels.AssignedLabelsToOrderElementController;
 import org.libreplan.web.orders.labels.LabelsAssignmentToOrderElementComponent;
@@ -105,7 +103,9 @@ import org.zkoss.zul.api.Window;
 
 /**
  * Controller for CRUD actions <br />
+ *
  * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 @org.springframework.stereotype.Component
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -164,19 +164,6 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private Component messagesContainer;
 
-    private TemplateFinderPopup templateFinderPopup;
-
-    public void createOrderFromTemplate() {
-        templateFinderPopup.openForOrderCreation(createOrderFromTemplateButton,
-                "after_start", new IOnResult<OrderTemplate>() {
-
-                    @Override
-                    public void found(OrderTemplate template) {
-                        showCreateFormFromTemplate(template);
-                    }
-                });
-    }
-
     public void showCreateFormFromTemplate(OrderTemplate template) {
         showOrderElementFilter();
         showCreateButtons(false);
@@ -205,7 +192,6 @@ public class OrderCRUDController extends GenericForwardComposer {
     private Vbox orderElementFilter;
 
     private Button createOrderButton;
-    private Button createOrderFromTemplateButton;
     private Button saveOrderAndContinueButton;
     private Button cancelEditionButton;
 
@@ -259,28 +245,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     private void setupGlobalButtons() {
         Hbox perspectiveButtonsInsertionPoint = (Hbox) page
                 .getFellow("perspectiveButtonsInsertionPoint");
-        perspectiveButtonsInsertionPoint.getChildren().clear();
 
-        createOrderButton.setParent(perspectiveButtonsInsertionPoint);
-        createOrderButton.addEventListener(Events.ON_CLICK,
-                new EventListener() {
-            @Override
-                    public void onEvent(Event event) throws Exception {
-                goToCreateForm();
-                    }
-                });
-
-        createOrderFromTemplateButton
-                .setParent(perspectiveButtonsInsertionPoint);
-        createOrderFromTemplateButton.addEventListener(Events.ON_CLICK,
-                new EventListener() {
-                    @Override
-                    public void onEvent(Event event) throws Exception {
-                        createOrderFromTemplate();
-            }
-        });
-
-        saveOrderAndContinueButton.setParent(perspectiveButtonsInsertionPoint);
         saveOrderAndContinueButton.addEventListener(Events.ON_CLICK,
                 new EventListener() {
                     @Override
@@ -289,7 +254,6 @@ public class OrderCRUDController extends GenericForwardComposer {
                     }
                 });
 
-        cancelEditionButton.setParent(perspectiveButtonsInsertionPoint);
         cancelEditionButton.addEventListener(Events.ON_CLICK,
                 new EventListener() {
                     @Override
@@ -944,6 +908,10 @@ public class OrderCRUDController extends GenericForwardComposer {
         orderTemplates.goToCreateTemplateFrom(order);
     }
 
+    public void createFromTemplate(OrderTemplate template) {
+        orderModel.prepareCreationFrom(template, getDesktop());
+    }
+
     private Runnable onUp;
 
     public void goToEditForm(Order order) {
@@ -1088,18 +1056,14 @@ public class OrderCRUDController extends GenericForwardComposer {
         orderModel.prepareForCreate(desktop);
     }
 
-    private void editNewCreatedOrder() {
+    public void editNewCreatedOrder(Window detailsWindow) {
         showOrderElementFilter();
         hideCreateButtons();
         prepareEditWindow();
         showEditWindow(_("Create project"));
-    }
-
-    public void editNewCreatedOrder(Window detailsWindow) {
-        editNewCreatedOrder();
-        // close project details window
         detailsWindow.setVisible(false);
         setupOrderAuthorizationController();
+        detailsWindow.getAttributes();
         saveAndContinue(false);
     }
 
@@ -1416,10 +1380,24 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     public void showCreateButtons(boolean showCreate) {
-        createOrderButton.setVisible(showCreate);
-        createOrderFromTemplateButton.setVisible(showCreate);
-        saveOrderAndContinueButton.setVisible(!showCreate);
-        cancelEditionButton.setVisible(!showCreate);
+        if (!showCreate) {
+            Hbox perspectiveButtonsInsertionPoint = (Hbox) page
+                    .getFellow("perspectiveButtonsInsertionPoint");
+            perspectiveButtonsInsertionPoint.getChildren().clear();
+            saveOrderAndContinueButton
+                    .setParent(perspectiveButtonsInsertionPoint);
+            cancelEditionButton.setParent(perspectiveButtonsInsertionPoint);
+        }
+        if (createOrderButton != null) {
+            createOrderButton.setVisible(showCreate);
+        }
+        if (saveOrderAndContinueButton != null) {
+            saveOrderAndContinueButton.setVisible(!showCreate);
+        }
+        if (cancelEditionButton != null) {
+            cancelEditionButton.setVisible(!showCreate);
+        }
+
     }
 
     public void highLight(final OrderElement orderElement) {
@@ -1455,7 +1433,6 @@ public class OrderCRUDController extends GenericForwardComposer {
     private void checkCreationPermissions() {
         if (!SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_ORDER)) {
             createOrderButton.setDisabled(true);
-            createOrderFromTemplateButton.setDisabled(true);
         }
     }
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
index 226f29cb6..07ae06d17 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
@@ -2,7 +2,8 @@
  * This file is part of LibrePlan
  *
  * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
- * Desenvolvemento Tecnolóxico de Galicia
+ *                         Desenvolvemento Tecnolóxico de Galicia
+ * Copyright (C) 2011 Igalia, S.L.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License as published by the Free
@@ -396,9 +397,20 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
     @Transactional(readOnly = true)
     public void prepareCreationFrom(OrderTemplate template, Desktop desktop) {
         loadNeededDataForConversation();
-        Order order = createOrderFrom((OrderTemplate) templateDAO
+        Order newOrder = createOrderFrom((OrderTemplate) templateDAO
                 .findExistingEntity(template.getId()));
-        planningState = planningStateCreator.createOn(desktop, order);
+        newOrder.setName(getOrder().getName());
+        if (!getOrder().isCodeAutogenerated()) {
+            newOrder.setCodeAutogenerated();
+            newOrder.setCode(getOrder().getCode());
+        }
+        if (getOrder().getDeadline() != null) {
+            newOrder.setDeadline(getOrder().getDeadline());
+        }
+        newOrder.setCustomer(((Order) getOrder()).getCustomer());
+        newOrder.setCalendar(getCalendar());
+
+        planningState = planningStateCreator.createOn(desktop, newOrder);
         forceLoadAdvanceAssignmentsAndMeasurements(planningState.getOrder());
         initializeOrder();
     }
@@ -455,7 +467,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
             this.planningState.getSaveCommand().save(beforeSaveActions, null);
         }
     }
-    
+
     private void reattachCalendar() {
         if (planningState.getOrder().getCalendar() == null) {
             return;
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
index ede55aa1f..bebb0795e 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
@@ -2,6 +2,8 @@
  * This file is part of LibrePlan
  *
  * Copyright (C) 2010-2011 Wireless Galicia, S.L.
+ * Copyright (C) 2011 Igalia, S.L.
+
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -27,14 +29,18 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.joda.time.LocalDate;
 import org.libreplan.business.calendars.entities.BaseCalendar;
 import org.libreplan.business.externalcompanies.entities.ExternalCompany;
+import org.libreplan.business.orders.daos.IOrderDAO;
 import org.libreplan.business.orders.entities.Order;
+import org.libreplan.business.templates.entities.OrderTemplate;
 import org.libreplan.web.common.ConstraintChecker;
 import org.libreplan.web.common.Util;
 import org.libreplan.web.common.components.bandboxsearch.BandboxSearch;
 import org.libreplan.web.planner.consolidations.AdvanceConsolidationController;
 import org.libreplan.web.planner.tabs.MultipleTabsPlannerController;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.SuspendNotAllowedException;
@@ -53,7 +59,9 @@ import org.zkoss.zul.Window;
 /**
  * Controller for the creation of an {@link order} with its principal
  * properties.
+ *
  * @author Susana Montes Pedreira <smontes@wirelessgailicia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 
 public class ProjectDetailsController extends GenericForwardComposer {
@@ -67,8 +75,6 @@ public class ProjectDetailsController extends GenericForwardComposer {
 
     private BaseCalendar defaultCalendar;
 
-    private String oldCode;
-
     private boolean isCodeAutogeneratedInit;
 
     private MultipleTabsPlannerController tabs;
@@ -79,10 +85,15 @@ public class ProjectDetailsController extends GenericForwardComposer {
 
     private BandboxSearch bdExternalCompanies;
 
+    private BandboxSearch bdProjectTemplate;
+
     private Textbox txtName;
 
     private Datebox deadline;
 
+    @Autowired
+    private IOrderDAO orderDAO;
+
     public ProjectDetailsController() {
         Window window = (Window) Executions.createComponents(
                 "/orders/_projectDetails.zul", null,
@@ -131,6 +142,11 @@ public class ProjectDetailsController extends GenericForwardComposer {
             if (tabs != null) {
                 tabs.goToOrdersList();
             }
+            if (bdProjectTemplate.getSelectedElement() != null) {
+                OrderTemplate template = (OrderTemplate) bdProjectTemplate
+                        .getSelectedElement();
+                orderController.createFromTemplate(template);
+            }
             orderController.editNewCreatedOrder(window);
         }
     }
@@ -141,6 +157,10 @@ public class ProjectDetailsController extends GenericForwardComposer {
             showWrongValue();
             return false;
         }
+        if (orderDAO.existsByNameAnotherTransaction(txtName.getValue())) {
+            showWrongName();
+            return false;
+        }
         return true;
     }
 
@@ -148,6 +168,11 @@ public class ProjectDetailsController extends GenericForwardComposer {
         throw new WrongValueException(initDate, _("cannot be null or empty"));
     }
 
+    private void showWrongName() {
+        throw new WrongValueException(txtName,
+                _("project name already being used"));
+    }
+
     private void close() {
         window.setVisible(false);
     }
@@ -252,12 +277,23 @@ public class ProjectDetailsController extends GenericForwardComposer {
                         bdExternalCompanies.close();
                     }
                 });
-        txtName.addEventListener(Events.ON_OK, new EventListener() {
-            @Override
-            public void onEvent(Event event) {
-                accept();
-            }
-        });
+        bdProjectTemplate.setListboxEventListener(Events.ON_SELECT,
+                new EventListener() {
+                    @Override
+                    public void onEvent(Event event) {
+                        calculateDeadlineDate();
+                    }
+                });
     }
 
+    public void calculateDeadlineDate() {
+        if ((bdProjectTemplate.getSelectedElement() == null)
+                || (((OrderTemplate) bdProjectTemplate.getSelectedElement())
+                        .getDeadlineAsDaysFromBeginning() == null)
+                || (initDate.getValue() == null)) {
+            return;
+        }
+        int days = ((OrderTemplate) bdProjectTemplate.getSelectedElement()).getDeadlineAsDaysFromBeginning();
+        deadline.setValue( new LocalDate(initDate.getValue()).plusDays(days).toDateTimeAtStartOfDay().toDate());
+        }
 }
\ No newline at end of file
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
index d963c1184..94d0d0cba 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
@@ -638,10 +638,21 @@ public class TaskElementAdapter {
                 if (daysBetween == 0) {
                     return calculateLimitDateWhenDaysBetweenAreZero(advancePercentage);
                 }
-                int daysAdvance = advancePercentage.multiply(
-                        new BigDecimal(daysBetween)).intValue();
-                return GanttDate.createFrom(taskElement.getIntraDayStartDate()
-                        .getDate().plusDays(daysAdvance));
+                BigDecimal daysAdvance = advancePercentage
+                        .multiply(new BigDecimal(daysBetween));
+                int days = daysAdvance.intValue();
+
+                LocalDate advanceDate = taskElement.getStartAsLocalDate()
+                        .plusDays(days);
+                EffortDuration capacity = calendar.getCapacityOn(PartialDay
+                        .wholeDay(advanceDate));
+
+                int seconds = daysAdvance.subtract(new BigDecimal(days))
+                        .multiply(new BigDecimal(capacity.getSeconds()))
+                        .intValue();
+
+                return toGantt(IntraDayDate.create(advanceDate,
+                        EffortDuration.seconds(seconds)));
             }
 
             private GanttDate calculateLimitDateWhenDaysBetweenAreZero(
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
index fbc73251d..99ea1add7 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
@@ -61,13 +61,9 @@ import org.libreplan.business.planner.entities.TaskGroup;
 import org.libreplan.business.planner.entities.TaskMilestone;
 import org.libreplan.business.scenarios.IScenarioManager;
 import org.libreplan.business.scenarios.entities.Scenario;
-import org.libreplan.business.templates.entities.OrderTemplate;
 import org.libreplan.business.users.daos.IUserDAO;
 import org.libreplan.business.users.entities.User;
-import org.libreplan.business.users.entities.UserRole;
 import org.libreplan.business.workreports.entities.WorkReportLine;
-import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup;
-import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup.IOnResult;
 import org.libreplan.web.planner.TaskElementAdapter;
 import org.libreplan.web.planner.chart.Chart;
 import org.libreplan.web.planner.chart.EarnedValueChartFiller;
@@ -92,9 +88,7 @@ import org.zkoss.ganttz.Planner;
 import org.zkoss.ganttz.adapters.IStructureNavigator;
 import org.zkoss.ganttz.adapters.PlannerConfiguration;
 import org.zkoss.ganttz.adapters.PlannerConfiguration.IPrintAction;
-import org.zkoss.ganttz.extensions.ICommand;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
-import org.zkoss.ganttz.extensions.IContext;
 import org.zkoss.ganttz.timetracker.TimeTracker;
 import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener;
 import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
@@ -108,7 +102,6 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.Clients;
-import org.zkoss.zul.Button;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Div;
@@ -126,6 +119,7 @@ import org.zkoss.zul.Vbox;
  * Model for company planning view.
  *
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 @Component
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -231,63 +225,6 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
             configuration.setDoubleClickCommand(doubleClickCommand);
         }
 
-        if (SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_ORDER)) {
-            ICommand<TaskElement> createNewOrderCommand = new ICommand<TaskElement>() {
-
-                @Override
-                public String getName() {
-                    return _("Create new project");
-                }
-
-                @Override
-                public String getImage() {
-                    return "/common/img/ico_add.png";
-                }
-
-                @Override
-                public void doAction(IContext<TaskElement> context) {
-                    tabs.goToCreateForm();
-                }
-
-            };
-
-            configuration.addGlobalCommand(createNewOrderCommand);
-
-            ICommand<TaskElement> createNewOrderFromTemplateCommand = new ICommand<TaskElement>() {
-
-                @Override
-                public String getName() {
-                    return _("Create new project from template");
-                }
-
-                @Override
-                public String getImage() {
-                    return "/common/img/ico_copy.png";
-                }
-
-                @Override
-                public void doAction(IContext<TaskElement> context) {
-                    TemplateFinderPopup templateFinderPopup = (TemplateFinderPopup) planner
-                            .getFellowIfAny("templateFinderPopup");
-                    Button createOrderFromTemplateButton = planner
-                            .findCommandComponent(getName());
-                    if (templateFinderPopup != null) {
-                        templateFinderPopup.openForOrderCreation(
-                                createOrderFromTemplateButton, "after_start",
-                                new IOnResult<OrderTemplate>() {
-                                    @Override
-                                    public void found(OrderTemplate template) {
-                                        goToCreateOtherOrderFromTemplate(template);
-                                    }
-                                });
-                    }
-                }
-
-            };
-
-            configuration.addGlobalCommand(createNewOrderFromTemplateCommand);
-        }
-
         addAdditionalCommands(additional, configuration);
         addPrintSupport(configuration);
         disableSomeFeatures(configuration);
@@ -480,7 +417,7 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
         vbox.setPack("center");
 
         Hbox dateHbox = new Hbox();
-        dateHbox.appendChild(new Label(_("Select date:")));
+        dateHbox.appendChild(new Label(_("Select date")));
 
         LocalDate initialDate = earnedValueChartFiller
                 .initialDateForIndicatorValues();
@@ -935,10 +872,6 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
         }
     }
 
-    public void goToCreateOtherOrderFromTemplate(OrderTemplate template) {
-        tabs.goToCreateotherOrderFromTemplate(template);
-    }
-
     @Transactional(readOnly=true)
     public ProgressType getProgressTypeFromConfiguration() {
         return configurationDAO.getConfiguration().getProgressType();
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java
index c438434da..7dc0bf24b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java
@@ -49,8 +49,6 @@ public interface ICompanyPlanningModel {
 
     LocalDate getFilterFinishDate();
 
-    void goToCreateOtherOrderFromTemplate(OrderTemplate template);
-
     ProgressType getProgressTypeFromConfiguration();
 
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java
index 0754d7862..9124b7e3c 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java
@@ -107,7 +107,7 @@ public class AdvanceConsolidationController extends GenericForwardComposer {
             return _("Progress measurements");
         }
 
-        return _("Progress measurements: ") + infoAdvanceAssignment;
+        return _("Progress measurements") + ": " + infoAdvanceAssignment;
     }
 
     public List<AdvanceConsolidationDTO> getAdvances() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
index 921da84f9..de9750c94 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
@@ -495,7 +495,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
         vbox.setPack("center");
 
         Hbox dateHbox = new Hbox();
-        dateHbox.appendChild(new Label(_("Select date:")));
+        dateHbox.appendChild(new Label(_("Select date")));
 
         LocalDate initialDateForIndicatorValues = earnedValueChartFiller.initialDateForIndicatorValues();
         Datebox datebox = new Datebox(initialDateForIndicatorValues
@@ -1020,8 +1020,8 @@ public class OrderPlanningModel implements IOrderPlanningModel {
 
                 try {
                     Messagebox
-                            .show("Are you sure to want to leave? Unsaved changes will be lost.",
-                                    "Confirm exit dialog", Messagebox.OK
+                            .show(_("Unsaved changes will be lost. Are you sure?"),
+                                    _("Confirm exit dialog"), Messagebox.OK
                                             | Messagebox.CANCEL,
                                     Messagebox.QUESTION,
                             new org.zkoss.zk.ui.event.EventListener() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java
index 2556c5972..5e3382e36 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java
@@ -21,6 +21,7 @@ package org.libreplan.web.planner.order;
 import static org.libreplan.business.planner.entities.TaskElement.justTasks;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -94,6 +95,7 @@ import org.zkoss.zk.ui.Desktop;
  * yet, it creates and initializes a new PlanningState.
  *
  * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 @Component
 @Scope(BeanDefinition.SCOPE_SINGLETON)
@@ -259,6 +261,7 @@ public class PlanningStateCreator {
             forceLoadOf(rootTask);
             forceLoadDayAssignments(orderReloaded.getResources());
             forceLoadOfDepedenciesCollections(rootTask);
+            forceLoadOfLabels(Arrays.asList((TaskElement) rootTask));
         }
 
         if (orderReloaded.getCalendar() != null) {
@@ -270,7 +273,6 @@ public class PlanningStateCreator {
                 currentScenario);
 
         forceLoadOfWorkingHours(result.getInitial());
-        forceLoadOfLabels(result.getInitial());
         return result;
     }
 
@@ -694,6 +696,9 @@ public class PlanningStateCreator {
         }
 
         private List<OrderAuthorization> loadOrderAuthorizations() {
+            if (order.isNewObject()) {
+                return new ArrayList<OrderAuthorization>();
+            }
             List<OrderAuthorization> orderAuthorizations = orderAuthorizationDAO
                     .listByOrder(order);
             for (OrderAuthorization each : orderAuthorizations) {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
index f4f8acc49..2b0bb4cfe 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
@@ -57,6 +57,7 @@ import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.orders.entities.OrderElement;
 import org.libreplan.business.orders.entities.OrderLineGroup;
 import org.libreplan.business.planner.daos.IConsolidationDAO;
+import org.libreplan.business.planner.daos.IDependencyDAO;
 import org.libreplan.business.planner.daos.ISubcontractedTaskDataDAO;
 import org.libreplan.business.planner.daos.ITaskElementDAO;
 import org.libreplan.business.planner.daos.ITaskSourceDAO;
@@ -125,7 +126,7 @@ public class SaveCommandBuilder {
                 "/planner/index.zul;company_scheduling", ISaveCommand.class,
                 result);
     }
-    
+
     public static void dontPoseAsTransientAndChildrenObjects(
             Collection<? extends ResourceAllocation<?>> resourceAllocations) {
         for (ResourceAllocation<?> each : resourceAllocations) {
@@ -134,8 +135,7 @@ public class SaveCommandBuilder {
             for (DayAssignment eachAssignment : each.getAssignments()) {
                 eachAssignment.dontPoseAsTransientObjectAnymore();
             }
-            for (DerivedAllocation eachDerived : each
-                    .getDerivedAllocations()) {
+            for (DerivedAllocation eachDerived : each.getDerivedAllocations()) {
                 eachDerived.dontPoseAsTransientObjectAnymore();
                 Collection<DerivedDayAssignmentsContainer> containers = eachDerived
                         .getContainers();
@@ -151,8 +151,7 @@ public class SaveCommandBuilder {
         }
     }
 
-    private static void dontPoseAsTransient(
-            LimitingResourceQueueElement element) {
+    private static void dontPoseAsTransient(LimitingResourceQueueElement element) {
         if (element != null) {
             for (LimitingResourceQueueDependency d : element
                     .getDependenciesAsOrigin()) {
@@ -199,6 +198,9 @@ public class SaveCommandBuilder {
     @Autowired
     private IOrderAuthorizationDAO orderAuthorizationDAO;
 
+    @Autowired
+    private IDependencyDAO dependencyDAO;
+
     private class SaveCommand implements ISaveCommand {
 
         private PlanningState state;
@@ -209,7 +211,7 @@ public class SaveCommandBuilder {
 
         private IAdapterToTaskFundamentalProperties<TaskElement> adapter;
 
-        private List<IAfterSaveListener> listeners = new ArrayList<IAfterSaveListener>();
+        private final List<IAfterSaveListener> listeners = new ArrayList<IAfterSaveListener>();
 
         public SaveCommand(PlanningState planningState,
                 PlannerConfiguration<TaskElement> configuration) {
@@ -270,7 +272,7 @@ public class SaveCommandBuilder {
                                     }
                                     doTheSaving();
                                     return null;
-                        }
+                                }
                             });
                     dontPoseAsTransientObjectAnymore(state.getOrder());
                     state.getScenarioInfo().afterCommit();
@@ -286,7 +288,8 @@ public class SaveCommandBuilder {
 
                 try {
                     String message = validationException.getMessage();
-                    for (InvalidValue invalidValue : validationException.getInvalidValues()) {
+                    for (InvalidValue invalidValue : validationException
+                            .getInvalidValues()) {
                         message += "\n" + invalidValue.getPropertyName() + ": "
                                 + invalidValue.getMessage();
                     }
@@ -329,6 +332,7 @@ public class SaveCommandBuilder {
             checkConstraintOrderUniqueCode(order);
             checkConstraintHoursGroupUniqueCode(order);
             state.synchronizeTrees();
+
             TaskGroup rootTask = state.getRootTask();
             if (rootTask != null) {
                 // This reattachment is needed to ensure that the root task in
@@ -339,8 +343,10 @@ public class SaveCommandBuilder {
                 taskElementDAO.reattach(rootTask);
             }
             orderDAO.save(order);
+
             saveDerivedScenarios(order);
             deleteOrderElementWithoutParent(order);
+            deleteUnboundedDependencies();
 
             updateTasksRelatedData();
             removeTasksToRemove();
@@ -492,6 +498,14 @@ public class SaveCommandBuilder {
             }
         }
 
+        private void deleteUnboundedDependencies() {
+            try {
+                dependencyDAO.deleteUnattachedDependencies();
+            } catch (InstanceNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
         private void tryToRemove(OrderElement orderElement) {
             // checking no work reports for that orderElement
             if (orderElementDAO
@@ -843,7 +857,6 @@ public class SaveCommandBuilder {
             }
         }
 
-
         private void dontPoseAsTransientObjectAnymore(OrderElement orderElement) {
             orderElement.dontPoseAsTransientObjectAnymore();
             dontPoseAsTransientObjectAnymore(orderElement.getOrderVersions());
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java
index 7fe51aa39..964387c35 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java
@@ -28,7 +28,9 @@ import org.libreplan.web.common.entrypoints.EntryPoints;
 
 /**
  * Entry points for {@link MultipleTabsPlannerController} <br />
+ *
  * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 @EntryPoints(page = "/planner/index.zul", registerAs = "globalView")
 public interface IGlobalViewEntryPoints {
@@ -63,6 +65,4 @@ public interface IGlobalViewEntryPoints {
     @EntryPoint("order_advanced_allocation")
     void goToAdvancedAllocation(Order order);
 
-    @EntryPoint("create_order_from_template")
-    void goToCreateotherOrderFromTemplate(OrderTemplate template);
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
index b3874e698..4f6733851 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
@@ -33,11 +33,14 @@ import org.libreplan.business.orders.entities.OrderElement;
 import org.libreplan.business.planner.entities.TaskElement;
 import org.libreplan.business.resources.daos.IResourcesSearcher;
 import org.libreplan.business.templates.entities.OrderTemplate;
+import org.libreplan.business.users.entities.UserRole;
 import org.libreplan.web.common.entrypoints.EntryPointsHandler;
 import org.libreplan.web.common.entrypoints.URLHandlerRegistry;
 import org.libreplan.web.limitingresources.LimitingResourcesController;
 import org.libreplan.web.montecarlo.MonteCarloController;
 import org.libreplan.web.orders.OrderCRUDController;
+import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup;
+import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup.IOnResult;
 import org.libreplan.web.planner.allocation.AdvancedAllocationController.IBack;
 import org.libreplan.web.planner.company.CompanyPlanningController;
 import org.libreplan.web.planner.order.IOrderPlanningGate;
@@ -45,6 +48,7 @@ import org.libreplan.web.planner.order.OrderPlanningController;
 import org.libreplan.web.planner.order.PlanningStateCreator;
 import org.libreplan.web.planner.tabs.Mode.ModeTypeChangedListener;
 import org.libreplan.web.resourceload.ResourceLoadController;
+import org.libreplan.web.security.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
@@ -66,10 +70,13 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.Composer;
+import org.zkoss.zul.Button;
 
 /**
  * Creates and handles several tabs
+ *
  * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 @Component
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -365,6 +372,19 @@ public class MultipleTabsPlannerController implements Composer,
             planningTab.toggleToFeedback();
         }
         handler.registerBookmarkListener(this, comp.getPage());
+
+        if (SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_ORDER)) {
+        org.zkoss.zk.ui.Component createOrderButton = comp.getPage().getFellow(
+                "createOrderButton");
+        createOrderButton.addEventListener(Events.ON_CLICK,
+                new EventListener() {
+                    @Override
+                    public void onEvent(Event event) throws Exception {
+                        goToCreateForm();
+                    }
+                });
+
+        }
     }
 
     private TabsRegistry getTabsRegistry() {
@@ -432,12 +452,6 @@ public class MultipleTabsPlannerController implements Composer,
         getTabsRegistry().show(advancedAllocationTab, changeModeTo(order));
     }
 
-    @Override
-    public void goToCreateotherOrderFromTemplate(OrderTemplate template) {
-        getTabsRegistry().show(ordersTab);
-        orderCRUDController.showCreateFormFromTemplate(template);
-    }
-
     private IBeforeShowAction changeModeTo(final Order order) {
         return new IBeforeShowAction() {
             @Override
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java
index fdc605d40..65787f719 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java
@@ -156,6 +156,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
 
     private void loadAllOrders() {
         this.allOrders = orderDAO.getOrders();
+        Collections.sort(this.allOrders);
     }
 
     @Override
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialModel.java
index 1fccfe673..f3fa22552 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialModel.java
@@ -23,6 +23,7 @@ package org.libreplan.web.reports;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -106,6 +107,7 @@ public class TimeLineRequiredMaterialModel implements
 
     private void loadAllOrders() {
         allOrders = orderDAO.getOrdersByScenario(scenarioManager.getCurrent());
+        Collections.sort(allOrders);
     }
 
     @Override
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskModel.java
index e5be5d995..0f724c66a 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskModel.java
@@ -22,6 +22,7 @@
 package org.libreplan.web.reports;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -105,6 +106,7 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
     public List<Order> getOrders() {
         List<Order> result = orderDAO.getOrdersByScenario(scenarioManager
                 .getCurrent());
+        Collections.sort(result);
         return result;
     }
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java
index 4e0a40564..5b6334a75 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java
@@ -211,9 +211,7 @@ public class CriterionAdminController extends BaseCRUDController<CriterionType>
         try {
             setupCriterionTreeController(editWindow);
         } catch (Exception e) {
-            LOG.error(
-                    _("Error setting up creationg form for Criterion Type with id}"),
-                    e);
+            LOG.error("Error setting up creationg form for Criterion Type", e);
         }
         setResourceComboboxValue((Combobox) editWindow
                 .getFellowIfAny("resourceCombobox"));
@@ -226,8 +224,8 @@ public class CriterionAdminController extends BaseCRUDController<CriterionType>
             setupCriterionTreeController(editWindow);
         } catch (Exception e) {
             LOG.error(
-                    _("Error setting up edition form for Criterion Type with id: {0}",
-                            criterionType.getId()), e);
+                    "Error setting up edition form for Criterion Type with id: "
+                            + criterionType.getId(), e);
         }
         setResourceComboboxValue((Combobox) editWindow
                 .getFellowIfAny("resourceCombobox"));
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java
index ae594e4f8..2f5cbaba0 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java
@@ -92,8 +92,8 @@ public class WorkerModel extends IntegrationEntityModel implements IWorkerModel
     private IBaseCalendarDAO baseCalendarDAO;
 
     private final ICriterionType<?>[] laboralRelatedTypes = {
-            PredefinedCriterionTypes.LEAVE,
-            PredefinedCriterionTypes.WORK_RELATIONSHIP };
+            PredefinedCriterionTypes.LOCATION,
+            PredefinedCriterionTypes.CATEGORY, PredefinedCriterionTypes.SKILL };
 
     private Worker worker;
 
@@ -214,8 +214,7 @@ public class WorkerModel extends IntegrationEntityModel implements IWorkerModel
             setDefaultCode();
         }
         localizationsAssigner = new MultipleCriterionActiveAssigner(
-                criterionDAO, worker,
-                PredefinedCriterionTypes.LOCATION_GROUP);
+                criterionDAO, worker, PredefinedCriterionTypes.LOCATION);
     }
 
     @Override
@@ -228,7 +227,7 @@ public class WorkerModel extends IntegrationEntityModel implements IWorkerModel
             forceLoadCalendar(this.worker);
             localizationsAssigner = new MultipleCriterionActiveAssigner(
                     criterionDAO, this.worker,
-                    PredefinedCriterionTypes.LOCATION_GROUP);
+                    PredefinedCriterionTypes.LOCATION);
             initOldCodes();
         } catch (InstanceNotFoundException e) {
             throw new RuntimeException(e);
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/EntitiesTree.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/EntitiesTree.java
index a18fe8de7..35ad4fcd1 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/EntitiesTree.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/EntitiesTree.java
@@ -290,7 +290,9 @@ public abstract class EntitiesTree<T extends ITreeNode<T>> {
             return true;
         }
         for (T each : children) {
-            return find(child, getChildren(each));
+            if (find(child, getChildren(each))) {
+                return true;
+            }
         }
         return false;
     }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java
index af0b8ed4b..ddde898dd 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java
@@ -33,7 +33,9 @@ import org.zkoss.zul.Treeitem;
 
 /**
  * macro component for order elements tree and similar pages<br />
+ *
  * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
 public abstract class TreeComponent extends HtmlMacroComponent {
 
@@ -71,6 +73,10 @@ public abstract class TreeComponent extends HtmlMacroComponent {
             return tooltip;
         }
 
+        public String getHflex() {
+            return cssClass.equals("name") ? "1" : "min";
+        }
+
         public abstract <T extends ITreeNode<T>> void doCell(
                 TreeController<T>.Renderer renderer,
                 Treeitem item, T currentElement);
@@ -95,8 +101,8 @@ public abstract class TreeComponent extends HtmlMacroComponent {
             renderer.addDescriptionCell(currentElement);
         }
     };
-    protected final Column operationsColumn = new Column(_("Operations"),
-            "operations") {
+    protected final Column operationsColumn = new Column(_("Op."),
+            "operations", _("Operations")) {
 
         @Override
         public <T extends ITreeNode<T>> void doCell(
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
index 3023f5ba6..7f07c437c 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
@@ -72,6 +72,14 @@ import org.zkoss.zul.TreeitemRenderer;
 import org.zkoss.zul.Treerow;
 import org.zkoss.zul.impl.api.InputElement;
 
+/**
+ * Tree controller for project WBS structures
+ *
+ * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
+ * @author Manuel Rego Casasnovas <mrego@igalia.com>
+ * @author Diego Pino García <dpino@igalia.com>
+ */
 public abstract class TreeController<T extends ITreeNode<T>> extends
         GenericForwardComposer {
 
@@ -647,7 +655,6 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
         private Treerow getTreeRowWithoutChildrenFor(final Treeitem item) {
             Treerow result = createOrRetrieveFor(item);
             // Attach treecells to treerow
-            result.setDraggable("true");
             result.setDroppable("true");
             result.getChildren().clear();
             return result;
@@ -680,7 +687,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
                 public void onEvent(org.zkoss.zk.ui.event.Event event) {
                     DropEvent dropEvent = (DropEvent) event;
                     move((Component) dropEvent.getTarget(),
-                            (Component) dropEvent.getDragged());
+                            (Component) dropEvent.getDragged().getParent());
                 }
             });
         }
@@ -719,6 +726,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
                         }
                     });
             schedulingStateToggler.afterCompose();
+            cell.setDraggable("true");
         }
 
         protected abstract SchedulingState getSchedulingStateFrom(
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
index 9e4756940..9d4616cc6 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
@@ -27,6 +27,7 @@ import java.util.ConcurrentModificationException;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.validator.InvalidValue;
@@ -45,6 +46,7 @@ import org.libreplan.business.workreports.entities.WorkReportLine;
 import org.libreplan.business.workreports.entities.WorkReportType;
 import org.libreplan.business.workreports.valueobjects.DescriptionField;
 import org.libreplan.business.workreports.valueobjects.DescriptionValue;
+import org.libreplan.web.common.ConstraintChecker;
 import org.libreplan.web.common.IMessagesForUser;
 import org.libreplan.web.common.Level;
 import org.libreplan.web.common.MessagesForUser;
@@ -248,6 +250,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
     }
 
     public boolean save() {
+        ConstraintChecker.isValid(createWindow);
         workReportModel.generateWorkReportLinesIfIsNecessary();
         try {
             workReportModel.confirmSave();
@@ -1102,6 +1105,17 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
     private void appendEffortDuration(Row row) {
         WorkReportLine workReportLine = (WorkReportLine) row.getValue();
         Textbox effort = new Textbox();
+        effort.setConstraint(new Constraint() {
+
+            @Override
+            public void validate(Component comp, Object value)
+                    throws WrongValueException {
+                if (!Pattern.matches("(\\d+)(\\s*:\\s*\\d+\\s*)*",
+                        (String) value))
+                    throw new WrongValueException(comp,
+                            _("Please, enter a valid effort"));
+            }
+        });
         bindEffort(effort, workReportLine);
 
         if (getWorkReportType().getHoursManagement().equals(
diff --git a/libreplan-webapp/src/main/resources/i18n/es.po b/libreplan-webapp/src/main/resources/i18n/es.po
index c6588000a..58f5cf83e 100644
--- a/libreplan-webapp/src/main/resources/i18n/es.po
+++ b/libreplan-webapp/src/main/resources/i18n/es.po
@@ -1,20 +1,20 @@
-# Spanish translations for LibrePlan package
-# Traducciones al español para el paquete LibrePlan.
+# Spanish translations for LibrePlan - Webapp module
+# Traducciones al español para LibrePlan - módulo Webapp
 # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
 #                         Desenvolvemento Tecnolóxico de Galicia
 # Copyright (C) 2010-2011 Igalia, S.L.
 # This file is distributed under the same license as the LibrePlan package.
 # Diego Pino García <dpino@igalia.com>, 2009.
 # Jacobo Aragunde Pérez <jaragunde@igalia.com>, 2009, 2010.
-# Manuel Rego Casasnovas <mrego@igalia.com>, 2010, 2011.
+# Manuel Rego Casasnovas <rego@igalia.com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1.0\n"
+"Project-Id-Version: 1.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-09 16:17+0200\n"
-"PO-Revision-Date: 2011-08-09 16:36+0200\n"
-"Last-Translator: Manuel Rego Casasnovas <mrego@igalia.com>\n"
+"POT-Creation-Date: 2011-11-11 09:11+0100\n"
+"PO-Revision-Date: 2011-11-11 09:25+0100\n"
+"Last-Translator: Manuel Rego Casasnovas <rego@igalia.com>\n"
 "Language-Team: Spanish <>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +22,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:368
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:373
 msgid "The resource cannot be null"
 msgstr "El recurso no puede ser nulo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:419
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:336
+msgid "Group path"
+msgstr "Path del grupo"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420
 msgid "criterion codes must be unique inside a criterion type"
 msgstr "el código del criterio debe ser único dentro de un tipo de criterio"
 
@@ -35,29 +39,23 @@ msgid "No authorizations were added because you did not select any."
 msgstr "No se pueden añadir autorizaciones porque no se seleccionó ninguna."
 
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:59
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:45
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:54
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58
 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71
 msgid "en"
 msgstr "es"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:192
 msgid "Origin"
 msgstr "Origen"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:165
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168
 msgid "Create exception"
 msgstr "Crear excepción"
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41
 msgid "Select report data"
 msgstr "Seleccione fecha del informe"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:399
-msgid "Up to company view"
-msgstr "Arriba a la vista de la compañía"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:207
 msgid "there exist multiple resource calendars with name {0}"
 msgstr "existen múltiples calendarios de recursos con el nombre {0}"
@@ -66,40 +64,40 @@ msgstr "existen múltiples calendarios de recursos con el nombre {0}"
 msgid "Create Virtual Worker"
 msgstr "Crear trabajador virtual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:98
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:830
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:87
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:86
 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:69
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
@@ -111,45 +109,49 @@ msgstr "Crear trabajador virtual"
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:34
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:231
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:229
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54
 msgid "Operations"
 msgstr "Operaciones"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:150
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:536
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:151
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:523
 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:135
 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:195
 msgid "There is no type of work hours with this code"
 msgstr "No hay un tipo de horas de trabajo con este código"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:112
 msgid "Select"
 msgstr "Seleccionar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1355
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:215
+msgid "Work report removed successfully"
+msgstr "Parte de trabajo borrado con éxito"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1514
 msgid "It can not be empty"
 msgstr "No puede estar vacío"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:145
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55
@@ -163,57 +165,57 @@ msgstr "Materiales"
 msgid "Reassign"
 msgstr "Reasignar"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64
 msgid "Description cannot be null or empty"
 msgstr "La descripción no puede ser nula o vacía"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:79
-msgid "login name not specified"
-msgstr "nombre de usuario no especificado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:79
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:362
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:72
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:269
 msgid "MonteCarlo Method"
 msgstr "Método de Montecarlo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:292
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:229
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:247
 msgid "Project Scheduling"
 msgstr "Planificación de proyectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
 msgid "February"
 msgstr "Febrero"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:29
 msgid "Managing fields and labels"
 msgstr "Administrar campos y etiquetas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:356
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:269
 msgid "Please, select a calendar"
 msgstr "Por favor, seleccione un calendario"
 
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170
 msgid "Predefined"
 msgstr "Predefinido"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:267
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
 msgid "Summary"
 msgstr "Resumen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53
 msgid "Quality Forms"
 msgstr "Formularios de calidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331
 msgid "Reports"
 msgstr "Informes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:337
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22
+msgid "LibrePlan: Advanced allocation"
+msgstr "LibrePlan: Asignación avanzada"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340
 msgid ""
 "The original workable days value {0}, is prevented because consolidated "
 "values cannot be modified"
@@ -221,26 +223,26 @@ msgstr ""
 "El valor original de días laborables {0}, se evita porque los valores "
 "consolidados non pueden ser modificados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172
 msgid "The {0} sequence prefixes can not be repeated"
 msgstr "Los prefijos de secuencia de {0} no pueden repetirse"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:82
 msgid "Criterion requirements"
 msgstr "Criterios requeridos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:285
 msgid "Stretch date must not be less than task start date: "
 msgstr ""
 "La fecha de un tramo debe ser mayor o igual que la fecha de inicio de la "
 "tarea: "
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:66
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:68
 msgid "Dedication chart"
 msgstr "Gráfico de dedicación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:701
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:728
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729
 msgid "Progress that are reported by quality forms can not be modified"
 msgstr ""
 "El progreso notificado por formularios de calidad no pueden ser modificado"
@@ -249,33 +251,34 @@ msgstr ""
 msgid "Not the same hours group, impossible to update"
 msgstr "No es el mismo grupo de horas, imposible actualizar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:520
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
+msgid "Own exception"
+msgstr "Excepción propia"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:522
 msgid "Cannot delete that material because it is assigned to a project."
 msgstr "No se puede borrar ese material porque está asignado a un projecto."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:475
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479
 msgid "Remove limiting resource element"
 msgstr "Borrar elemento de recurso limitante"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:275
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:141
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:155
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150
 msgid "Resource Usage"
 msgstr "Uso de recursos"
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40
 msgid "Active period from"
 msgstr "Período activo desde"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:52
-msgid "hours type :"
-msgstr "tipo de horas :"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:481
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:485
 msgid "Unassign"
 msgstr "Desasignar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:295
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296
 msgid "Companies"
 msgstr "Empresas"
 
@@ -283,7 +286,7 @@ msgstr "Empresas"
 msgid "Manual assignment"
 msgstr "Asignación manual"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75
 msgid "Quality form items list"
 msgstr "Lista de elementos del formulario de calidad"
 
@@ -295,16 +298,22 @@ msgstr ""
 "La fecha de fin no es válida, la nueva fecha de fin debe ser posterior a la "
 "actual"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:903
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128
+msgid "Create {0}: {1}"
+msgstr "Crear {0}: {1}"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51
 msgid "generic workers allocation"
 msgstr "asignación genérica de trabajadores"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:914
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:516
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308
 msgid "The project has no scheduled elements"
 msgstr "El proyecto no tiene elementos planificados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:796
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806
 msgid "Hour start"
 msgstr "Hora de inicio"
 
@@ -326,11 +335,11 @@ msgstr "categoría de la asignación de coste no especificada"
 msgid "Delete Template element"
 msgstr "Borrar elemento de plantilla"
 
-#: libreplan-webapp/src/main/webapp/planner/order.zul:90
-#: libreplan-webapp/src/main/webapp/planner/order.zul:97
-msgid "Progress Consolidation"
-msgstr "Consolidación de progreso"
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22
+msgid "LibrePlan: Calendars"
+msgstr "LibrePlan: Calendarios"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java:65
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java:66
 msgid "User with login name '{0}': not found"
 msgstr "Usuario con login '{0}': no encontrado"
@@ -339,21 +348,12 @@ msgstr "Usuario con login '{0}': no encontrado"
 msgid "Resources capability"
 msgstr "Capacidad de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:204
-msgid "The first stretch must be after the first day for doing interpolation"
-msgstr ""
-"El primer tramo debe estar después del primer día para hacer interpolación"
-
-#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
-msgid "Filter quality forms by :"
-msgstr "Filtrar formularios de calidad por :"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108
 msgid "changing perspective"
 msgstr "cambio de perspectiva"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:32
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31
 msgid "Transfer Projects Between Scenarios"
 msgstr "Transferir proyectos entre escenarios"
 
@@ -365,28 +365,24 @@ msgstr ""
 "No se pudieron añadir esas autorizaciones al perfil {0} porque ya estaban "
 "presentes."
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:55
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:63
 msgid "Default calendar"
 msgstr "Calendario por defecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:296
-msgid "Cannot delete user: it does not exist anymore"
-msgstr "No se puede borrar el usuario: ya no existe"
-
-#: libreplan-webapp/src/main/webapp/users/profiles.zul:23
-msgid "LibrePlan: Profiles"
-msgstr "LibrePlan: Perfiles"
-
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36
 msgid "Project Name"
 msgstr "Nombre del proyecto"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:931
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938
 msgid "Indent"
 msgstr "Indentar"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:312
+msgid "Save passwords in database"
+msgstr "Guardar contraseñas en la base de datos"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:255
 msgid "Reassignation"
 msgstr "Reasignación"
@@ -399,40 +395,54 @@ msgstr "Plantilla nueva"
 msgid "Total estimated hours"
 msgstr "Horas estimadas totales"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:130
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:144
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:22
+#: libreplan-webapp/src/main/webapp/common/error.zul:21
+msgid "LibrePlan: Runtime Error"
+msgstr "LibrePlan: Error de ejecución"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:151
 msgid "Base calendar \"{0}\" saved"
 msgstr "Calendario base \"{0}\" guardado"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:174
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:177
 msgid "Exceptions list"
 msgstr "Lista de excepciones"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33
 msgid "Locations"
 msgstr "Ubicaciones"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78
 msgid "New quality form item"
 msgstr "Nuevo elemento del formulario de calidad"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:41
+#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21
+msgid "LibrePlan: Labels"
+msgstr "LibrePlan: Etiquetas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242
+msgid "LDAP connection was successful"
+msgstr "La conexión con el LDAP se ha realizado con éxito"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:43
 msgid "Login name"
 msgstr "Nombre de usuario"
 
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29
+msgid "LibrePlan user"
+msgstr "Usuario de LibrePlan"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84
+msgid "{0} List"
+msgstr "{0} Lista"
+
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43
 msgid "Current"
 msgstr "Actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:632
-msgid "Machine deleted"
-msgstr "Máquina borrada"
-
-#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22
-msgid "LibrePlan: Progress Report"
-msgstr "LibrePlan: Informe de progreso"
-
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:67
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:63
 msgid "Dependencies"
 msgstr "Dependencias"
 
@@ -444,7 +454,7 @@ msgstr "falta código en una excepción de calendario"
 msgid "Current selection"
 msgstr "Selección actual"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1134
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1130
 msgid ""
 "there exist criterion satisfactions referring to criterion types not "
 "applicable to this resource"
@@ -470,28 +480,32 @@ msgstr "Minutos"
 msgid "You can not remove a scenario with derived scenarios"
 msgstr "No se puede eliminar un escenario con escenarios derivados"
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23
-msgid "Create new version"
-msgstr "Crear versión nueva"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:948
+msgid "Work Report Types"
+msgstr "Tipos de partes de trabajo"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55
+msgid "Maximum/minimum of estimated hours"
+msgstr "Máximo/mínimo de horas estimadas"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22
+msgid "LibrePlan: Quality Forms"
+msgstr "LibrePlan: Formularios de calidad"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:63
 msgid "LIMITING"
 msgstr "LIMITANTE"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:324
-msgid "Derived"
-msgstr "Derivado"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:414
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:415
 msgid "a disabled resource has enabled subresources"
 msgstr "un recurso deshabilitado tiene subrecursos habilitados"
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53
 msgid "Client"
 msgstr "Cliente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153
 msgid ""
 "there are no resources for required criteria: {0}. So the generic allocation "
@@ -500,11 +514,11 @@ msgstr ""
 "no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede "
 "añadir la asignación genérica"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:446
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478
 msgid "Error on showing warning message removing calendar: "
 msgstr "Error al mostrar mensaje de advertencia borrando calendario: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:428
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:415
 msgid "work report has not any description value with this field name"
 msgstr ""
 "El parte de trabajo no tiene ningún valor de descripción con ese nombre de "
@@ -520,12 +534,12 @@ msgstr "el nombre de la categoría de materiales debe ser único. Ya está en us
 msgid "Imputed hours"
 msgstr "Horas imputadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37
 msgid "Project Costs Per Resource"
 msgstr "Costes de proyecto por recurso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143
 msgid "Confirm deleting this hour cost. Are you sure?"
 msgstr "Confirmar el borrado de este coste por hora. ¿Está seguro?"
@@ -534,15 +548,19 @@ msgstr "Confirmar el borrado de este coste por hora. ¿Está seguro?"
 msgid "Delete Milestone"
 msgstr "Borrar hito"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:152
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:155
 msgid "default password were not changed"
 msgstr "la contraseña por defecto no fue cambiada"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
+msgid "Type of hours"
+msgstr "Tipo de horas"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:48
 msgid "Non-assigned locations"
 msgstr "Ubicaciones no asignadas"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:77
 msgid "Application URI"
 msgstr "URI de la aplicación"
 
@@ -554,21 +572,22 @@ msgstr ""
 "{0} no es válido, criterionType se solapa con otro criterionSatisfaction del "
 "mismo criterionType"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332
 msgid "Work Report Lines"
 msgstr "Líneas de parte de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1514
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546
 msgid "Configure"
 msgstr "Configurar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "October"
 msgstr "Octubre"
 
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:58
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:57
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50
 msgid "First name"
 msgstr "Nombre"
 
@@ -576,20 +595,16 @@ msgstr "Nombre"
 msgid "Could not execute print command"
 msgstr "No se pudo ejecutar el comando de impresión"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
 msgid "Complementary text fields"
 msgstr "Campos de texto complementario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:208
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:418
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:137
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:141
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:181
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200
 msgid "Confirm deleting {0}. Are you sure?"
 msgstr "Confirmar el borrado de {0}. ¿Está seguro?"
 
@@ -597,7 +612,7 @@ msgstr "Confirmar el borrado de {0}. ¿Está seguro?"
 msgid "Work Reports List"
 msgstr "Lista de partes de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -605,7 +620,7 @@ msgstr "Cuentas"
 msgid "External code"
 msgstr "Código externo"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50
 msgid "Edit selected task"
 msgstr "Editar tarea seleccionada"
 
@@ -615,33 +630,33 @@ msgstr "Ver"
 
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:84
 msgid "Limiting"
 msgstr "Limitante"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:60
 msgid "Required materials"
 msgstr "Materiales requeridos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:666
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677
 msgid "resources per day must be not empty and bigger than zero"
 msgstr "los recursos por día deben ser no vacíos y mayores que cero"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341
 msgid "Backwards"
 msgstr "Atrás"
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:78
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77
 msgid "Version"
 msgstr "Versión"
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52
 msgid "Apply filtering to resources satisfying required criteria"
 msgstr ""
 "Aplicar filtrado a los recursos que satisfacen los criterios requeridos"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106
 msgid "Up"
 msgstr "Arriba"
 
@@ -653,7 +668,7 @@ msgstr ""
 "El tipo de criterio no es válido, otro criterio satisfecho se solapa con el "
 "mismo tipo de criterio"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:105
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:125
 msgid "Types of work hours"
 msgstr "Tipos de horas de trabajo"
 
@@ -661,12 +676,7 @@ msgstr "Tipos de horas de trabajo"
 msgid "EAC"
 msgstr "EAC"
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:43
-#: libreplan-webapp/src/main/webapp/common/error.zul:48
-msgid "Stacktrace:"
-msgstr "Stacktrace:"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:144
 msgid ""
 "Its planning is not in the current scene.\n"
 "Should change to any of the following scenarios:\n"
@@ -674,11 +684,11 @@ msgstr ""
 "Su planificación no está en el escenario actual.\n"
 "Debe cambiar a uno de los siguientes:\n"
 
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:37
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39
 msgid "Predecessor"
 msgstr "Predecesor"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:189
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:172
 msgid "Some stretch has higher or equal values than the previous stretch"
 msgstr "Algún tramo tiene valores mayores o iguales que el tramo anterior"
 
@@ -686,25 +696,7 @@ msgstr "Algún tramo tiene valores mayores o iguales que el tramo anterior"
 msgid "Please select a task"
 msgstr "Por favor, seleccione una tarea"
 
-#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23
-msgid "LibrePlan: Cost Categories"
-msgstr "LibrePlan: Categorías de coste"
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:58
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:75
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62
-msgid "End date"
-msgstr "Fecha de fin"
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:255
-msgid "missing worker code in the work report"
-msgstr "falta código de trabajador en un parte de trabajo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:142
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101
 msgid ""
 "Value is not valid, the default max value must be greater than the precision "
 "value "
@@ -712,56 +704,56 @@ msgstr ""
 "El valor no es válido, el valor máximo por defecto debe ser mayor que el "
 "valor de precisión"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146
-msgid ""
-"You can not remove the company \"{0}\" because is already in use in some "
-"project or in some subcontrated task."
-msgstr ""
-"No puede borrar la empresa \"{0}\" porque está siendo utilizada en ulgún "
-"proyecto o en alguna tarea subcontrada."
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:58
+msgid "End date"
+msgstr "Fecha de fin"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:88
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245
+msgid "missing worker code in the work report"
+msgstr "falta código de trabajador en un parte de trabajo"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89
 msgid "profile name is already being used by another profile"
 msgstr "el nombre del perfil ya está siendo usado por otro perfil"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:63
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:68
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:209
-msgid "Prefix:"
-msgstr "Prefijo:"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:107
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:112
 msgid "This project has already been added."
 msgstr "Este proyecto ya ha sido añadido."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:381
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:386
 msgid "The task code cannot be null"
 msgstr "El código de la tarea no puede ser nulo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32
 msgid "Criteria"
 msgstr "Criterios"
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134
 msgid "Resource / Criteria"
 msgstr "Recursos / Criterios"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:26
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:27
 msgid "User data"
 msgstr "Datos del usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97
-msgid "Error setting up creation form."
-msgstr "Error preparando el formulario de creación."
-
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44
 msgid "Lines"
 msgstr "Líneas"
@@ -770,12 +762,16 @@ msgstr "Líneas"
 msgid "Add new progress assignment"
 msgstr "Añadir nueva asignación de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:193
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32
+msgid "Set Filter Options"
+msgstr "Establecer las opciones de filtrado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:977
 msgid "Error on showing warning message removing workReportType: "
 msgstr ""
 "Error al mostrar mensaje de advertencia borrando tipo de parte de trabajo: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:624
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:633
 msgid "Edit Work Report"
 msgstr "Editar parte de trabajo"
 
@@ -788,36 +784,35 @@ msgid "Project version is the same in source and destination scenarios"
 msgstr ""
 "La versión del proyecto es la misma en los escenarios de origen y destino"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:30
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
 msgid "Personal data"
 msgstr "Datos personales"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:732
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733
 msgid "Calculated progress can not be removed"
 msgstr "El progreso calculado no se puede borrar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:299
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:162
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:158
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:202
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202
 msgid "please, select a Criterion"
 msgstr "por favor, seleccione un criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationModel.java:127
-msgid "Project does not exist"
-msgstr "El proyecto no existe"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:112
+msgid "Work reports"
+msgstr "Partes de trabajo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143
 msgid "{0} annotation required on {1}"
 msgstr "{0} anotación obligatoria en {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "June"
 msgstr "Junio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1031
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038
 msgid "Modified"
 msgstr "Modificado"
 
@@ -829,14 +824,14 @@ msgstr "Añadir criterio"
 msgid "You can not remove the current scenario"
 msgstr "No se puede borrar el escenario actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:648
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653
 msgid "format prefix invalid. It cannot be empty or contain whitespaces."
 msgstr ""
 "formato de prefijo inválido. No puede estar vacío o contener espacios en "
 "blanco."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:89
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:334
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:338
 msgid "MessagesContainer is needed"
 msgstr "Es necesario un MessagesContainer"
 
@@ -848,10 +843,14 @@ msgstr "Código de la tarea"
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56
 msgid "Ending date"
 msgstr "Fecha de fin"
 
+#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21
+msgid "LibrePlan: Page not found"
+msgstr "LibrePlan: Página no encontrada"
+
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:21
 msgid "Templates List"
 msgstr "Lista de plantillas"
@@ -860,7 +859,7 @@ msgstr "Lista de plantillas"
 msgid "Export options"
 msgstr "Opciones de exportación"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:229
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:227
 msgid "Last value"
 msgstr "Último valor"
 
@@ -868,7 +867,11 @@ msgstr "Último valor"
 msgid "Subcontracted Tasks List"
 msgstr "Lista de tareas subcontratadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:705
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51
+msgid "Average of worked hours in finished applications"
+msgstr "Media de horas trabajadas en las aplicaciones finalizadas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706
 msgid "Calculated progress can not be modified"
 msgstr "El progreso calculado no se puede modificar"
 
@@ -876,40 +879,51 @@ msgstr "El progreso calculado no se puede modificar"
 msgid "Statistics log"
 msgstr "Histórico de estadísticas"
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:51
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:58
+msgid "Work done from starting date"
+msgstr "Trabajo realizado desde la fecha de inicio"
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40
 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
 msgid "Edit Calendar"
 msgstr "Editar calendario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:112
+msgid "Profile"
+msgstr "Perfil"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37
 msgid "Materials Needs At Date"
 msgstr "Necesidades de materiales en fecha"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:277
+msgid "UserDn"
+msgstr "UserDn"
+
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:52
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:59
 msgid "Cannot be empty or null"
 msgstr "No puede ser vacío o nulo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:275
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300
 msgid "filtering"
 msgstr "filtrado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233
+msgid "{0} \"{1}\" saved"
+msgstr "{0} \"{1}\" guardado"
+
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:33
 msgid "Total Budget"
 msgstr "Presupuesto total"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:53
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:55
 msgid "Hierarchy"
 msgstr "Jerarquía"
 
-#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23
-msgid "LibrePlan: Work Hours"
-msgstr "LibrePlan: Horas de trabajo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:830
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:833
 msgid ""
 "This worker cannot be deleted because it has assignments to projects or "
 "imputed hours"
@@ -917,6 +931,10 @@ msgstr ""
 "Este trabajador no se puede borrar porque tiene asignaciones a proyectos u "
 "horas imputadas"
 
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62
+msgid "Work done until ending date"
+msgstr "Trabajo realizado hasta la fecha de fin"
+
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:22
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:26
 msgid "Print configuration"
@@ -926,19 +944,23 @@ msgstr "Imprimir configuración"
 msgid "Overload due to other assignments"
 msgstr "Sobrecarga debido a otras asignaciones"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117
+msgid "Types of hours"
+msgstr "Tipos de horas"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:149
 msgid "Time period saved"
 msgstr "Período de tiempo guardado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:305
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:168
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:206
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:164
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:205
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208
 msgid "This Criterion has already been added."
 msgstr "Este criterio ya ha sido añadido."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252
 msgid ""
 "Are you sure of changing the resource type? You will lose the criteria with "
 "different resource type."
@@ -946,7 +968,7 @@ msgstr ""
 "¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo "
 "de recurso se perderán."
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:215
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:209
 msgid "add"
 msgstr "añadir"
 
@@ -954,16 +976,11 @@ msgstr "añadir"
 msgid "Unsaved changes will be lost. Would you like to continue?"
 msgstr "Se perderán los cambios sin guardar. ¿Le gustaría continuar?"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:35
-msgid "Filter work report by :"
-msgstr "Filtrar parte de trabajo por :"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:38
 msgid "NON_LIMITING"
 msgstr "NO_LIMITANTE"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:290
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291
 msgid "Workers"
 msgstr "Trabajadores"
 
@@ -971,8 +988,7 @@ msgstr "Trabajadores"
 msgid "Cannot remove {0}, since it is being used by some Exception Day"
 msgstr "No se puede borrar {0} porque se está usando en algún día de excepción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "August"
 msgstr "Agosto"
 
@@ -980,11 +996,23 @@ msgstr "Agosto"
 msgid "Resources matching selected criteria"
 msgstr "Recursos que cumplen los criterios seleccionados"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27
+msgid "with"
+msgstr "con"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:297
+msgid "Label Type"
+msgstr "Tipo de etiqueta"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:48
 msgid "Year"
 msgstr "Año"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:67
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:327
+msgid "{0} \"{1}\" could not be deleted, it was already removed"
+msgstr "{0} \"{1}\" no se ha podido borrar, ya había sido eliminado"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68
 msgid "profile name not specified"
 msgstr "nombre del perfil no especificado"
 
@@ -992,52 +1020,44 @@ msgstr "nombre del perfil no especificado"
 msgid "Date Start"
 msgstr "Fecha de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1281
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275
 msgid "Value is not valid, the current value must be less than max value"
 msgstr ""
 "El valor no es válido, el valor actual debe ser menor que el valor máximo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
-msgid "From Chosen"
-msgstr "A partir de elegidos"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
-#: libreplan-webapp/src/main/webapp/planner/order.zul:109
+#: libreplan-webapp/src/main/webapp/planner/order.zul:108
 msgid "Value"
 msgstr "Valor"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66
 msgid "Hour costs"
 msgstr "Costes por hora"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:718
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:773
 msgid "there are no valid periods for this calendar"
 msgstr "no hay períodos válidos para este calendario"
 
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:52
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93
 msgid "Add role"
 msgstr "Añadir rol"
 
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:41
-msgid "Edit Scenario"
-msgstr "Editar escenario"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1112
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:634
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271
 msgid "Exception end date should be greater or equals than start date"
 msgstr ""
 "La fecha de fin de una excepción debe ser mayor o igual que la fecha de "
 "inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:601
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:611
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453
 msgid "Repeated Project code {0} in Project {1}"
 msgstr "Código {0} de proyecto repetdio en proyecto {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:277
 msgid "Project from client"
 msgstr "Proyecto del cliente"
 
@@ -1053,39 +1073,36 @@ msgstr ""
 "El {0} no se puede asignar a este recurso. Su intervalo se solapa con otro "
 "criterio"
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66
-msgid "Work done until ending date:"
-msgstr "Trabajo realizado hasta la fecha de fin:"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:132
 msgid "Schedule Performance Index"
 msgstr "Índice de rendimiento de la planificación"
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135
 msgid "Earlier starting date"
 msgstr "Fecha de inicio más temprana"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:27
 msgid "Type data"
 msgstr "Datos del tipo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:800
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:256
+msgid "Host"
+msgstr "Host"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810
 msgid "Hour finish"
 msgstr "Hora de fin"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:173
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:165
 msgid "Perspectives"
 msgstr "Perspectivas"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:40
-msgid "Edit Work Report Type"
-msgstr "Editar tipo de parte de trabajo"
-
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:104
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:107
 msgid "Workable time"
 msgstr "Tiempo trabajable"
 
@@ -1093,20 +1110,11 @@ msgstr "Tiempo trabajable"
 msgid "missing code in a subcategory"
 msgstr "falta código en una subcategoría"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544
-msgid "Confirm deleting this cost category. Are you sure?"
-msgstr "Confirmar el borrado de esta categoría de coste. ¿Está seguro?"
-
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:66
 msgid "Non limiting resource allocation"
 msgstr "Asignación de recursos no limitantes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:191
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:297
-msgid "Error removing element: "
-msgstr "Error al borrar elemento: "
-
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:40
 msgid "Company name"
 msgstr "Nombre de la empresa"
 
@@ -1119,16 +1127,15 @@ msgid "Split new assignment"
 msgstr "Dividir nueva asignación"
 
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:53
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57
 msgid "Pagination"
 msgstr "Paginación"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:265
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:286
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263
 msgid "Expiry date"
 msgstr "Fecha de vencimiento"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342
 msgid ""
 "The operation does not perform because the task has progress reports that is "
 "spread associated with this quality form"
@@ -1145,41 +1152,32 @@ msgstr "Cambiar escenario"
 msgid "Critical path"
 msgstr "Camino crítico"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260
 msgid ""
 "Deleting this item, it will disable the report progress option. Are you sure?"
 msgstr ""
 "Borrando este elemento, esto deshabilitará la opción de notificar progreso. "
 "¿Está seguro?"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:38
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:41
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:80
 msgid "Categories"
 msgstr "Categorías"
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:39
-#: libreplan-webapp/src/main/webapp/common/error.zul:44
-msgid "Status code:"
-msgstr "Código de estado:"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:46
 msgid "Project Details"
 msgstr "Detalles de proyecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:94
-msgid "Create Criterion Type"
-msgstr "Crear tipo de criterio"
-
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162
 msgid " to go to output directly"
 msgstr " ir a la salida directamente"
 
@@ -1187,16 +1185,20 @@ msgstr " ir a la salida directamente"
 msgid "Add new hours group"
 msgstr "Añadir nuevo grupo de horas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:219
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221
 msgid "Criteria: {0} "
 msgstr "Criterios: {0} "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:44
+msgid "Cancel changes and back to scheduling"
+msgstr "Cancelar cambios y volver a la planificación"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
-#: libreplan-webapp/src/main/webapp/planner/order.zul:110
+#: libreplan-webapp/src/main/webapp/planner/order.zul:109
 msgid "Percentage"
 msgstr "Porcentaje"
 
@@ -1204,7 +1206,7 @@ msgstr "Porcentaje"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:71
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:81
 msgid "Company logo URL"
 msgstr "URL del logo de la empresa"
 
@@ -1212,11 +1214,12 @@ msgstr "URL del logo de la empresa"
 msgid "No worker selected"
 msgstr "Ningún trabajador seleccionado"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:227
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:207
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:225
 msgid "Number of digits"
 msgstr "Número de dígitos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1651
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1639
 msgid "Task not found"
 msgstr "Tarea no encontrada"
 
@@ -1225,24 +1228,12 @@ msgstr "Tarea no encontrada"
 msgid "Total capability"
 msgstr "Capacidad total"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:732
-msgid "It not could remove the task "
-msgstr "No se pudo borrar la tarea"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:217
 msgid "Problems connecting with client web service"
 msgstr "Problemas al conectar con el servicio web cliente"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21
-msgid "LibrePlan: User access"
-msgstr "LibrePlan: Acceso de usuarios"
-
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:21
-msgid "LibrePlan: Materials"
-msgstr "LibrePlan: Materiales"
-
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:154
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:183
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186
 msgid "Exception Type"
 msgstr "Tipo de excepción"
 
@@ -1250,11 +1241,11 @@ msgstr "Tipo de excepción"
 msgid "Profiles List"
 msgstr "Lista de Perfiles"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:567
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:944
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:869
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
@@ -1267,7 +1258,7 @@ msgid "both {0} of category {1} and {2} of category {3} have the same code"
 msgstr ""
 "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319
 msgid "Data Types"
 msgstr "Tipos de datos"
 
@@ -1276,25 +1267,25 @@ msgstr "Tipos de datos"
 msgid "Total hours"
 msgstr "Total de horas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:342
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:38
+msgid "Data"
+msgstr "Datos"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:343
 msgid "Reassigning {0} projects"
 msgstr "Reasignando {0} proyectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:84
-msgid "Create Work Hours Type"
-msgstr "Crear tipo de horas de trabajo"
-
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55
 msgid "Filter by task status"
 msgstr "Filtrar por estado de tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:528
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:430
-msgid "Select date:"
-msgstr "Seleccione fecha:"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:420
+msgid "Select date"
+msgstr "Seleccione fecha"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:635
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1105
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264
 msgid "You should select a end date for the exception"
 msgstr "Debe seleccionar una fecha de fin para la excepción"
 
@@ -1302,7 +1293,7 @@ msgstr "Debe seleccionar una fecha de fin para la excepción"
 msgid "Please try it again."
 msgstr "Por favor, inténtelo de nuevo."
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:49
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:56
 msgid "Company code"
 msgstr "Código de la empresa"
 
@@ -1310,57 +1301,54 @@ msgstr "Código de la empresa"
 msgid "Unknown attribute '{0}' in class {1}"
 msgstr "Atributo desconocido '{0}' en la clase {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:714
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:717
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33
 msgid "NON LIMITING RESOURCE"
 msgstr "RECURSO NO LIMITANTE"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22
-msgid "LibrePlan: Workers"
-msgstr "LibrePlan: Trabajadores"
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:90
+msgid "passwords can not be empty"
+msgstr "las conraseñas no pueden estar vacías"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:117
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:120
 msgid "Activation periods"
 msgstr "Períodos de activación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:390
 msgid "Passed"
 msgstr "Pasado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176
 msgid "already assigned"
 msgstr "ya asignado"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:68
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:509
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:131
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:119
-#: libreplan-webapp/src/main/webapp/planner/order.zul:155
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:139
+#: libreplan-webapp/src/main/webapp/planner/order.zul:154
 msgid "Calendar"
 msgstr "Calendario"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:119
+msgid "Resources"
+msgstr "Recursos"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56
 msgid "Read"
 msgstr "Leer"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:99
-msgid "Resources"
-msgstr "Recursos"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153
 msgid "Source and destination scenarios should be different"
 msgstr "Los escenarios de origen y destino deben ser diferentes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:230
-msgid "CriterionType and its criteria saved"
-msgstr "Tipo de criterio y sus criterios guardados"
-
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:137
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:141
 msgid "The browser you are using"
 msgstr "El navegador que está usando"
 
@@ -1369,33 +1357,24 @@ msgid "scenario"
 msgstr "escenario"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:51
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:248
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:42
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:29
 msgid "to"
 msgstr "a"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:197
-msgid "Error on removing typeOfWorkHours: "
-msgstr "Error al borrar tipo de horas de trabajo: "
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:112
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:115
 msgid "worker's first name not specified"
 msgstr "nombre del trabajador no especificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281
 msgid "date not specified"
 msgstr "fecha no especificada"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:95
-msgid "Select type :"
-msgstr "Seleccione tipo :"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:259
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:269
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206
 msgid "Projects Planning"
 msgstr "Planificación de proyectos"
 
@@ -1403,12 +1382,18 @@ msgstr "Planificación de proyectos"
 msgid "Shrink to fit page width"
 msgstr "Reducir para ajustar al ancho de página"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:67
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773
+msgid "The max value must be greater than 0"
+msgstr "El valor máximo debe ser mayor que 0"
+
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:63
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
 msgid "Last name"
 msgstr "Apellidos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:551
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:380
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556
 msgid "Remove"
 msgstr "Borrar"
 
@@ -1416,20 +1401,28 @@ msgstr "Borrar"
 msgid "cost category name not specified"
 msgstr "nombre de la categoría de coste no especificado"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22
-msgid "LibrePlan: Virtual Workers Groups"
-msgstr "LibrePlan: Grupos de trabajadores virtuales"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41
+msgid "Planned workable days"
+msgstr "Días laborables planificados"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:131
 msgid "SPI"
 msgstr "SPI"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1334
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:232
+msgid "Progress Type"
+msgstr "Tipo de progreso"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295
 msgid "Task contains consolidated progress. Cannot apply sigmoid function."
 msgstr ""
 "La tarea contiene progreso consolidado. No se puede aplicar la función "
 "sigmoide."
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:305
+msgid "UserId"
+msgstr "UserId"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:218
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:245
 msgid ""
@@ -1439,19 +1432,23 @@ msgstr ""
 "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior "
 "a la fecha de inicio actual"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:516
+msgid "This date can not include the whole previous work week"
+msgstr "Esta fecha no puede incluir a la semana de trabajo anterior completa"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390
 msgid "the code must be not null or not empty"
 msgstr "el código no puede ser nulo o vacío"
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:35
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:119
 msgid "Create New Project"
 msgstr "Crear proyecto nuevo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1420
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430
 msgid "Stretches list"
 msgstr "Lista de tramos"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:187
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:180
 msgid "Enable scenarios module"
 msgstr "Habilitar módulo de escenarios"
 
@@ -1459,52 +1456,50 @@ msgstr "Habilitar módulo de escenarios"
 msgid "Zoom"
 msgstr "Zoom"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:608
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:41
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:52
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:95
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:124
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:88
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45
 #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40
 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:106
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:117
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:115
 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:41
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:38
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:42
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:81
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:80
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:135
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:130
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:241
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:135
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:376
 msgid "Save"
 msgstr "Guardar"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:62
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
 msgid "Standard Effort"
 msgstr "Esfuerzo estándar"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:109
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
 msgid "Material categories"
 msgstr "Categorías de materiales"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:240
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:570
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:669
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674
 msgid "number of digits must be between {0} and {1}"
 msgstr "el número de dígitos debe estar entre {0} y {1}"
 
@@ -1516,10 +1511,6 @@ msgstr "Criterios requeridos"
 msgid "Pending update"
 msgstr "Actualización pendiente"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59
-msgid "End date:"
-msgstr "Fecha de fin:"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:160
 msgid "Criterion previously selected"
 msgstr "Criterio seleccionado previamente"
@@ -1532,23 +1523,43 @@ msgstr "Autorización de usuarios"
 msgid "Problems connecting with subcontractor web service"
 msgstr "Problemas conectando con el servicio web subcontratista"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:219
+msgid "Entity type"
+msgstr "Tipo de entidad"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263
+msgid "Unsaved changes will be lost. Are you sure?"
+msgstr "Se perderán los cambios sin guardar. ¿Está seguro?"
+
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:22
+#: libreplan-webapp/src/main/webapp/planner/order.zul:22
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22
+#: libreplan-webapp/src/main/webapp/planner/index.zul:22
+#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22
+#: libreplan-webapp/src/main/webapp/planner/main.zul:22
+#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22
+msgid "LibrePlan: Scheduling"
+msgstr "LibrePlan: Planificación"
+
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44
 msgid "Assigned load"
 msgstr "Carga asignada"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:142
 msgid "End Date"
 msgstr "Fecha de fin"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:64
 msgid "Filter by workers"
 msgstr "Filtrar por trabajadores"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:374
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
 msgid "Some allocations needed"
 msgstr "Se necesitan algunas asignaciones"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83
 msgid "Resources Per Day"
 msgstr "Recursos por día"
 
@@ -1564,7 +1575,7 @@ msgstr ""
 "Fecha de fin estimada para la tarea (presione enter en el cuadro de texto "
 "para abrir el calendario o escriba la fecha directamente)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:281
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:292
 msgid "Expand/Collapse all"
 msgstr "Expandir/Plegar todo"
 
@@ -1572,34 +1583,33 @@ msgstr "Expandir/Plegar todo"
 msgid "Overload due to current project"
 msgstr "Sobrecarga debido al proyecto actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:857
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907
 msgid "Name: {0}"
 msgstr "Nombre: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:867
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874
 msgid "Move down"
 msgstr "Mover abajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:116
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:112
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:137
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139
 msgid "Please, select a project"
 msgstr "Por favor, seleccione un proyecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:29
+msgid "Inherits from date"
+msgstr "Heredada de la fecha"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "September"
 msgstr "Septiembre"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28
 msgid "Report structure"
 msgstr "Estructura del parte"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:88
-msgid "password not specified"
-msgstr "contraseña no especificada"
-
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:119
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:42
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:59
 msgid "General data"
@@ -1609,11 +1619,12 @@ msgstr "Datos generales"
 msgid "BAC"
 msgstr "BAC"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:399
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379
 msgid "Calculate Number of Hours"
 msgstr "Calcular número de horas"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
 msgid "Assign"
@@ -1623,34 +1634,24 @@ msgstr "Asignar"
 msgid "missing code in a criterion"
 msgstr "falta código en un criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1296
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273
 msgid "Create Template"
 msgstr "Crear plantilla"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23
-msgid "LibrePlan: Work Reports"
-msgstr "LibrePlan: Partes de trabajo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:115
-msgid "Edit Company"
-msgstr "Editar empresa"
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68
 msgid "Advanced search"
 msgstr "Búsqueda avanzada"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:82
 msgid "Filter by labels"
 msgstr "Filtrar por etiquetas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:577
 msgid ""
 "IMPORTANT: Don't forget to communicate to subcontractor that his contract "
 "has been cancelled"
@@ -1658,30 +1659,37 @@ msgstr ""
 "IMPORTANTE: No olvidar comunicar al subcontratista que su contrato ha sido "
 "cancelado"
 
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:38
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36
 msgid "MonteCarlo chart"
 msgstr "Diagrama de Montecarlo"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
-msgid "LibrePlan: Hours Worked Per Resource"
-msgstr "LibrePlan: Horas Trabajadas Por Recurso"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126
 msgid "Schedule Variance"
 msgstr "Desviación en planificación"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:496
+msgid "Error on showing warning message removing qualityForm: "
+msgstr ""
+"Error al mostrar mensaje de advertencia borrando un formulario de calidad: "
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:410
 msgid "Service does not manage resource of type: {0}"
 msgstr "El servicio no gestiona recursos del tipo: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:191
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:185
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:210
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:506
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:544
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:575
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1365
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:39
+#: libreplan-webapp/src/main/webapp/common/error.zul:44
+msgid "Status code"
+msgstr "Código de estado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:974
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:474
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:492
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
 msgid "Warning"
 msgstr "Advertencia"
 
@@ -1690,15 +1698,13 @@ msgstr "Advertencia"
 msgid "Select parent calendar"
 msgstr "Seleccionar el calendario padre"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:96
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:168
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:463
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:526
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:513
 msgid "There is no task with this code"
 msgstr "No hay ninguna tarea con este código "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:433
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:214
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:146
 msgid "The type of hours cannot be null"
 msgstr "El tipo de horas no puede ser nulo"
 
@@ -1707,14 +1713,14 @@ msgid "criterion satisfaction with end date less than start date"
 msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
 msgid "Show"
 msgstr "Mostrar"
 
@@ -1726,18 +1732,6 @@ msgstr "Duración (días)"
 msgid "Assignment Type"
 msgstr "Tipo de asignación"
 
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:22
-#: libreplan-webapp/src/main/webapp/planner/order.zul:22
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22
-#: libreplan-webapp/src/main/webapp/planner/index.zul:22
-#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22
-#: libreplan-webapp/src/main/webapp/planner/main.zul:22
-#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22
-msgid "LibrePlan: Scheduling"
-msgstr "LibrePlan: Planificación"
-
 #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29
 msgid "Back to log in"
 msgstr "Volver a iniciar sesión"
@@ -1747,35 +1741,28 @@ msgstr "Volver a iniciar sesión"
 msgid "Error on splitting"
 msgstr "Error al dividir"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31
-msgid "Planned start :"
-msgstr "Inicio planificado :"
-
-#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
-msgid "Company"
-msgstr "Empresa"
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66
 msgid "Node without children"
 msgstr "Nodo sin hijos"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:152
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
+msgid "Company"
+msgstr "Empresa"
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118
 msgid "There is no label with this code "
 msgstr "No hay ninguna etiqueta con este código "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212
 msgid "Task: {0} "
 msgstr "Tarea: {0} "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:138
-msgid "Profile saved"
-msgstr "Perfil guardado"
-
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:65
 msgid "Task properties"
 msgstr "Propiedades de la tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:75
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:84
 msgid "There is no type of work report with this code"
 msgstr "No hay ningún parte de trabajo con este código"
 
@@ -1788,10 +1775,6 @@ msgstr "Suma de horas imputadas directamente"
 msgid "Surname"
 msgstr "Apellidos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1364
-msgid "You need to select some function to configure"
-msgstr "Necesita seleccionar alguna función para configurar"
-
 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22
 msgid "Exception Day Types List"
 msgstr "Lista de tipos de día de excepción"
@@ -1800,70 +1783,61 @@ msgstr "Lista de tipos de día de excepción"
 msgid "the name must be not null or not empty"
 msgstr "el nombre no puede ser nulo o vacío"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:741
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:157
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:750
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:394
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:68
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:131
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
-#: libreplan-webapp/src/main/webapp/planner/order.zul:111
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45
+#: libreplan-webapp/src/main/webapp/planner/order.zul:110
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41
 msgid "Date"
 msgstr "Fecha"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:363
-msgid "there must be {0} effort instead of {1}"
-msgstr "debe haber {0} esfuerzo en lugar de {1}"
-
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
 msgid "Add From Template"
 msgstr "Añadir a partir de plantilla"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:505
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:543
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:508
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:546
 msgid "Assigned resources for this task will be deleted. Are you sure?"
 msgstr "Los recursos asignados para esta tarea serán borrados. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22
-msgid "LibrePlan: Exception Days"
-msgstr "LibrePlan: Días de excepción"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:646
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651
 msgid ""
 "format prefix invalid. It cannot be empty or contain '_' or whitespaces."
 msgstr ""
 "formato de prefijo inválido. No puede estar vacío o contener '_' o espacios "
 "en blanco."
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41
 msgid "Filter by month"
 msgstr "Filtrar por mes"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322
 msgid "The criterion and its type cannot be null"
 msgstr "El criterio y su tipo no pueden ser nulos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:526
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421
 msgid "The quality form must have an item with 100% value to report progress"
 msgstr ""
 "El formulario de calidad debe tener un ítem con valor 100% para notificar "
 "progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "July"
 msgstr "Julio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:220
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156
 msgid "The code is not valid. There is another unit type with the same code"
 msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código"
 
@@ -1871,16 +1845,15 @@ msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código"
 msgid "( max: {0} )"
 msgstr "( máx: {0} )"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:218
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:222
 msgid "Error on removing element: "
 msgstr "Error al borrar elemento: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
 msgid "January"
 msgstr "Enero"
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:64
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60
 msgid "Cannot calculate charts for current data"
 msgstr "No se pueden calcular gráficos para los datos actuales"
 
@@ -1888,9 +1861,9 @@ msgstr "No se pueden calcular gráficos para los datos actuales"
 msgid "Select queue"
 msgstr "Seleccionar cola"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:582
-msgid "The cost category had already been removed."
-msgstr "La categoría de coste ya había sido borrada."
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173
+msgid "project name already being used"
+msgstr "el nombre de proyecto ya está siendo usado"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48
 msgid "Work description"
@@ -1909,44 +1882,42 @@ msgstr "No hay ningún progreso asignado a la tarea actual"
 msgid "You can not remove the default scenario called \"{0}\""
 msgstr "No se puede borrar el escenario por defecto, llamado \"{0}\""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161
 msgid "direct link"
 msgstr "enlace directo"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112
 msgid "Down"
 msgstr "Abajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:934
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:842
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:48
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:89
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:109
 msgid "Label"
 msgstr "Etiqueta"
 
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:37
-msgid "Create Scenario"
-msgstr "Crear escenario"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:834
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841
 msgid "Value is not valid, taking into account the current list of HoursGroup"
 msgstr ""
 "El valor no es válido, teniendo en cuenta la lista actual de grupos de horas"
 
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:48
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90
 msgid "Association with roles"
 msgstr "Asociación con roles"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:371
 msgid "missing type of work hours in a work report line"
 msgstr "falta el tipo de horas en una línea del parte de trabajo"
 
@@ -1954,8 +1925,8 @@ msgstr "falta el tipo de horas en una línea del parte de trabajo"
 msgid "Quality forms"
 msgstr "Formularios de calidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:624
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:634
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476
 msgid "Repeated Hours Group code {0} in Project {1}"
 msgstr "Código {0} de grupo de horas repetido en proyecto {1}"
 
@@ -1963,6 +1934,10 @@ msgstr "Código {0} de grupo de horas repetido en proyecto {1}"
 msgid "Hours group"
 msgstr "Grupo de horas"
 
+#: libreplan-webapp/src/main/webapp/users/users.zul:23
+msgid "LibrePlan: Accounts"
+msgstr "LibrePlan: Cuentas"
+
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:96
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:30
 msgid "Days from Beginning to Deadline"
@@ -1972,55 +1947,35 @@ msgstr "Días desde el comienzo hasta la fecha límite"
 msgid "Estimate At Completion"
 msgstr "Estimación de coste total actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194
-msgid "Delete item. Are you sure?"
-msgstr "Borrar elemento. ¿Está seguro?"
-
 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:102
 msgid "cost assignment's start date not specified"
 msgstr "fecha de inicio de la asignación de coste no especificada"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178
-msgid "Output format:"
-msgstr "Formato de salida:"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1029
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1192
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45
 msgid "Direct"
 msgstr "Directo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:818
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:268
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:289
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:828
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:245
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:266
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:52
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86
 msgid "Op."
 msgstr "Op."
 
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55
-msgid "Reference date:"
-msgstr "Fecha de referencia:"
-
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44
 msgid "Pessimistic"
 msgstr "Pesimista"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:373
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:376
 msgid "Limiting resource assignation"
 msgstr "Asignación de recursos limitantes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238
 msgid ""
 "This progress can not be removed, because it is spread. It is necessary to "
 "select another progress as spread."
@@ -2028,7 +1983,7 @@ msgstr ""
 "Este progreso no se puede eliminar porque es propagado. Es necesario "
 "seleccionar otro progreso como propagado."
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:116
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:119
 msgid "Work week"
 msgstr "Semana de trabajo"
 
@@ -2037,15 +1992,15 @@ msgid "You will lose the changes. Are you sure?"
 msgstr "Se perderán los cambios. ¿Está seguro?"
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47
 msgid "Company ID"
 msgstr "NIF"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:192
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:129
 msgid "Unit type name cannot be empty"
 msgstr "El nombre del tipo de unidad no puede ser vacío"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:38
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:42
 msgid "Entity sequences"
 msgstr "Secuencias de entidad"
 
@@ -2054,15 +2009,19 @@ msgstr "Secuencias de entidad"
 msgid "Delay from beginning (days)"
 msgstr "Retraso desde el comienzo (en días)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:319
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:324
 msgid "Resource cannot be null"
 msgstr "El recurso no puede ser nulo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:505
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453
 msgid "Total Hours"
 msgstr "Horas totales"
 
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:366
+msgid "LibrePlan Role"
+msgstr "Rol LibrePlan"
+
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:36
 msgid "Create Progress Type"
 msgstr "Crear tipo de progreso"
 
@@ -2070,12 +2029,8 @@ msgstr "Crear tipo de progreso"
 msgid "Confirm cancel"
 msgstr "Confirmar cancelación"
 
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:62
-msgid "Label list"
-msgstr "Lista de etiquetas"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37
 msgid "Work And Progress Per Task"
 msgstr "Trabajo y progreso por tarea"
 
@@ -2083,70 +2038,69 @@ msgstr "Trabajo y progreso por tarea"
 msgid "WBS (tasks)"
 msgstr "EDT (tareas)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1250
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:423
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:133
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:538
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:552
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:227
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:310
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:859
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:894
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208
 msgid "Error on showing removing element: "
 msgstr "Error al mostrar el elemento a borrar: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:698
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701
 msgid "Deleting sequence"
 msgstr "Borrando secuencia"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:87
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:88
 msgid "Select scenario"
 msgstr "Seleccionar escenario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:218
-msgid "Create Label Type"
-msgstr "Crear tipo de etiqueta"
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:51
+msgid "Login"
+msgstr "Nombre de usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:233
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:225
 msgid "missing work report code in a work report"
 msgstr "falta código en un parte de trabajo"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36
-msgid "Create Work Report Type"
-msgstr "Crear tipo de parte de trabajo"
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:299
+msgid "Edit Virtual Workers Group: {0}"
+msgstr "Editar grupo de trabajadores virtuales: {0}"
 
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
 msgid "Criterion requirement"
 msgstr "Criterios requeridos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1245
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1404
 msgid "Only the last activation period allows to delete end date."
 msgstr "Sólo el último periodo de activación permite borrar la fecha de fin."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63
+msgid "Maximum/minimum of worked hours in finished applications"
+msgstr "Máximo/mínimo de las horas trabajadas en las aplicaciones finalizadas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333
 msgid "Scheduling saved"
 msgstr "Planificación guardada"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:197
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:192
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:171
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70
 msgid "Add new row"
 msgstr "Añadir nueva fila"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:782
-msgid "incorrect initialization of the progress assignment controller."
-msgstr "inicialización incorrecta del controlador de asignación de progreso."
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:488
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:492
 msgid "Move"
 msgstr "Mover"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:67
+msgid "Password saved"
+msgstr "Contraseña guardada"
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:224
 msgid "missing code in the resource calendar"
 msgstr "falta código en un calendario de recursos"
@@ -2165,7 +2119,7 @@ msgstr "Histórico de asignación"
 msgid "CutycaptTimeout thread exception"
 msgstr "Excepción de thread CutycaptTimeout"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22
 msgid "Work Report Models"
 msgstr "Modelos de partes de trabajo"
@@ -2178,11 +2132,15 @@ msgstr "Fecha de la última medida de progreso"
 msgid "Deadline (days since beggining project)"
 msgstr "Fecha límite (días desde el inicio del proyecto)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:422
-msgid "number of hours is not properly calculated based on clock"
-msgstr "número de horas no calculado correctamente basado en reloj"
+#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23
+msgid "LibrePlan: Companies"
+msgstr "LibrePlan: Empresas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:385
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22
+msgid "LibrePlan: Progress Report"
+msgstr "LibrePlan: Informe de progreso"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:417
 msgid ""
 "Calendar cannot be removed because it still has children. Some other "
 "calendar is derived from this one."
@@ -2190,15 +2148,15 @@ msgstr ""
 "El calendario no se puede borrar porque aún tiene hijos. Algún otro "
 "calendario deriva de este."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:918
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921
 msgid "Value is not valid, the type must be not empty"
 msgstr "El valor no es válido, el tipo no debe ser vacío"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:444
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:445
 msgid "criterion type name is already being used"
 msgstr "el nombre de tipo de criterio está siendo usado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:326
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:331
 msgid "Task code cannot be null"
 msgstr "El código de la tarea no puede ser nulo"
 
@@ -2206,17 +2164,13 @@ msgstr "El código de la tarea no puede ser nulo"
 msgid "It is not allowed to consolidate progress."
 msgstr "No se permite consolidar progreso."
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32
 msgid "Create Task"
 msgstr "Crear tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:98
-msgid "Error setting up creation form for Criterion Type"
-msgstr "Error preparando el formulario de creación para un tipo de criterio"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:151
-msgid "Edit Cost Category"
-msgstr "Editar categoría de coste"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:242
+msgid "LDAP Authentication enabled"
+msgstr "Autenticación con LDAP activada"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27
 msgid "External company"
@@ -2226,66 +2180,70 @@ msgstr "Empresa externa"
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:58
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:82
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:112
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68
 msgid "Actions"
 msgstr "Acciones"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:115
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:118
 msgid "Exceptions"
 msgstr "Excepciones"
 
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:32
+msgid "User settings"
+msgstr "Preferencias de usuario"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:80
 msgid "Start hour"
 msgstr "Hora de inicio"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140
 msgid "Assign materials"
 msgstr "Asignar materiales"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33
 msgid "Over assignable"
 msgstr "Sobreasignable"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:231
 msgid "format filters are not valid"
 msgstr "los filtros de formato no son válidos"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:72
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76
 msgid "ID"
 msgstr "NIF"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:419
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343
+msgid "Settings"
+msgstr "Preferencias"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:346
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:181
 msgid "The init date cannot be empty"
 msgstr "La fecha de inicio no puede ser vacía"
 
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28
-msgid "Is administrator"
-msgstr "Es administrador"
-
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:90
 msgid "Our company password"
 msgstr "Contraseña de nuestra empresa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:275
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:134
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:172
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:130
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:171
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174
 msgid "This label has already been added."
 msgstr "Esta etiqueta ya ha sido añadida."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:79
-#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:179
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80
+#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:181
 msgid "Could not get code, please try again later"
 msgstr "No se pudo obtener el código, por favor inténtelo de nuevo más tarde"
 
@@ -2297,19 +2255,15 @@ msgstr ""
 "El valor no es válido.\n"
 " El código no puede contener caracteres como '_'."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625
-msgid "Confirm deleting this machine. Are you sure?"
-msgstr "Confirmar el borrado de esta máquina. ¿Está seguro?"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161
 msgid "Hours Group"
 msgstr "Grupo de horas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:915
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:823
 msgid "Unallocated name"
 msgstr "Nombre no asignado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:888
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895
 msgid "Move up"
 msgstr "Mover arriba"
 
@@ -2322,10 +2276,10 @@ msgid "Subcontract communication date"
 msgstr "Fecha de comunicación de la subcontratación"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:262
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:354
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:129
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134
 msgid "Scheduling"
 msgstr "Planificación"
 
@@ -2333,7 +2287,13 @@ msgstr "Planificación"
 msgid "Dependencies have priority"
 msgstr "Las dependencias tienen prioridad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:206
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:516
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:901
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126
+msgid "Create {0}"
+msgstr "Crear {0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:218
 msgid "Unlimited"
 msgstr "Ilimitado"
 
@@ -2345,20 +2305,17 @@ msgstr "Total coste planificado"
 msgid "Assign Label"
 msgstr "Asignar etiqueta"
 
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23
+msgid "Create new project"
+msgstr "Crear nuevo proyecto"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73
 msgid "Page up"
 msgstr "Página arriba"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:228
-msgid "Create new project"
-msgstr "Crear nuevo proyecto"
-
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62
-msgid "Work done from starting date:"
-msgstr "Trabajo realizado desde la fecha de inicio:"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:865
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:159
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
@@ -2370,38 +2327,30 @@ msgstr "Estado"
 msgid "Must start after"
 msgstr "Debe empezar después"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1345
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306
 msgid "Confirm change"
 msgstr "Confirmar cambio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:864
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840
 msgid "You don't have permissions to edit this project"
 msgstr "No tiene permisos para editar este proyecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:104
-msgid "Edit Profile"
-msgstr "Editar perfil"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192
 msgid "missing date in a calendar exception"
 msgstr "falta la fecha de una excepción de calendario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:432
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:213
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:440
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:145
 msgid ""
 "Type of hours is empty. Please, create some type of hours before proceeding"
 msgstr ""
 "El tipo de horas está vacío. Por favor, crear algún tipo de horas antes de "
 "proceder"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:598
-msgid "Exception"
-msgstr "Excepción"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:108
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:180
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:515
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:172
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:437
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:502
 msgid "There is no resource with this ID"
 msgstr "No hay otro recurso con este NIF"
 
@@ -2410,15 +2359,20 @@ msgstr "No hay otro recurso con este NIF"
 msgid "Send"
 msgstr "Enviar"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:103
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104
 msgid "user"
 msgstr "usuario"
 
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:21
+msgid "LibrePlan: Materials"
+msgstr "LibrePlan: Materiales"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeModel.java:53
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:33
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192
 msgid "The password for a new user cannot be empty"
 msgstr "La contraseña no puede ser vacía para un usuario nuevo"
 
@@ -2430,23 +2384,19 @@ msgstr "Usuario asociado"
 msgid "Type name"
 msgstr "Nombre del tipo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69
-msgid "Progress assignment"
-msgstr "Asignación de progreso"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:182
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:440
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:687
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27
 msgid "All"
 msgstr "Todo"
 
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:40
-msgid "Edit Progress Type"
-msgstr "Editar tipo de progreso"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69
+msgid "Progress assignment"
+msgstr "Asignación de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:459
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77
 msgid "Manual"
 msgstr "Manual"
 
@@ -2458,11 +2408,11 @@ msgstr "Lista de calendarios"
 msgid "Receipt date"
 msgstr "Fecha de recepción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:209
 msgid "Cannot be higher than Ending date"
 msgstr "No puede ser mayor que la fecha de fin"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:292
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269
 msgid "Create activation period"
 msgstr "Crear período de activación"
 
@@ -2474,9 +2424,9 @@ msgstr "Lista de trabajadores"
 msgid "Personal details"
 msgstr "Detalles personales"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1027
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1190
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:214
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:217
 msgid "Inherited"
 msgstr "Heredado"
 
@@ -2484,12 +2434,8 @@ msgstr "Heredado"
 msgid "Delete project template. Are you sure?"
 msgstr "Borrar plantilla de proyecto. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:255
-msgid "Worker"
-msgstr "Trabajador"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:517
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:595
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599
 msgid ""
 "Cannot allocate selected element. There is not any queue that matches "
 "resource allocation criteria at any interval of time"
@@ -2498,19 +2444,28 @@ msgstr ""
 "coincida con los criterios de asignación de recursos en ningún intervalo de "
 "tiempo"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287
+msgid "Worker"
+msgstr "Trabajador"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:217
 msgid "Criterion must be not-null"
 msgstr "El criterio no debe ser nulo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:161
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:299
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:300
 msgid "criterion name not specified"
 msgstr "nombre del criterio no especificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95
 msgid "Value is not valid, the default max value must not be empty "
 msgstr "El valor no es válido, el valor máximo por defecto no debe ser nulo "
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:343
+msgid "Role property"
+msgstr "Propiedad del rol"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25
 msgid "Manual allocation"
 msgstr "Asignación manual"
@@ -2528,15 +2483,19 @@ msgstr "Autorizar"
 msgid "Recommended allocation"
 msgstr "Asignación recomendada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:303
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:241
+msgid "Activation"
+msgstr "Activación"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304
 msgid "Scenarios"
 msgstr "Escenarios"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376
 msgid "Materials saved"
 msgstr "Materiales guardados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252
 msgid ""
 "This progress measurement can not be in current date, because it is "
 "consolidated. it is necessary to select other date."
@@ -2544,15 +2503,24 @@ msgstr ""
 "Esta medida de progreso no puede estar en la fecha actual, porque está "
 "consolidada. Debe seleccionar otra fecha."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:705
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37
+msgid "Total Worked Hours By Resource In A Month"
+msgstr "Total horas trabajadas por recurso en un mes"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672
 msgid "Other projects"
 msgstr "Otros proyectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:159
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:111
+msgid "Tasks input buffer"
+msgstr "Buffer de tareas de entrada"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168
 msgid "At least one {0} sequence must be active"
 msgstr "Al menos una secuencia de {0} debe estar activa"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:111
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66
@@ -2571,15 +2539,19 @@ msgstr "Deshabilitar borrado"
 msgid "You should select a source scenario"
 msgstr "Debe seleccionar un escenario de origen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:154
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163
 msgid "At least one {0} sequence is needed"
 msgstr "Se necesita al menos una secuencia de {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37
 msgid "Estimated/Planned Hours Per Task"
 msgstr "Horas por tarea estimadas/planificadas"
 
+#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23
+msgid "LibrePlan: Cost Categories"
+msgstr "LibrePlan: Categorías de coste"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:68
 msgid "Assigned"
 msgstr "Asignado"
@@ -2588,11 +2560,15 @@ msgstr "Asignado"
 msgid "Details"
 msgstr "Detalles"
 
+#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21
+msgid "LibrePlan: Units"
+msgstr "LibrePlan: Unidades"
+
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45
 msgid "Communication"
 msgstr "Comunicación"
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36
 msgid "More options"
 msgstr "Más opciones"
 
@@ -2601,15 +2577,11 @@ msgstr "Más opciones"
 msgid "Error: {0}"
 msgstr "Error: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:185
-msgid "Company saved"
-msgstr "Empresa guardada"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240
 msgid "Confirm create template"
 msgstr "Confirmar la creación de la plantilla"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:261
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:238
 msgid "Parent"
 msgstr "Padre"
 
@@ -2617,19 +2589,21 @@ msgstr "Padre"
 msgid "Earliest date"
 msgstr "Fecha más temprana"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:126
-msgid "Type of work hours saved"
-msgstr "Tipo de horas de trabajo guardado"
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21
+msgid "LibrePlan: Work And Progress Per Task"
+msgstr "LibrePlan: trabajo y progreso por tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:46
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344
+msgid "Change Password"
+msgstr "Cambiar la contraseña"
+
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48
 msgid "Projects"
 msgstr "Proyectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:150
-msgid "Create Quality Form"
-msgstr "Crear formulario de calidad"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264
+msgid "Confirm exit dialog"
+msgstr "Diálogo para confirmar la salida"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64
 msgid "Not found converter for {0}"
@@ -2639,16 +2613,19 @@ msgstr "No se encontró un conversor para {0}"
 msgid "Material assignments"
 msgstr "Asignaciones de materiales"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:46
 msgid "December"
 msgstr "Diciembre"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:922
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:35
+msgid "Change password"
+msgstr "Cambiar la contraseña"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:830
 msgid "Text field"
 msgstr "Campo de texto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:122
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81
 msgid ""
 "Value is not valid, the Precision value must be less than the defalt max "
 "value."
@@ -2656,11 +2633,11 @@ msgstr ""
 "El valor no es válido, el valor de precisión debe ser menor que el valor "
 "máximo por defecto."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97
 msgid "Question"
 msgstr "Pregunta"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249
 msgid ""
 "This progress measurement can not be changed or removed, because it is "
 "consolidated. It is needed to remove its consolidation."
@@ -2668,17 +2645,18 @@ msgstr ""
 "Esta medida de progreso no se puede cambiar o borrar, porque está "
 "consolidada. Se requiere borrar su consolidación."
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:222
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225
 msgid "Create new work week"
 msgstr "Crear nueva semana de trabajo"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:134
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:137
 msgid "The admin's account password remains the default one. This is unsecure"
 msgstr ""
 "La contraseña de la cuenta de admin sigue siendo la contraseña por defecto. "
 "Esto no es seguro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:713
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:716
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:34
 msgid "LIMITING RESOURCE"
 msgstr "RECURSO LIMITANTE"
@@ -2687,7 +2665,7 @@ msgstr "RECURSO LIMITANTE"
 msgid "Subcontratation"
 msgstr "Subcontratación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:198
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:135
 msgid ""
 "The meausure name is not valid. There is another unit type with the same "
 "measure name"
@@ -2695,24 +2673,26 @@ msgstr ""
 "El nombre de la medida no es válido. Hay otro tipo de unidad con el mismo "
 "nombre de medida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:535
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:590
 msgid "{0} cannot be fulfilled"
 msgstr "No se puede cumplir {0}"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:69
 msgid "Extended view"
 msgstr "Vista expandida"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34
 msgid "Work record"
 msgstr "Registro de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:116
-msgid "Error setting up edition form."
-msgstr "Error preparando el formulario de edición."
-
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:204
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:147
 msgid "Output format"
 msgstr "Formato de salida"
 
@@ -2720,14 +2700,6 @@ msgstr "Formato de salida"
 msgid "Print"
 msgstr "Imprimir"
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22
-msgid "LibrePlan: Calendars"
-msgstr "LibrePlan: Calendarios"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:412
-msgid "Hours cannot be null"
-msgstr "Las horas no pueden ser nulas"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:179
 msgid "{0} not found type for criterion "
 msgstr "{0} no encontrado tipo para criterio "
@@ -2736,56 +2708,53 @@ msgstr "{0} no encontrado tipo para criterio "
 msgid "Page down"
 msgstr "Página abajo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:485
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:486
 msgid "resource type does not allow enabled criteria"
 msgstr "el tipo de recurso no permite criterios habilitados"
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:22
-#: libreplan-webapp/src/main/webapp/common/error.zul:21
-msgid "LibrePlan: Runtime Error"
-msgstr "LibrePlan: Error de ejecución"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:416
+msgid "Effort cannot be null"
+msgstr "El esfuerzo no puede ser nulo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:39
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:43
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1015
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:191
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:49
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:55
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:101
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:46
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116
 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:40
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:44
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:87
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:84
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:81
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:134
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:99
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:243
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:139
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:100
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:379
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50
-#: libreplan-webapp/src/main/webapp/planner/order.zul:72
-#: libreplan-webapp/src/main/webapp/planner/order.zul:135
-#: libreplan-webapp/src/main/webapp/planner/order.zul:170
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:85
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41
+#: libreplan-webapp/src/main/webapp/planner/order.zul:73
+#: libreplan-webapp/src/main/webapp/planner/order.zul:134
+#: libreplan-webapp/src/main/webapp/planner/order.zul:169
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:32
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:35
 msgid "General user data"
 msgstr "Datos generales de usuario"
 
@@ -2797,7 +2766,7 @@ msgstr "Quitar planificación"
 msgid "Subcontracted task sent successfully"
 msgstr "Tarea subcontratada enviada con éxito"
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:73
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:77
 msgid "Accumulated hours chart"
 msgstr "Gráfico de horas acumuladas"
 
@@ -2809,13 +2778,13 @@ msgstr "Lista de máquinas"
 msgid "CPI"
 msgstr "CPI"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:660
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:923
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:526
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318
 msgid "You don't have read access to this project"
 msgstr "No tiene acceso de lectura a este proyecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:180
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:96
 msgid ""
 "Disable hierarchy will cause criteria tree to be flattened. Are you sure?"
 msgstr ""
@@ -2828,17 +2797,13 @@ msgstr ""
 msgid "Units"
 msgstr "Unidades"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:48
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:43
 msgid "Dates"
 msgstr "Fechas"
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:45
-msgid "Create Calendar"
-msgstr "Crear calendario"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:185
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168
 msgid "At least one stretch is needed"
 msgstr "Se necesita al menos un tramo"
 
@@ -2846,10 +2811,26 @@ msgstr "Se necesita al menos un tramo"
 msgid "a day is not valid"
 msgstr "un día no es válido"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:87
+msgid "Autocomplete login form"
+msgstr "Autocompletar el formulario de inicio de sesión"
+
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21
+msgid "LibrePlan: Project Costs Per Resource"
+msgstr "LibrePlan: costes de proyecto por recurso"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61
 msgid "Task Properties"
 msgstr "Propiedades de la tarea"
 
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:51
+msgid "hours type"
+msgstr "tipo de horas"
+
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
+msgid "LibrePlan: Task Scheduling Status In Project"
+msgstr "LibrePlan: Estado de planificación en proyecto"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:229
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214
@@ -2859,20 +2840,11 @@ msgstr ""
 "Fecha de fin inválida, la fecha de fin nueva debe ser posterior a la fecha "
 "de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:192
-msgid "Cost category saved"
-msgstr "Categoría de coste guardada"
-
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33
 msgid "name"
 msgstr "nombre"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:170
-msgid "Progress type saved"
-msgstr "Tipo de progreso guardado"
-
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:73
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:75
 msgid "Delete selected task"
 msgstr "Borrar tarea seleccionada"
 
@@ -2880,10 +2852,18 @@ msgstr "Borrar tarea seleccionada"
 msgid "{0} (max: {1})"
 msgstr "{0} (máx: {1})"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:459
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470
 msgid "end"
 msgstr "fin"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:529
+msgid "Cost Category"
+msgstr "Categoría de coste"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:350
+msgid "Role search query"
+msgstr "Consulta para la búsqueda de roles"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:63
 msgid "Log"
 msgstr "Diario"
@@ -2906,7 +2886,7 @@ msgstr "Editar tarea {0}"
 msgid "Start date cannot be null"
 msgstr "La fecha de inicio no puede ser nula"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298
 msgid "Subcontracting"
 msgstr "Subcontratación"
 
@@ -2914,7 +2894,7 @@ msgstr "Subcontratación"
 msgid "references"
 msgstr "referencias"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1284
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278
 msgid "Value is not valid, the Precision value must be exact "
 msgstr "El valor no es válido, el valor de precisión debe ser exacto "
 
@@ -2922,11 +2902,11 @@ msgstr "El valor no es válido, el valor de precisión debe ser exacto "
 msgid "Generic"
 msgstr "Genérico"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41
-msgid "Planned workable days :"
-msgstr "Días laborables planificados :"
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:51
+msgid "Template"
+msgstr "Plantilla"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49
 msgid "Default max value"
 msgstr "Valor máximo por defecto"
 
@@ -2934,7 +2914,7 @@ msgstr "Valor máximo por defecto"
 msgid "Add criterion requirement"
 msgstr "Añadir criterio requerido"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855
 msgid ""
 "You can not remove the project \"{0}\" because of any of its tasks are "
 "already in use in some work reports and the project just exists in the "
@@ -2952,35 +2932,40 @@ msgstr "Porcentaje de horas de presupuesto estimadas / horas consumidas"
 msgid "Criterion Name"
 msgstr "Nombre del criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502
 msgid "Automatic"
 msgstr "Automático"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48
 msgid "Task"
 msgstr "Tarea"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35
-msgid "Planned end :"
-msgstr "Fin planificado :"
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:21
+msgid "LibrePlan: Change password"
+msgstr "LibrePlan: Cambiar la contraseña"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:270
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:128
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:167
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:124
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:169
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168
 msgid "please, select a label"
 msgstr "por favor, seleccione una etiqueta"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123
 msgid "Add profile"
 msgstr "Añadir perfil"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215
+#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23
+msgid "LibrePlan: Scenarios Management"
+msgstr "LibrePlan: Gestión de Escenarios"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220
 msgid "filter already exists"
 msgstr "el filtro ya existe"
 
@@ -2998,6 +2983,10 @@ msgstr "Nombre del criterio"
 msgid "values are not valid, the values must not be null"
 msgstr "los valores no son válidos, no deben ser nulos"
 
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41
+msgid "Apply changes and go back to scheduling"
+msgstr "Aplicar cambios y volver a la planificación"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50
@@ -3010,9 +2999,9 @@ msgstr "recurso de la asignación de coste no especificado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45
 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:73
 msgid "Project"
 msgstr "Proyecto"
@@ -3021,11 +3010,7 @@ msgstr "Proyecto"
 msgid "Unassigned"
 msgstr "No asignado"
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:25
-msgid "Select the date from which the new version will be valid"
-msgstr "Seleccione la fecha a partir de la cual la versión nueva será válida"
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:102
 msgid "Add new criterion requirement"
 msgstr "Añadir nuevo criterio requerido"
 
@@ -3033,11 +3018,11 @@ msgstr "Añadir nuevo criterio requerido"
 msgid "Budgeted Cost Work Performed"
 msgstr "Coste presupuestado del trabajo realizado"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:135
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:138
 msgid "Change the password"
 msgstr "Cambiar la contraseña"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:95
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:115
 msgid "Work report"
 msgstr "Parte de trabajo"
 
@@ -3045,24 +3030,29 @@ msgstr "Parte de trabajo"
 msgid "the name must be not empty"
 msgstr "el nombre no puede ser vacío"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:86
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:58
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:85
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71
 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:731
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:347
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:701
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:326
 msgid "Earned value"
 msgstr "Valor ganado"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:216
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
+msgid "Overtime Effort"
+msgstr "Esfuerzo extra"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:219
 msgid "Inherited from parent calendar"
 msgstr "Heredado del calendario padre"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:146
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:184
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:210
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:187
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:213
 msgid "Normal Effort"
 msgstr "Esfuerzo normal"
 
@@ -3080,51 +3070,48 @@ msgstr ""
 "intentando crear unha plantilla a  partir de una tarea nueva.\n"
 "Por favor guarde su proyecto antes de continuar."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:92
-msgid "Edit Work Hours Type"
-msgstr "Editar tipo de horas de trabajo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43
-msgid "From Today"
-msgstr "A partir de hoy"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1060
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1075
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129
 msgid "{0} not supported yet"
 msgstr "{0} aún no soportado"
 
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:143
+msgid "is not supported for its use with LibrePlan."
+msgstr "no está soportado para su uso con LibrePlan."
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53
 msgid "New entry"
 msgstr "Entrada nueva"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220
 msgid "Some sequences to remove not existed"
 msgstr "Algunas secuencias para borrar no existen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:105
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:114
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:212
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:100
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:109
 msgid "Resources Load"
 msgstr "Carga de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214
 msgid "Changes have been canceled"
 msgstr "Cambios cancelados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:266
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:281
-msgid "Machine saved"
-msgstr "Máquina guardada"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
+msgid "LibrePlan: Hours Worked Per Worker In A Month"
+msgstr "LibrePlan: Horas trabajadas por trabajador en un mes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143
-msgid "Create Cost Category"
-msgstr "Crear categoría de coste"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:297
+msgid "Authentication"
+msgstr "Autenticación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "March"
 msgstr "Marzo"
 
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:85
+msgid "Select language"
+msgstr "Seleccionar idioma"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104
 msgid "Appropriative allocation"
 msgstr "Asignación apropiativa"
@@ -3133,11 +3120,11 @@ msgstr "Asignación apropiativa"
 msgid "Assigned criterion requirements"
 msgstr "Criterios requeridos asignados"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:115
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:123
 msgid "Filter by criteria"
 msgstr "Filtrar por criterios"
 
@@ -3150,11 +3137,11 @@ msgstr "Valor máximo"
 msgid "Scenarios List"
 msgstr "Lista de escenarios"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:156
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:115
 msgid "The name is not valid, the name must not be null "
 msgstr "El nombre no es válido, no debe ser nulo "
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136
 msgid "Hours to allocate"
 msgstr "Horas para asignar"
 
@@ -3162,7 +3149,7 @@ msgstr "Horas para asignar"
 msgid "A category must be selected"
 msgstr "Debe seleccionar una categoría"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:134
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:137
 msgid "Period"
 msgstr "Periodo"
 
@@ -3175,91 +3162,80 @@ msgstr "Propagación"
 msgid "Select start date"
 msgstr "Seleccionar fecha de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:188
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:214
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877
+msgid "Removed {0}"
+msgstr "{0} borrado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152
 msgid "Error on showing warning message removing typeOfWorkHours: "
 msgstr ""
 "Error al mostrar mensaje de advertencia borrando tipo de horas de trabajo: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:153
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:151
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:189
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:901
-msgid "Removed {0}"
-msgstr "{0} borrado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821
 msgid "Confirm deleting this worker. Are you sure?"
 msgstr "Confirmar el borrado de este trabajador. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:62
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:64
 msgid "Group name"
 msgstr "Nombre del grupo"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
-msgid "Start date:"
-msgstr "Fecha de inicio:"
-
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:57
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98
 msgid "Role name"
 msgstr "Nombre del rol"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:837
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:840
 msgid "This worker was already removed by other user"
 msgstr "Este trabajador ya ha sido borrado por otro usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:611
-msgid "Create Work Report"
-msgstr "Crear parte de trabajo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:116
-msgid "Value is not valid, the precision value must not be empty"
-msgstr "El valor no es válido, el valor de precisión no debe ser vacío"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:821
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:484
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:791
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:474
 msgid "h"
 msgstr "h"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:359
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:620
+msgid "Create Work Report"
+msgstr "Crear parte de trabajo"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:75
+msgid "Value is not valid, the precision value must not be empty"
+msgstr "El valor no es válido, el valor de precisión no debe ser vacío"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363
 msgid "Workable capacity for this period "
 msgstr "Capacidad de trabajo para este período "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:218
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:150
 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159
 msgid "Cannot be null or empty"
 msgstr "No puede ser nulo o vacío"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:190
-msgid "Cannot delete profile: it does not exist anymore"
-msgstr "No se puede borrar el perfil: ya no existe"
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:440
+msgid "Quality Form"
+msgstr "Formulario de calidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:225
-msgid "Edit Machine"
-msgstr "Editar máquina"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:77
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:67
 msgid "Add Milestone"
 msgstr "Añadir hito"
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:116
 msgid "Assign selected items"
 msgstr "Asignar elementos seleccionados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:438
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449
 msgid "init"
 msgstr "inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1212
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215
 msgid "Add new progress measurement"
 msgstr "Añadir nueva medida de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:528
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:532
 msgid "Select for automatic queuing"
 msgstr "Seleccione para encolar automáticamente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305
 msgid "Scenarios Management"
 msgstr "Administración de escenarios"
 
@@ -3271,86 +3247,96 @@ msgstr "Proyecto {0} transferido"
 msgid "Create & Assign"
 msgstr "Crear y asignar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:148
-msgid "Edit User"
-msgstr "Editar usuario"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549
+msgid "Not configurable"
+msgstr "No configurable"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55
-msgid "Maximum/minimum of the estimated hours"
-msgstr "Máximo/mínimo de las horas estimadas"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationCommand.java:47
+msgid "Advanced allocation"
+msgstr "Asignación avanzada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:753
-msgid "D"
-msgstr "D"
-
-#: libreplan-webapp/src/main/webapp/planner/order.zul:112
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90
+#: libreplan-webapp/src/main/webapp/planner/order.zul:111
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96
 msgid "Consolidated"
 msgstr "Consolidado"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:125
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:145
 msgid "Work report types"
 msgstr "Tipos de partes de trabajo"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:182
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:174
 msgid "MonteCarlo method"
 msgstr "Método de Montecarlo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1057
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1220
 msgid "derived exception can not be removed"
 msgstr "la excepción derivada no se puede borrar"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:307
+msgid "Edit Worker: {0}"
+msgstr "Editar trabajador: {0}"
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:217
 msgid "missing code in a material"
 msgstr "falta el código en un material"
 
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21
+msgid "LibrePlan: User access"
+msgstr "LibrePlan: Acceso de usuarios"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:61
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:109
 msgid "Customer"
 msgstr "Cliente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:86
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
 msgid "Hours type"
 msgstr "Tipo de horas"
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:156
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:210
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211
 msgid "criterion type name not specified"
 msgstr "nombre del tipo de criterio no especificado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246
+msgid "Cannot connect to LDAP server"
+msgstr "No se puede conectar al servidor de LDAP"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220
 msgid "Add Exception"
 msgstr "Añadir excepción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:405
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:427
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:451
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346
 msgid "cannot be empty"
 msgstr "no puede ser vacío"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1468
-msgid "Sigmoid function"
-msgstr "Función sigmoide"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:421
+msgid "Effort must be greater than zero"
+msgstr "El esfuerzo debe ser mayor que cero"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:49
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:48
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:47
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27
 msgid "from"
 msgstr "desde"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:147
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:146
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:121
 msgid "Heading Fields"
 msgstr "Campos de cabecera"
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:70
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:80
 msgid "Progress type"
 msgstr "Tipo de progreso"
 
@@ -3370,7 +3356,7 @@ msgstr ""
 "El período de tiempo contiene datos inválidos. La fecha de fin debe ser "
 "mayor que la de inicio"
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:43
+#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33
 msgid "Save Project"
 msgstr "Guardar proyecto"
 
@@ -3379,8 +3365,8 @@ msgstr "Guardar proyecto"
 msgid "Day is not valid"
 msgstr "El día no es válido"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1097
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:619
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1256
 msgid "You should select a start date for the exception"
 msgstr "Debe seleccionar una fecha de inicio para la excepción"
 
@@ -3396,6 +3382,10 @@ msgstr "Desviación al coste final"
 msgid "Exportation options"
 msgstr "Opciones de exportación"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:92
+msgid "Settings saved"
+msgstr "Preferencias guardadas"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160
 msgid ""
 "Could not save time period. Time period overlaps with another non-compatible "
@@ -3404,83 +3394,83 @@ msgstr ""
 "No se pudo guardar el período de tiempo. El período se solapa con otro "
 "período de tiempo incompatible"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:376
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/BaseCalendarBandboxFinder.java:46
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:493
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:978
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:88
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:27
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:55
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:38
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:41
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:74
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76
 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:31
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:50
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:39
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:27
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32
 #: libreplan-webapp/src/main/webapp/planner/main.zul:49
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:90
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:134
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:175
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:104
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45
 msgid "Name"
 msgstr "Nombre"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:162
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168
 msgid "Delete task"
 msgstr "Borrar tarea"
 
@@ -3492,11 +3482,11 @@ msgstr "Segundos"
 msgid "please, select an item"
 msgstr "por favor, seleccione un elemento"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:392
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:397
 msgid "Time Start cannot be null"
 msgstr "La hora de inicio no puede ser nula"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:208
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212
 msgid "Day of week"
 msgstr "Día de la semana"
 
@@ -3504,12 +3494,12 @@ msgstr "Día de la semana"
 msgid "Companies List"
 msgstr "Lista de empresas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1443
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453
 msgid "Stretches with Interpolation"
 msgstr "Tramos con interpolación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37
 msgid "Hours Worked Per Resource"
 msgstr "Horas trabajadas por recurso"
 
@@ -3521,31 +3511,33 @@ msgstr "La fecha de fin no puede ser anterior a la fecha de inicio"
 msgid "cost assignment with end date less than start date"
 msgstr "la asignación de coste tiene fecha de fin anterior a la de inicio"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63
-msgid "Maximum/minimum of the worked hours"
-msgstr "Máximo/mínimo de las horas trabajadas"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:91
+msgid ""
+"Enable/Disable autocomplete property in login form, if the admin password is "
+"still in default"
+msgstr ""
+"Habilitar/Deshabilitar la propiedad de autocompletado en el formulario de "
+"inicio de sesión, si la contraseña de admin tovadía es la contraseña por "
+"defecto"
 
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26
 msgid "Category name"
 msgstr "Nombre de la categoría"
 
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21
-msgid "LibrePlan: Work And Progress Per Task"
-msgstr "LibrePlan: trabajo y progreso por tarea"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:766
 msgid "Not the same material, impossible to update"
 msgstr "No es el mismo material, imposible actualizar"
 
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34
+msgid "Filter work report by"
+msgstr "Filtrar parte de trabajo por"
+
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:65
 msgid "Main menu"
 msgstr "Menú principal"
 
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22
-msgid "LibrePlan: Progress"
-msgstr "LibrePlan: Progreso"
-
 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:31
 msgid "MonteCarlo"
 msgstr "Montecarlo"
@@ -3554,24 +3546,27 @@ msgstr "Montecarlo"
 msgid "Duration"
 msgstr "Duración"
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:39
-msgid "Create From Template"
-msgstr "Crear a partir de plantilla"
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:585
+msgid "Exception: {0}"
+msgstr "Excepción: {0}"
+
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:46
+msgid "Password settings"
+msgstr "Configuración de la contraseña"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:381
 msgid "There exists other workReportType with the same name."
 msgstr "Ya existe otro tipo de parte de trabajo con el mismo nombre."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22
+msgid "LibrePlan: Progress"
+msgstr "LibrePlan: Progreso"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:149
 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29
 msgid "Schedule"
 msgstr "Planificar"
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:35
-#: libreplan-webapp/src/main/webapp/common/error.zul:40
-msgid "Exception type:"
-msgstr "Tipo de excepción:"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:164
 msgid "Unexpected: {0}"
 msgstr "Inesperado: {0}"
@@ -3581,45 +3576,43 @@ msgstr "Inesperado: {0}"
 msgid "Notes"
 msgstr "Notas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:224
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178
 msgid "Connect"
 msgstr "Conectar"
 
-#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21
-msgid "LibrePlan: Units"
-msgstr "LibrePlan: Unidades"
-
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23
-msgid "LibrePlan: Transfer Projects Between Scenarios"
-msgstr "LibrePlan: transferir proyectos entre escenarios"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223
 msgid "Allocation: [{0},{1}]"
 msgstr "Asignación: [{0},{1}]"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:194
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:892
+msgid "Virtual Workers Group"
+msgstr "Grupo de trabajadores virtuales"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198
 msgid "Changes saved"
 msgstr "Cambios guardados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258
 msgid "See scheduling"
 msgstr "Ver planificación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
 msgid "Progress measurements"
 msgstr "Medidas de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1211
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214
 msgid "Add measure"
 msgstr "Añadir medida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:253
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:258
 msgid "Work report saved"
 msgstr "Parte de trabajo guardado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:52
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:374
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:377
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:68
 msgid "Subcontract"
 msgstr "Subcontratar"
@@ -3639,7 +3632,7 @@ msgstr "Relación"
 msgid "End"
 msgstr "Fin"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1366
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360
 msgid "The date is not valid, the date must be not empty"
 msgstr "La fecha no es válida, no debe ser vacía"
 
@@ -3647,11 +3640,12 @@ msgstr "La fecha no es válida, no debe ser vacía"
 msgid "User login name"
 msgstr "Nombre de usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318
 msgid "Cost Categories"
 msgstr "Categorías de coste"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:312
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313
 msgid "criterion type not specified"
 msgstr "tipo de criterio no especificado"
 
@@ -3659,14 +3653,13 @@ msgstr "tipo de criterio no especificado"
 msgid "must be not empty"
 msgstr "no puede ser vacío"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "April"
 msgstr "Abril"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23
-msgid "LibrePlan: Companies"
-msgstr "LibrePlan: Empresas"
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:301
+msgid "Derived of Calendar "
+msgstr "Derivado del calendario "
 
 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22
 msgid "Users List"
@@ -3678,16 +3671,20 @@ msgstr "Lista de usuarios"
 msgid "Task quality forms"
 msgstr "Formularios de calidad de tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:600
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593
 msgid "Not working day"
 msgstr "Día no laborable"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:237
+msgid "Progress Types"
+msgstr "Tipos de progreso"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:135
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:155
 msgid "Cost category"
 msgstr "Categoría de coste"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:697
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700
 msgid "It can not be deleted. At least one sequence is necessary."
 msgstr "No se puede borrar. Al menos una secuencia es necesaria."
 
@@ -3695,23 +3692,29 @@ msgstr "No se puede borrar. Al menos una secuencia es necesaria."
 msgid "Resource allocation"
 msgstr "Asignación de recursos"
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
 msgid "Amount work"
 msgstr "Cantidad de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:172
 msgid "please, select a quality form"
 msgstr "por favor, seleccione un formulario de calidad"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:201
-msgid "Select entity:"
-msgstr "Seleccione entidad:"
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:522
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:907
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:132
+msgid "Edit {0}: {1}"
+msgstr "Editar {0}: {1}"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:400
 msgid "Exist other workReportType with the same code."
 msgstr "Ya existe otro tipo de parte de trabajo con el mismo código."
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:65
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
+msgid "Filter quality forms by"
+msgstr "Filtrar formularios de calidad por"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67
 msgid "Unindent selected task"
 msgstr "Desindentar tarea seleccionada"
 
@@ -3723,20 +3726,11 @@ msgstr "Código de referencia del cliente"
 msgid "Constraint"
 msgstr "Restricción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155
-msgid "Create Exception Day Type"
-msgstr "Crear tipo de día de excepción"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41
-msgid "Hours Worked Per Resource In A Month"
-msgstr "Horas trabajadas por recurso en un mes"
-
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150
 msgid "Add New Label Type Field"
 msgstr "Añadir nuevo campo de tipo de etiqueta"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:402
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:407
 msgid "Time finish cannot be null"
 msgstr "La hora de fin no puede ser nula"
 
@@ -3744,23 +3738,22 @@ msgstr "La hora de fin no puede ser nula"
 msgid "Customer reference"
 msgstr "Referencia de cliente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:661
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:865
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:915
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:924
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947
-#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:461
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:517
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:527
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319
 msgid "Information"
 msgstr "Información"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:946
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926
 msgid "Sorry, you do not have permissions to access this project"
 msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto"
 
@@ -3768,11 +3761,11 @@ msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto"
 msgid "END"
 msgstr "FIN"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:223
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:226
 msgid "Worker saved"
 msgstr "Trabajador guardado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266
 msgid "can not pass until the previous item is passed."
 msgstr "no se puede pasar mientras el elemento no anterior sea pasado."
 
@@ -3780,11 +3773,7 @@ msgstr "no se puede pasar mientras el elemento no anterior sea pasado."
 msgid "New hours group "
 msgstr "Nuevo grupo de horas "
 
-#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22
-msgid "LibrePlan: Quality Forms"
-msgstr "LibrePlan: Formularios de calidad"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:460
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464
 msgid "Assign element to queue manually"
 msgstr "Asignar elemento a cola manualmente"
 
@@ -3792,15 +3781,15 @@ msgstr "Asignar elemento a cola manualmente"
 msgid "Edit Template"
 msgstr "Editar Plantilla"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:216
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:218
 msgid "Resource: {0} "
 msgstr "Recurso: {0} "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:463
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358
 msgid "percentage cannot be duplicated"
 msgstr "el porcentaje no puede estar duplicado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325
 msgid "Work Hours"
 msgstr "Horas de trabajo"
 
@@ -3808,7 +3797,7 @@ msgstr "Horas de trabajo"
 msgid "Heading"
 msgstr "Cabecera"
 
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:164
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:165
 msgid "Company ID already used. It has to be be unique"
 msgstr "NIF de la empresa ya está siendo usado. Debe ser único"
 
@@ -3820,23 +3809,20 @@ msgstr "No hay ninguna categoría de materiales con este código"
 msgid "Percentages should sum 100"
 msgstr "Los porcentajes debería sumar 100"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:284
-msgid "Could not save machine"
-msgstr "No se pudo guardar la máquina"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:339
 msgid "The calendar exception type not found"
 msgstr "Tipo de excepción de calendario no encontrado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81
+#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:106
 msgid "Unable to convert value to {0} type"
 msgstr "No se pudo convertir el valor a tipo {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:220
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:223
 msgid "Worker must be not-null"
 msgstr "El trabajador no debe ser nulo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1067
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1063
 msgid "Some criterion satisfactions overlap in time"
 msgstr "Algunos criterios satisfechos se solapan en el tiempo"
 
@@ -3844,47 +3830,57 @@ msgstr "Algunos criterios satisfechos se solapan en el tiempo"
 msgid "Value last progress measurement"
 msgstr "Valor última medida de progreso"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
+msgid "LibrePlan: Materials Needs At Date"
+msgstr "LibrePlan: Necesidad de materiales en fecha"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44
 msgid "Worker assignments"
 msgstr "Asignaciones de trabajador"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:541
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:402
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:147
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:610
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:270
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:409
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:431
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221
 msgid "{0} already exists"
 msgstr "{0} ya existe"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:314
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:318
 msgid "Create Worker"
 msgstr "Crear trabajador"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587
+msgid "Exception: {0} (Inh)"
+msgstr "Excepción: {0} (Her)"
+
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
 msgid "Code "
 msgstr "Código"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:52
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65
 msgid "Password confirmation"
 msgstr "Confirmación de contraseña"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:69
-msgid "Indent selected task"
-msgstr "Indentar tarea seleccionada"
-
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88
 msgid "Work Report"
 msgstr "Parte de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:115
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71
+msgid "Indent selected task"
+msgstr "Indentar tarea seleccionada"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:135
 msgid "Unit Measures"
 msgstr "Unidades de medida"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:63
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:72
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39
 msgid "Show progress"
 msgstr "Mostrar progreso"
@@ -3893,7 +3889,15 @@ msgstr "Mostrar progreso"
 msgid "Work"
 msgstr "Trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:459
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297
+msgid ""
+"Error saving the project\n"
+"{0}"
+msgstr ""
+"Error guardando un proyecto\n"
+"{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:358
 msgid ""
 "The task has got progress consolidations. It must delete all consolidations "
 "to change the resource allocation type "
@@ -3901,10 +3905,15 @@ msgstr ""
 "La tarea tiene consolidaciones de progreso. Debe borrar todas las "
 "consolidaciones para cambiar el tipo de asignación de recurso "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:626
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22
+msgid "LibrePlan: Machines"
+msgstr "LibrePlan: Máquinas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1335
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1296
 msgid "Error"
 msgstr "Error"
 
@@ -3924,15 +3933,15 @@ msgstr ""
 msgid "ETC"
 msgstr "ETC"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:105
 msgid "Log out"
 msgstr "Salir"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:25
 msgid "Add new configuration unit"
 msgstr "Añadir nueva unidad de configuración"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:37
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:41
 msgid "Main preferences"
 msgstr "Preferencias principales"
 
@@ -3945,24 +3954,20 @@ msgstr ""
 "criterionType"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67
-#: libreplan-webapp/src/main/webapp/planner/order.zul:82
+#: libreplan-webapp/src/main/webapp/planner/order.zul:83
 msgid "Progress consolidation"
 msgstr "Consolidación de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:246
-msgid "Label type saved"
-msgstr "Tipo de etiqueta guardado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:419
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:568
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:406
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:556
 msgid "missing field name in a description value"
 msgstr "falta nombre de campo en un valor de descripción"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47
 msgid "Add new worker assignment"
 msgstr "Añadir nueva asignación de trabajador"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:688
 msgid "Show all elements"
 msgstr "Mostrar todos los elementos"
 
@@ -3970,11 +3975,7 @@ msgstr "Mostrar todos los elementos"
 msgid "It couldn't complete all the reassignations"
 msgstr "No se han podido completar todas las reasignaciones"
 
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77
-msgid "Show dependencies:"
-msgstr "Mostrar dependencias:"
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:66
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:68
 msgid "Limited resource"
 msgstr "Recurso limitante"
 
@@ -3992,8 +3993,8 @@ msgstr ""
 "Su sesión ha expirado tras un tiempo de inactividad. Por favor, inicie "
 "sesión de nuevo."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:166
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:191
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:190
 msgid "SPREAD"
 msgstr "PROPAGACIÓN"
 
@@ -4005,27 +4006,26 @@ msgstr "un día está vacío"
 msgid "Budgeted Cost Work Scheduled"
 msgstr "Coste de trabajo presupuestado planificado"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:57
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703
+msgid "Changes applied"
+msgstr "Cambios aplicados"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58
 msgid "Name cannot be null or empty"
 msgstr "El nombre no puede ser nulo o vacío"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
-msgid "Progress measurements: "
-msgstr "Medidas de progreso: "
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:43
+msgid "LDAP configuration"
+msgstr "Configuración del LDAP"
 
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32
 msgid "Queue Element Information"
 msgstr "Información de elemento de cola"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:136
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:31
-msgid "Create Order"
-msgstr "Crear proyecto"
-
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22
 msgid "Virtual Workers Groups List"
 msgstr "Lista de grupos de trabajadores virtuales"
@@ -4034,13 +4034,13 @@ msgstr "Lista de grupos de trabajadores virtuales"
 msgid "Cost Variance"
 msgstr "Desviación en coste"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:470
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471
 msgid "criterion type does not allow resource hierarchy"
 msgstr "el tipo de criterio no permite jerarquía de recursos"
 
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:150
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95
 msgid "Total"
 msgstr "Total"
 
@@ -4053,25 +4053,26 @@ msgstr "Invalidar"
 msgid "Budget hours"
 msgstr "Horas del presupuesto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:150
 msgid "Edit task: {0}"
 msgstr "Editar tarea: {0}"
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:53
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:52
 msgid "Select destination"
 msgstr "Seleccionar destino"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529
+#: libreplan-webapp/src/main/webapp/planner/order.zul:92
+#: libreplan-webapp/src/main/webapp/planner/order.zul:98
+msgid "Check consolidated progresses"
+msgstr "Marcar progresos consolidados"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530
 msgid "must be greater than the previous date."
 msgstr "debe ser mayor que la fecha anterior"
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22
-msgid "LibrePlan: Advanced allocation"
-msgstr "LibrePlan: Asignación avanzada"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1481
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:583
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585
 msgid "Show all"
 msgstr "Mostrar todo"
 
@@ -4080,19 +4081,20 @@ msgid "Estimated hours"
 msgstr "Horas estimadas"
 
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:59
 msgid "Default price"
 msgstr "Precio por defecto"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121
 msgid "Apply tab changes"
 msgstr "Aplicar cambios de la pestaña"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171
 msgid "passwords don't match"
 msgstr "las contraseñas no conciden"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:85
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:88
 msgid "Day properties"
 msgstr "Propiedades del día"
 
@@ -4108,7 +4110,7 @@ msgstr "Transferir"
 msgid "Work Hours Types List"
 msgstr "Lista de tipos de horas de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:62
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54
 msgid "new milestone"
 msgstr "nuevo hito"
 
@@ -4116,20 +4118,15 @@ msgstr "nuevo hito"
 msgid "Value last progress reported"
 msgstr "Valor último progreso notificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300
 msgid "Report Progress"
 msgstr "Notificar progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:154
-msgid "Unit {0} cannot be  removed because it is used in materials"
-msgstr ""
-"La unidad {0} no se puede borrar porque está siendo usada en materiales"
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:73
+msgid "Show dependencies"
+msgstr "Mostrar dependencias"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:133
-msgid "Create User"
-msgstr "Crear usuario"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339
 msgid "Schedule from start to deadline"
 msgstr "Planificar desde el principio a la fecha límite"
 
@@ -4139,33 +4136,43 @@ msgstr "Planificar desde el principio a la fecha límite"
 msgid "Estimated days"
 msgstr "Días estimados"
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:51
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:61
 msgid "Reference date"
 msgstr "Fecha de referencia"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46
-msgid "Selected node:"
-msgstr "Nodo seleccionado:"
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21
+msgid "LibrePlan: Estimated/Planned Hours Per Task"
+msgstr "LibrePlan: Horas por tarea estimadas/planificadas"
 
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
-msgid "LibrePlan: Task Scheduling Status In Project"
-msgstr "LibrePlan: Estado de planificación en proyecto"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
+msgid "From chosen date"
+msgstr "A partir de la fecha elegida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:249
-msgid "Create new project from template"
-msgstr "Crear nuevo proyecto a partir de plantilla"
-
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81
 msgid "Progress Evolution"
 msgstr "Evolución del progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:112
+#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22
+msgid "LibrePlan: Exception Days"
+msgstr "LibrePlan: Días de excepción"
+
+#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23
+msgid "LibrePlan: Work Hours"
+msgstr "LibrePlan: Horas de trabajo"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311
+msgid "LibrePlan Configuration"
+msgstr "LibrePlan: Configuración"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118
 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)"
 msgstr ""
 "Completa, parcialmente o no planificada. (Pinche y arrastre para mover "
 "tareas)"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
 msgid "Original"
 msgstr "Original"
 
@@ -4186,21 +4193,26 @@ msgstr "No indentable"
 msgid "Resource allocation type"
 msgstr "Tipo de asignación de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:491
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:493
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:71
 msgid "List of materials for all categories (select one to filter)"
 msgstr ""
 "Lista de materiales para todas las categorías (seleccione una para filtrar)"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:99
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:103
 msgid "User disabled"
 msgstr "Usuario deshabilitado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:733
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:35
+#: libreplan-webapp/src/main/webapp/common/error.zul:40
+msgid "Exception type"
+msgstr "Tipo de excepción"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:788
 msgid "In the available periods {0} only {1} hours are available."
 msgstr "En los períodos disponibles {0} solo {1} horas están disponibles."
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118
 msgid "Association with profiles"
 msgstr "Asociación con perfiles"
 
@@ -4213,20 +4225,32 @@ msgstr "Tarea {0} : Código duplicado en BD"
 msgid "Message - {0}"
 msgstr "Mensaje - {0}"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:121
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:21
+msgid "LibrePlan: Settings"
+msgstr "LibrePlan: Preferencias"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:124
 msgid "worker's surname not specified"
 msgstr "apellidos del trabajador no especificados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:211
-msgid "Error on removing workReportType: "
-msgstr "Error al borrar tipo de parte de trabajo: "
-
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41
 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:48
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:77
+msgid "Application settings"
+msgstr "Preferencias de la aplicación"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
+msgid "Average of estimated hours"
+msgstr "Media de horas estimadas"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:270
+msgid "Base"
+msgstr "Base"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682
 msgid ""
 "You can not remove the task \"{0}\" because of this or any of its children "
 "are already in use in some work reports"
@@ -4234,60 +4258,61 @@ msgstr ""
 "No puede borrar la tarea \"{0}\" porque alguno de sus hijos ya se está "
 "usando en algún parte de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:192
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203
 msgid "Total dedication"
 msgstr "Dedicación total"
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:45
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44
 msgid "Select source"
 msgstr "Seleccionar origen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:825
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:828
 msgid "Worker deleted"
 msgstr "Trabajador borrado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:735
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733
 msgid "Select entity, please"
 msgstr "Seleccionar entidad, por favor"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:293
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:291
 msgid "Stretch date must not be greater than the task's end date: "
 msgstr ""
 "La fecha de un tramo no debe ser mayor que la fecha de fin de la tarea: "
 
+#: libreplan-webapp/src/main/webapp/users/profiles.zul:23
+msgid "LibrePlan: Profiles"
+msgstr "LibrePlan: Perfiles"
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44
 msgid "Subcontratation date"
 msgstr "Fecha de subcontratación"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:212
-msgid "Number of digits:"
-msgstr "Número de dígitos:"
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22
+msgid "LibrePlan: Subcontracted Tasks"
+msgstr "LibrePlan: Tareas subcontratadas"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:93
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:182
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:96
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185
 msgid "Day"
 msgstr "Día"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:233
-msgid "Edit Label Type"
-msgstr "Editar tipo de etiqueta"
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:54
+msgid "Current password"
+msgstr "Contraseña actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:911
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1197
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:349
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:921
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1181
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:276
 msgid "Please, select an item"
 msgstr "Por favor, seleccione un elemento"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:180
-msgid "Work report type saved"
-msgstr "Tipo de partes de trabajo guardado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1122
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1096
 msgid "Cannot be higher than finish hour"
 msgstr "No puede ser mayor que la fecha de fin"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:225
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:204
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:223
 msgid "Prefix"
 msgstr "Prefijo"
 
@@ -4300,44 +4325,48 @@ msgstr "Código subcontratado"
 msgid "New Template element"
 msgstr "Nuevo elemento de plantilla"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
-msgid "LibrePlan: Hours Worked Per Worker In A Month"
-msgstr "LibrePlan: Horas trabajadas por trabajador en un mes"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:251
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:325
 msgid "The base calendar parent not found"
 msgstr "Calendario base padre no encontrado"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97
 msgid "Non Consolidated"
 msgstr "No consolidado"
 
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43
+msgid "From date"
+msgstr "A partir de la fecha"
+
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34
 msgid "Reassigning type"
 msgstr "Tipo de reasignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:295
-msgid "Edit Virtual Workers Group"
-msgstr "Editar grupo de trabajadores virtuales"
+#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22
+msgid "LibrePlan: Virtual Workers Groups"
+msgstr "LibrePlan: Grupos de trabajadores virtuales"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:190
+msgid "{0} \"{1}\" can not be deleted because of it is being used"
+msgstr "{0} \"{1}\" no se puede borrar porque está siendo usado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445
 msgid "Edit limiting resource element"
 msgstr "Editar elemento de recurso limitante"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:770
 msgid "The field name must be unique, not null and not empty"
 msgstr "El nombre del campo debe ser único, no nulo y no vacío"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85
 msgid "Position"
 msgstr "Posición"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:104
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:108
 msgid "Incorrect authentication"
 msgstr "Identificación incorrecta"
 
@@ -4351,15 +4380,15 @@ msgstr "Editar tarea"
 msgid "Edit work report"
 msgstr "Editar parte de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:45
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:44
 msgid "Limiting resources (project)"
 msgstr "Recursos limitantes (proyecto)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:764
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:672
 msgid "A description field of the same name already exists."
 msgstr "Ya existe un campo de descripción con el mismo nombre."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1174
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177
 msgid ""
 "Progress measurements that are reported by quality forms can not be removed"
 msgstr ""
@@ -4370,26 +4399,21 @@ msgstr ""
 msgid "Current value"
 msgstr "Valor actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:165
-msgid "Edit Quality Form"
-msgstr "Editar formulario de calidad"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:823
 msgid "Duplicate progress assignment for task "
 msgstr "Asignación de progreso duplicada para la tarea "
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:54
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:84
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94
 msgid "Save and Continue"
 msgstr "Guardar y continuar"
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:46
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:50
 msgid "Zoom level"
 msgstr "Nivel de zoom"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:166
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:29
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168
 msgid "Quality form"
 msgstr "Formulario de calidad"
 
@@ -4397,47 +4421,65 @@ msgstr "Formulario de calidad"
 msgid "Go!"
 msgstr "Ir!"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:271
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:30
+msgid "Inherits up to date"
+msgstr "Hereda hasta la fecha"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:280
 msgid "The name of the label is empty."
 msgstr "El nombre de la etiqueta está vacío."
 
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:26
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:27
 msgid "Profile data"
 msgstr "Datos del perfil"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:31
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:35
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:248
 msgid "Configuration"
 msgstr "Configuración"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java:99
-msgid "It was not possible load entity. Not found. Id: "
-msgstr "No ha sido posible cargar la entidad. No encontrada. Id: "
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:496
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:528
+msgid "This date can not be empty"
+msgstr "La fecha no puede ser vacía"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:569
+#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22
+msgid "LibrePlan: Workers"
+msgstr "LibrePlan: Trabajadores"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:572
 msgid "Create Virtual Workers Group"
 msgstr "Crear grupo de trabajadores virtuales"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:933
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:861
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:95
+msgid "Select type"
+msgstr "Seleccione tipo"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911
 msgid "Hours invested"
 msgstr "Horas invertidas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:160
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:324
+msgid "Authorization"
+msgstr "Autorización"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:119
 msgid ""
 "The name is not valid, there is another progress type with the same name. "
 msgstr ""
 "El nombre no es válido, ya hay otro tipo de progreso con el mismo nombre. "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318
 msgid "Project saved"
 msgstr "Proyecto guardado"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:45
-msgid "task :"
-msgstr "tarea :"
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44
+msgid "task"
+msgstr "tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:712
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:715
 msgid "ALL"
 msgstr "TODOS"
 
@@ -4445,11 +4487,11 @@ msgstr "TODOS"
 msgid "criterion satisfaction's resource not specified"
 msgstr "recurso del criterio satisfecho no especificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68
 msgid "Derived exception"
 msgstr "Excepción derivada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292
 msgid "Machines"
 msgstr "Máquinas"
 
@@ -4457,10 +4499,6 @@ msgstr "Máquinas"
 msgid "Unit Measures List"
 msgstr "Lista de unidades de medida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:222
-msgid "Confirm deleting this profile. Are you sure?"
-msgstr "Confirmar el borrado de este perfil. ¿Está seguro?"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153
 msgid "Couldn't find element: {0}"
 msgstr "No se pudo encontrar el elemento: {0}"
@@ -4474,27 +4512,23 @@ msgstr "Debe seleccionar un escenario de destino"
 msgid "unit type code not found"
 msgstr "código de tipo de unidad no encontrado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180
-msgid "Calendar Exception Type saved"
-msgstr "Tipo de excepción de calendario guardado"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342
+msgid "My account"
+msgstr "Mi cuenta"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:42
-msgid "Resource :"
-msgstr "Recurso :"
-
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:40
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39
 msgid "Destination scenario"
 msgstr "Escenario de destino"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:153
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:105
 msgid "Company view"
 msgstr "Vista de la compañía"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:18
-msgid "LibrePlan: Configuration"
-msgstr "LibrePlan: Configuración"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114
+msgid "Both"
+msgstr "Ambos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:751
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758
 msgid "Not editable for containing more that an hours group."
 msgstr "No editable por contener más de un grupo de horas."
 
@@ -4502,43 +4536,43 @@ msgstr "No editable por contener más de un grupo de horas."
 msgid "Filter by"
 msgstr "Filtrar por"
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:80
 msgid "Limiting resource"
 msgstr "Recurso limitante"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58
-#: libreplan-webapp/src/main/webapp/planner/order.zul:147
+#: libreplan-webapp/src/main/webapp/planner/order.zul:146
 msgid "Calendar allocation"
 msgstr "Asignación de calendario"
 
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
+msgid "Up to date"
+msgstr "Actualizado"
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:819
 msgid "Duplicate value true report global progress for task"
 msgstr ""
 "Valor verdadero duplicado para la propiedad 'notificar progreso global' en "
 "la tarea"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:85
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:84
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33
 msgid "Category"
 msgstr "Categoría"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:154
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:156
 msgid "must be greater than finish date"
 msgstr "debe ser mayor que la fecha de fin"
 
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
-msgid "LibrePlan: Materials Needs At Date"
-msgstr "LibrePlan: Necesidad de materiales en fecha"
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:202
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203
 msgid "[generic all workers]"
 msgstr "[genérico todos los trabajadores]"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27
 msgid "Category data"
 msgstr "Datos de categoría"
 
@@ -4546,18 +4580,30 @@ msgstr "Datos de categoría"
 msgid "Search"
 msgstr "Buscar"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:242
+msgid "Valid until"
+msgstr "Válido hasta"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128
 msgid "Add New Complementary Field"
 msgstr "Añadir nuevo campo complementario"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232
 msgid "Work weeks list"
 msgstr "Lista de las semanas de trabajo"
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:38
 msgid "Source scenario"
 msgstr "Escenario de origen"
 
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
+msgid "LibrePlan: Criteria"
+msgstr "LibrePlan: Criterios"
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23
+msgid "LibrePlan: Transfer Projects Between Scenarios"
+msgstr "LibrePlan: transferir proyectos entre escenarios"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118
 msgid "%"
 msgstr "%"
@@ -4567,25 +4613,28 @@ msgstr "%"
 msgid "Remove calendar"
 msgstr "Borrar calendario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1548
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1712
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:512
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:648
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1346
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:656
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:228
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:312
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:139
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141
 msgid "must be lower than finish date"
 msgstr "debe ser menor que la fecha de fin"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:757
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:161
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:766
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:41
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:70
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:135
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33
 msgid "Resource"
 msgstr "Recurso"
@@ -4598,16 +4647,16 @@ msgstr "Total de horas de tarea"
 msgid "Date last progress reported"
 msgstr "Fecha último progreso notificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:123
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125
 msgid "Could not load any resource"
 msgstr "No se pudo cargar un recurso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37
 msgid "Work And Progress Per Project"
 msgstr "Trabajo y progreso por proyecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:383
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:386
 msgid ""
 "You must allow multiple active criteria for this type to use this assignment "
 "strategy"
@@ -4623,80 +4672,64 @@ msgstr "sub elementos"
 msgid "Default Label"
 msgstr "Etiqueta por defecto"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:113
 msgid "Close"
 msgstr "Cerrar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:471
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945
 msgid "Specific Allocations"
 msgstr "Asignaciones específicas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:271
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:119
 msgid "error doing reassignation: {0}"
 msgstr "Error realizando la reasignación: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:349
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:423
 msgid "Time filter"
 msgstr "Filtro de tiempo"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:61
-msgid "Move selected task up"
-msgstr "Mover tarea seleccionada hacia arriba"
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27
 msgid "Select criteria set or specific resources for allocation"
 msgstr ""
 "Seleccione conjunto de criterios o recursos específicos para la asignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:316
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63
+msgid "Move selected task up"
+msgstr "Mover tarea seleccionada hacia arriba"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348
 msgid "Create copy"
 msgstr "Crear copia"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33
 msgid "Work Report Lines List"
 msgstr "Lista de líneas de parte de trabajo"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28
 msgid "Company data"
 msgstr "Datos de la empresa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:215
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151
 msgid "Unit type code cannot be empty"
 msgstr "El código del tipo de unidad no puede ser vacío"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
-msgid "Average of the estimated hours"
-msgstr "Media de horas estimadas"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:178
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:240
-msgid "Quality form saved"
-msgstr "Formulario de calidad guardado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:167
-msgid "Create Unit Type"
-msgstr "Crear tipo de unidad"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312
 msgid "Users"
 msgstr "Usuarios"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145
 msgid "Label Type fields"
 msgstr "Campos de tipo de etiqueta"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:105
 msgid "Hours Management"
 msgstr "Administración de horas"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:33
-msgid "New task:"
-msgstr "Nueva tarea :"
-
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:140
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:144
 msgid ""
 "Please use some of the compatible browsers: Chrome, Firefox, Safari or "
 "Epiphany."
@@ -4708,7 +4741,7 @@ msgstr ""
 msgid "specific allocation"
 msgstr "asignación específica"
 
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:147
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:148
 msgid "company name has to be unique. It is already used"
 msgstr "el nombre de la empresa debe ser único. Ya está siendo usado"
 
@@ -4725,28 +4758,24 @@ msgstr ""
 msgid "Template saved"
 msgstr "Plantilla guardada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:305
-msgid "Confirm deleting this User. Are you sure?"
-msgstr "Confirmar el borrado de este usuario. ¿Está seguro?"
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:577
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:565
 msgid "work report have not any description value with this field name"
 msgstr ""
 "El parte de trabajo no tiene ningún valor de descripción con ese nombre de "
 "campo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179
-msgid "User saved"
-msgstr "Usuario guardado"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:23
+msgid "LibrePlan: Configuration"
+msgstr "LibrePlan: Configuración"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47
 msgid "Task quality form name"
 msgstr "Nombre del formulario de calidad de tarea"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1097
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:156
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:161
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:181
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1093
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:158
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:163
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:183
 msgid "Some cost category assignments overlap in time"
 msgstr "Algunas asignaciones a categorías de coste se solapan en el tiempo"
 
@@ -4770,49 +4799,49 @@ msgstr "Salir de la sesión"
 msgid "Group"
 msgstr "Grupo"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111
+msgid "Apply filter to"
+msgstr "Aplicar filtro a"
+
 #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
 msgid "Statistics list "
 msgstr "Lista de estadísticas "
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116
+msgid "Please, enter a valid effort"
+msgstr "Por favor, introduzca un esfuerzo válido"
+
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:59
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58
 msgid "Enabled"
 msgstr "Activado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143
-msgid "Edit Exception Day Type"
-msgstr "Editar tipo de día de excepción"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222
 msgid "All resources must be limiting. "
 msgstr "Todos los recursos deben ser limitantes. "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:327
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:525
 msgid "Filter by worker"
 msgstr "Filtrar por trabajadores"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22
-msgid "LibrePlan: Machines"
-msgstr "LibrePlan: Máquinas"
-
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47
 msgid "Load due to current project"
 msgstr "Carga debido al proyecto actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1344
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305
 msgid "You are going to change the assignment function. Are you sure?"
 msgstr "Va a cambiar la función de asignación. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322
 msgid "Exception Days"
 msgstr "Días de excepción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:200
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:183
 msgid "There must be at least 2 stretches for doing interpolation"
 msgstr "Debe haber al menos dos tramos para hacer interpolación"
 
@@ -4820,59 +4849,58 @@ msgstr "Debe haber al menos dos tramos para hacer interpolación"
 msgid "Incompatible update: stored resource is not of type: {0}"
 msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:42
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:213
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:98
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:109
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114
 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:42
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:82
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:132
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:137
 msgid "Save & Continue"
 msgstr "Guardar y continuar"
 
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
+msgid "LibrePlan: Work And Progress Per Project"
+msgstr "LibrePlan: Trabajo y Progreso por Proyecto"
+
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:90
 msgid "Scheduling mode"
 msgstr "Modo de planificación"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:53
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:55
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23
 msgid "Filter"
 msgstr "Filtrar"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:943
+msgid "Work Report Type"
+msgstr "Tipo de parte de trabajo"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:26
 msgid "Assigned locations"
 msgstr "Ubicaciones asignadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:247
-msgid "Unit type saved"
-msgstr "Tipo de unidad guardado"
-
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:267
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:129
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:138
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:270
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:131
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:140
 msgid "Two hour costs with the same type overlap in time"
 msgstr "Dos costes por hora con el mismo tipo se solapan en el tiempo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:201
-msgid "Create Machine"
-msgstr "Crear máquina"
-
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49
 msgid "Report progress"
 msgstr "Notificar progreso"
@@ -4881,7 +4909,7 @@ msgstr "Notificar progreso"
 msgid "ACWP"
 msgstr "ACWP"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:736
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:791
 msgid "The periods available depend on the resource's calendar."
 msgstr "Los períodos de disponibilidad dependen del calendario del recurso."
 
@@ -4889,7 +4917,7 @@ msgstr "Los períodos de disponibilidad dependen del calendario del recurso."
 msgid "START"
 msgstr "INICIO"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342
 msgid "Schedule from the deadline to start"
 msgstr "Planificar desde la fecha límite al principio"
 
@@ -4897,18 +4925,18 @@ msgstr "Planificar desde la fecha límite al principio"
 msgid "generic machines allocation"
 msgstr "asignación genérica de máquinas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:372
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:375
 msgid "Non limiting resource assignation"
 msgstr "Asignación de recursos no limitantes"
 
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:82
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
 msgid "Back"
 msgstr "Atrás"
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58
 msgid "Subcontractor"
 msgstr "Subcontratista"
 
@@ -4917,22 +4945,18 @@ msgstr "Subcontratista"
 msgid "Administration"
 msgstr "Administración"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1531
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1694
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:495
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:631
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1329
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:638
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:211
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:293
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:239
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242
 msgid "must be greater than start date"
 msgstr "debe ser mayor que la fecha de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:93
-msgid "Create Company"
-msgstr "Crear empresa"
-
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47
 msgid "Cancel and return"
 msgstr "Cancelar y volver"
@@ -4942,7 +4966,6 @@ msgstr "Cancelar y volver"
 msgid "Assign quality form"
 msgstr "Asignar formulario de calidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387
 msgid "Delete item {0}. Are you sure?"
 msgstr "Borrar elemento {0}. ¿Está seguro?"
@@ -4951,16 +4974,15 @@ msgstr "Borrar elemento {0}. ¿Está seguro?"
 msgid "worked hours"
 msgstr "horas trabajadas"
 
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:50
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:51
 msgid "Unit measure name"
 msgstr "Nombre de la unidad de medida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:772
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144
 msgid "cannot include a progress of the same progress type twice"
 msgstr "no se puede asignar un progreso del mismo tipo dos veces"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:489
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:476
 msgid "a work report line has not this label type assigned"
 msgstr "una línea de parte de trabajo no tiene este tipo de etiqueta asignada"
 
@@ -4969,35 +4991,34 @@ msgstr "una línea de parte de trabajo no tiene este tipo de etiqueta asignada"
 msgid "Allocations"
 msgstr "Asignaciones"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:32
-msgid "Choosing Template"
-msgstr "Selección de plantilla"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52
 msgid "Task code"
 msgstr "Código de la tarea"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49
 msgid "Length"
 msgstr "Longitud"
 
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:85
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89
 msgid "Capacity"
 msgstr "Capacidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:299
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133
 msgid "Create derived"
 msgstr "Crear derivado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:627
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:302
+msgid "Label Types"
+msgstr "Tipos de etiqueta"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:638
 msgid "it must be greater than zero"
 msgstr "debe ser mayor que cero"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
 msgid "must be a real positive number"
 msgstr "debe ser un número real positivo"
 
@@ -5010,36 +5031,35 @@ msgstr "No se han hecho asignaciones"
 msgid "Total hours task"
 msgstr "Total de horas de tarea"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:409
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:441
 msgid "Removed calendar \"{0}\""
 msgstr "Borrado calendario \"{0}\""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1083
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063
 msgid "Create project"
 msgstr "Crear proyecto"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:49
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:542
+msgid "This date can not include the whole next work week"
+msgstr "Esta fecha no puede incluir a la próxima semana de trabajo completa"
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:51
 msgid ""
 "Allow multiple values of this type of criterion in the same period of time"
 msgstr ""
 "Permitir valores múltiples para este tipo de criterio en el mismo período de "
 "tiempo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294
 msgid ""
 "The date is not valid, the date must be unique for this progress assignment"
 msgstr "La fecha no es válida, debe ser única para esta asignación de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:113
-msgid "Edit Criterion Type"
-msgstr "Editar tipo de criterio"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:445
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:453
 msgid "The code cannot be empty."
 msgstr "El código no puede estar vacío"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
 msgid "Human hours per machine working hour within configuration unit"
 msgstr ""
 "Horas humanas por hora de trabajo de máquina dentro de unidad de "
@@ -5058,12 +5078,20 @@ msgstr ""
 msgid "New work report"
 msgstr "Nuevo parte de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865
 msgid "yes"
 msgstr "sí"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:304
+msgid "Root calendar"
+msgstr "Calendario raíz"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:263
+msgid "Port"
+msgstr "Puerto"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862
 msgid ""
 "Deleting this subcontracted project, you are going to lose the relation to "
 "report progress. Are you sure?"
@@ -5084,17 +5112,17 @@ msgstr "Fecha de fin"
 msgid "Validate"
 msgstr "Validar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:143
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:175
 msgid "This resource has already been added."
 msgstr "Este recurso ya ha sido añadido."
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:149
 msgid "Calendar exception types"
 msgstr "Tipos de excepciones de calendario"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
 msgid "Cost category assignment"
 msgstr "Asignación de categoría de coste"
 
@@ -5102,14 +5130,10 @@ msgstr "Asignación de categoría de coste"
 msgid "missing code in a hour cost"
 msgstr "falta código en un coste por hora"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:822
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870
 msgid "All workers"
 msgstr "Todos los trabajadores"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:304
-msgid "Label saved"
-msgstr "Etiqueta guardada"
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25
 msgid "Select criteria or resources"
 msgstr "Seleccione criterios o recursos"
@@ -5121,44 +5145,47 @@ msgid "Select required criteria set and press filter button"
 msgstr ""
 "Seleccione conjunto de criterios requeridos y pulse el botón de filtrar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1018
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1279
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:990
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1181
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1438
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:229
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:231
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:233
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:280
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:380
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:147
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:740
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:135
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:63
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:47
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:72
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:49
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:44
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:50
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:84
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:88
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:93
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:33
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:53
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:42
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:44
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:94
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:92
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:94
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:44
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:55
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:44
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96
@@ -5169,10 +5196,6 @@ msgstr "no puede ser nulo o vacío"
 msgid "Hours Group {0} : Duplicate code in DB"
 msgstr "Grupo de horas {0} : Código duplicado en BD"
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
-msgid "LibrePlan: Work And Progress Per Project"
-msgstr "LibrePlan: Trabajo y Progreso por Proyecto"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:52
 msgid "New code"
@@ -5182,25 +5205,21 @@ msgstr "Código nuevo"
 msgid "The progress type cannot be modified"
 msgstr "El tipo de progreso no puede ser modificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:412
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392
 msgid "Calculate Resources per Day"
 msgstr "Calcular recursos por día"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:996
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:904
 msgid "The index fields and labels must be uniques and consecutives"
 msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas"
 
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21
-msgid "LibrePlan: Estimated/Planned Hours Per Task"
-msgstr "LibrePlan: Horas por tarea estimadas/planificadas"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130
 msgid "Estimate To Complete"
 msgstr "Estimación del coste pendiente"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:84
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:83
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30
 msgid "Unit type"
 msgstr "Tipo de unidad"
@@ -5213,21 +5232,17 @@ msgstr "Carga debido a otras asignaciones"
 msgid "Sum of all task leafs imputed hours"
 msgstr "Suma de horas imputadas por todas las tareas hoja"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:644
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554
 msgid "This machine was already removed by other user"
 msgstr "Esta máquina ya ha sido borrada por otro usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293
-msgid "Work Reports"
-msgstr "Partes de trabajo"
-
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:26
 msgid "Calendar data"
 msgstr "Datos del calendario"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:173
-msgid "login name is already being used by another user"
-msgstr "el nombre de usuario ya está siendo usado"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294
+msgid "Work Reports"
+msgstr "Partes de trabajo"
 
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22
 msgid "Cost Categories List"
@@ -5237,31 +5252,33 @@ msgstr "Lista de Categorías de Coste"
 msgid "code is already used"
 msgstr "el código ya está siendo usado"
 
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:67
+msgid "Labels list"
+msgstr "Lista de etiquetas"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152
 msgid "Criterion Requirements"
 msgstr "Criterios requeridos"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:148
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:215
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76
 msgid "Extra Effort"
 msgstr "Esfuerzo extra"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:57
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59
 msgid "Move selected task down"
 msgstr "Mover tarea seleccoinada hacia abajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:260
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269
 msgid "Already exists other label with the same name"
 msgstr "Ya existe otra etiqueta con el mismo nombre"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:32
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32
 msgid "Customer Reference"
 msgstr "Referencia de cliente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:777
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147
 msgid "spread values are not valid, at least one value should be true"
@@ -5280,15 +5297,15 @@ msgstr "Optimista"
 msgid "SV"
 msgstr "SV"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:85
 msgid "Our company login"
 msgstr "Nombre de usuario de nuestra empresa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1483
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1471
 msgid "Filter work reports"
 msgstr "Filtrar partes de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:395
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:427
 msgid ""
 "Default calendar cannot be removed. Please, change the default calendar in "
 "the Configuration window before."
@@ -5296,10 +5313,10 @@ msgstr ""
 "El calendario por defecto no se puede. Por favor, cambie antes el calendario "
 "por defecto en la ventana de configuración."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:587
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:932
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63
@@ -5307,7 +5324,7 @@ msgstr ""
 msgid "Progress"
 msgstr "Progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:128
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:257
 msgid ""
 "This criterion type cannot be deleted because it has assignments to projects "
 "or resources"
@@ -5315,31 +5332,27 @@ msgstr ""
 "Este tipo de criterio no se puede borrar porque tiene asignaciones a "
 "proyectos o recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1221
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224
 msgid "All progress types have already been assigned."
 msgstr "Todos los tipos de progreso ya han sido asignados."
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
 msgid "Price per hour"
 msgstr "Precio por hora"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:209
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211
 msgid "Project: {0} "
 msgstr "Proyecto: {0} "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315
 msgid "Calendars"
 msgstr "Calendarios"
 
-#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21
-msgid "LibrePlan: Page not found"
-msgstr "LibrePlan: Página no encontrada"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:355
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:360
 msgid "The date cannot be null"
 msgstr "La fecha no puede ser nula"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:317
 msgid ""
 "Another task in the same branch is already reporting progress for this "
 "quality form"
@@ -5347,6 +5360,10 @@ msgstr ""
 "Otra tarea en la misma rama ya está informando de un progreso para este "
 "formulario de calidad"
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30
+msgid "options"
+msgstr "opciones"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92
 msgid "Latest date"
 msgstr "Fecha más tardía"
@@ -5355,13 +5372,18 @@ msgstr "Fecha más tardía"
 msgid "Show only current satisfied criteria"
 msgstr "Mostrar solo los criterios satisfechos actualmente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23
+msgid "LibrePlan: Work Reports"
+msgstr "LibrePlan: Partes de trabajo"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373
 msgid "Error on showing delete confirm"
 msgstr "Error al mostrar la confirmación de borrado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:671
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623
 msgid "Sum of all rows"
 msgstr "Suma de todas las filas"
 
@@ -5377,15 +5399,11 @@ msgstr "Hora de fin"
 msgid "Done {0} of {1}"
 msgstr "Hecho {0} de {1}"
 
-#: libreplan-webapp/src/main/webapp/users/users.zul:23
-msgid "LibrePlan: Accounts"
-msgstr "LibrePlan: Cuentas"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31
+msgid "Planned start"
+msgstr "Inicio planificado"
 
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23
-msgid "LibrePlan: Scenarios Management"
-msgstr "LibrePlan: Gestión de Escenarios"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:194
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:177
 msgid ""
 "Last stretch should have one hundred percent for length and amount of work "
 "percentage"
@@ -5393,12 +5411,12 @@ msgstr ""
 "El último tramo debe tener 100% de porcentajes de longitud y cantidad de "
 "trabajo"
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:60
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:96
 msgid "Filter by projects"
 msgstr "Filtrar por proyectos"
 
@@ -5406,17 +5424,17 @@ msgstr "Filtrar por proyectos"
 msgid "Criteria of selected type "
 msgstr "Criterios del tipo seleccionado "
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33
 msgid "Each worker configuration unit name"
 msgstr "Nombre de la unidad de configuración de cada trabajador"
 
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:224
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:221
 msgid "Active"
 msgstr "Activo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1258
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261
 msgid "This progress measurement can not be in "
 msgstr "Esta medida de progreso no puede estar en "
 
@@ -5424,7 +5442,7 @@ msgstr "Esta medida de progreso no puede estar en "
 msgid "Inherited labels"
 msgstr "Etiquetas heredadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1243
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246
 msgid ""
 "This progress can not be changed or removed, because it has got consolidated "
 "progress. It is needed to remove the consolidation on all its progress."
@@ -5434,12 +5452,12 @@ msgstr ""
 "progreso."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:910
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917
 msgid "Unindent"
 msgstr "Desindentar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:932
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1390
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384
 msgid "Value is not valid, the current value must be not empty"
 msgstr "El valor no es válido, el valor actual no debe ser vacío"
 
@@ -5447,7 +5465,11 @@ msgstr "El valor no es válido, el valor actual no debe ser vacío"
 msgid "Direct labels"
 msgstr "Etiquetas directas"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:92
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43
+msgid "From today"
+msgstr "A partir de hoy"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:96
 msgid "Log in"
 msgstr "Entrar"
 
@@ -5455,15 +5477,15 @@ msgstr "Entrar"
 msgid "Project name"
 msgstr "Nombre del proyecto"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55
 msgid "Precision"
 msgstr "Precisión"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:372
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:359
 msgid "missing code in a work report line"
 msgstr "falta código en una línea de parte de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:985
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928
 msgid "Efforts"
 msgstr "Esfuerzos"
 
@@ -5471,32 +5493,30 @@ msgstr "Esfuerzos"
 msgid "Show all reported hours"
 msgstr "Mostrar todas las horas notificadas"
 
-#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22
-msgid "LibrePlan: Subcontracted Tasks"
-msgstr "LibrePlan: Tareas subcontratadas"
-
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113
 msgid "Projects List"
 msgstr "Lista de proyectos"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:137
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:65
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:49
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:51
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:52
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:136
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:44
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:80
 msgid "Generate code"
 msgstr "Generar código"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:116
 msgid "Scheduling state"
 msgstr "Estado de planificación"
 
@@ -5508,19 +5528,27 @@ msgstr "Esta plantilla no se puede borrar porque tiene aplicaciones."
 msgid "The code sequence is already in use and it can not be updated."
 msgstr "El código de secuencia ya está en uso y no se puede actualizar."
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21
-msgid "LibrePlan: Project Costs Per Resource"
-msgstr "LibrePlan: costes de proyecto por recurso"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:332
+msgid "Import LDAP roles"
+msgstr "Importar roles del LDAP"
+
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:43
+msgid "Personal Data"
+msgstr "Datos personales"
 
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:206
 msgid "criterion satisfaction's criterion not specified"
 msgstr "criterio del criterio satisfecho no especificado"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
+msgid "LibrePlan: Hours Worked Per Resource"
+msgstr "LibrePlan: Horas Trabajadas Por Recurso"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:163
 msgid "Number of iterations should be between 1 and "
 msgstr "El número de iteraciones debería estar entre 1 y "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:126
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142
 msgid "Scenarios must be enabled as more elements than master exist"
 msgstr ""
 "Los escenarios deben estar habilitados ya que existen más elementos que "
@@ -5540,11 +5568,11 @@ msgstr "Tarea {0} : El grupo de tareas tiene un tipo incompatible con {1}"
 msgid "Profiles authorization"
 msgstr "Autorización de perfiles"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293
 msgid "Virtual Workers Groups"
 msgstr "Grupos de trabajadores virtuales"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:144
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:95
 msgid "Planning charts expanded"
 msgstr "Gráficos de planificación expandidos"
 
@@ -5552,14 +5580,26 @@ msgstr "Gráficos de planificación expandidos"
 msgid "Assignation"
 msgstr "Asignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:431
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:694
+msgid "Inh"
+msgstr "Her"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:339
 msgid "Not deletable"
 msgstr "Imborrable"
 
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28
+msgid "Administrator"
+msgstr "Administrador"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:189
 msgid "Doing {0} reassignations"
 msgstr "Realizando {0} reasignaciones"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:195
+msgid "Select entity"
+msgstr "Seleccione entidad"
+
 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48
 msgid "code not specified"
 msgstr "código no especificado"
@@ -5568,7 +5608,7 @@ msgstr "código no especificado"
 msgid "Projects list"
 msgstr "Lista de proyectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:190
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:973
 msgid ""
 "Cannot delete work report type. There are some work reports bound to it."
 msgstr ""
@@ -5579,41 +5619,41 @@ msgstr ""
 msgid "Criterion Type List"
 msgstr "Lista de tipos de criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:732
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:702
 msgid "Overall progress"
 msgstr "Progreso global"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:52
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54
 msgid "Create template from selected task"
 msgstr "Crear plantilla a partir de tarea seleccionada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:119
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:129
 msgid "All projects"
 msgstr "Todos los proyectos"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:79
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:83
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:284
 msgid "Password"
 msgstr "Contraseña"
 
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:93
 msgid "Observations"
 msgstr "Observaciones"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:962
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942
 msgid "Edit project"
 msgstr "Editar proyecto"
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:27
 msgid "Progress assignments"
 msgstr "Asignaciones de progreso"
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:27
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:285
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:262
 msgid "Valid from"
 msgstr "Válido desde"
 
@@ -5625,24 +5665,24 @@ msgstr "la fecha de excepción ya existe"
 msgid "There exists other template with the same name."
 msgstr "Ya existe otra plantilla con el mismo nombre."
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53
 msgid "Month"
 msgstr "Mes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:900
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:911
 msgid "{0} could not be allocated. Cannot allocate more than one resource"
 msgstr "No se pudo asignar {0}. No se puede asignar más que un recurso"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:56
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
 msgid "Color"
 msgstr "Color"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759
-msgid "Advanced assignment saved"
-msgstr "Asignación avanzada guardada"
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:105
+msgid "Current password is incorrect"
+msgstr "La contraseña actual es incorrecta"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367
 msgid "Cannot insert material in general view. Please, select a category"
 msgstr ""
 "No se puede insertar material en la vista general. Por favor, seleccione una "
@@ -5652,36 +5692,40 @@ msgstr ""
 msgid "criterion satisfaction's start date not specified"
 msgstr "fecha de inicio del criterio satisfecho no especificada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:371
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405
 msgid "Only {0} resources per day were achieved for current allocation"
 msgstr "Sólo se han logrado {0} recursos por día para la asignación actual"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311
+msgid "Delete {0} \"{1}\". Are you sure?"
+msgstr "Borrar {0} \"{1}\". ¿Está seguro?"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:79
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:97
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
-#: libreplan-webapp/src/main/webapp/planner/order.zul:69
-#: libreplan-webapp/src/main/webapp/planner/order.zul:132
-#: libreplan-webapp/src/main/webapp/planner/order.zul:167
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:83
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:43
+#: libreplan-webapp/src/main/webapp/planner/order.zul:70
+#: libreplan-webapp/src/main/webapp/planner/order.zul:131
+#: libreplan-webapp/src/main/webapp/planner/order.zul:166
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79
 #: libreplan-webapp/src/main/webapp/planner/main.zul:66
 msgid "Accept"
 msgstr "Aceptar"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:259
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:266
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:273
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:280
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:308
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:339
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:346
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:353
 msgid "Example: {0}"
 msgstr "Ejemplo: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:283
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:303
-#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:40
-msgid "Edit Worker"
-msgstr "Editar trabajador"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:458
 msgid ""
 "Create new material assignment out of material assignment {0}. Are you sure?"
@@ -5689,7 +5733,7 @@ msgstr ""
 "Crear nueva asignación de material fuera de la asignación de material {0}. "
 "¿Está seguro?"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:190
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:167
 msgid "Work report lines"
 msgstr "Líneas del parte de trabajo"
@@ -5698,17 +5742,11 @@ msgstr "Líneas del parte de trabajo"
 msgid "Calculated"
 msgstr "Calculado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:213
 msgid "Completed: {0}% "
 msgstr "Completado: {0}% "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:118
-msgid "Error setting up edition form for Criterion Type with id: {0}"
-msgstr ""
-"Error preparando el formulario de edición para el tipo de criterio con id: "
-"{0}"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1178
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181
 msgid "Calculated progress measurement can not be removed"
 msgstr "Las medidas de progreso calculadas no se pueden borrar"
 
@@ -5717,22 +5755,22 @@ msgstr "Las medidas de progreso calculadas no se pueden borrar"
 msgid " The "
 msgstr " El "
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:51
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:55
 msgid "Access to the system"
 msgstr "Acceso al sistema"
 
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:48
 msgid "Probability"
 msgstr "Probabilidad"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159
 msgid "Click on "
 msgstr "Click en"
 
@@ -5757,16 +5795,20 @@ msgstr "instancia no encontrada"
 msgid "Priority"
 msgstr "Prioridad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:207
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:219
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80
 msgid "Infinitely Over Assignable"
 msgstr "Sobreasignable infinitamente"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:425
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47
+msgid "Apply changes and continue edition"
+msgstr "Aplicar cambios y continuar la edición"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426
 msgid "criterion names must be unique inside a criterion type"
 msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:735
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:790
 msgid ""
 "The periods available depend on the satisfaction of the criteria by the "
 "resources and their calendars."
@@ -5774,52 +5816,53 @@ msgstr ""
 "Los períodos disponibles dependen de la satisfacción de criterios por los "
 "recursos y sus calendarios."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:814
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:79
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:59
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:287
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:44
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:131
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:264
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:69
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:47
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:76
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:59
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:81
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:36
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:49
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:80
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:51
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:76
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116
 msgid "Code"
 msgstr "Código"
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:41
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40
 msgid "Add stretch"
 msgstr "Añadir tramo"
 
@@ -5831,7 +5874,7 @@ msgstr "Mostrar las asignaciones de recursos"
 msgid "Assignation type"
 msgstr "Tipo de asignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:387
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367
 msgid "Calculate Workable Days"
 msgstr "Calcular días laborables"
 
@@ -5843,16 +5886,17 @@ msgstr ""
 "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior "
 "a la fecha de fin"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:55
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:53
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117
 msgid "Start date"
 msgstr "Fecha de inicio"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:171
 msgid "Update exception"
 msgstr "Actualizar excepción"
 
@@ -5865,8 +5909,7 @@ msgstr "No se puede efectuar la operación"
 msgid "Budget"
 msgstr "Presupuesto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "May"
 msgstr "Mayo"
 
@@ -5874,7 +5917,7 @@ msgstr "Mayo"
 msgid "Already exists other criterion with the same name"
 msgstr "Ya existe otro criterio con el mismo nombre"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38
 msgid "Unit name"
 msgstr "Nombre de la unidad"
 
@@ -5883,10 +5926,6 @@ msgstr "Nombre de la unidad"
 msgid "Write"
 msgstr "Escribir"
 
-#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21
-msgid "LibrePlan: Labels"
-msgstr "LibrePlan: Etiquetas"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35
@@ -5895,7 +5934,7 @@ msgstr "LibrePlan: Etiquetas"
 msgid "Project code"
 msgstr "Código del proyecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:499
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503
 msgid "Assign element to queue automatically"
 msgstr "Asignar elemento a la cola automáticamente"
 
@@ -5911,32 +5950,27 @@ msgstr ""
 "Fecha después de la cual la tarea debe empezar (presione enter en el cuadro "
 "de texto para abrir el calendario o escriba la fecha directamente)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:326
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:603
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43
 msgid "Normal"
 msgstr "Normal"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:317
 msgid "Date cannot be null"
 msgstr "La fecha no puede ser nula"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:765
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:169
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:108
+msgid "Project view"
+msgstr "Vista de proyecto"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:774
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:166
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:76
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:142
 msgid "Task Code"
 msgstr "Código de la tarea"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:157
-msgid "Project view"
-msgstr "Vista de proyecto"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:96
-msgid "Create Profile"
-msgstr "Crear perfil"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:747
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:655
 msgid "This label type already is assigned to the work report type."
 msgstr "Este tipo de etiqueta ya está asignado al tipo de parte de trabajo."
 
@@ -5951,50 +5985,52 @@ msgstr "Probabilidad %"
 msgid "New criterion"
 msgstr "Criterio nuevo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:730
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:346
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:542
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:700
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:813
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49
 msgid "Load"
 msgstr "Carga"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:937
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:60
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:682
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:65
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:82
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:81
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:41
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:120
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:101
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51
 msgid "Description"
 msgstr "Descripción"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
-msgid "LibrePlan: Criteria"
-msgstr "LibrePlan: Criterios"
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:45
+msgid "Apply"
+msgstr "Aplicar"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117
-msgid "Go to advanced Allocation"
-msgstr "Ir a asignación avanzada"
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48
+msgid "Selected node"
+msgstr "Nodo seleccionado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:660
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:671
 msgid "already exists an allocation for criteria {0}"
 msgstr "ya existe una asignación para los criterios {0}"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288
 msgid "Project Templates"
 msgstr "Plantillas de proyectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339
 msgid "Forward"
 msgstr "Adelante"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:465
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469
 msgid "Invalid queue element"
 msgstr "elemento de cola inválido"
 
@@ -6008,21 +6044,22 @@ msgstr "Número de aplicaciones finalizadas"
 msgid "Unnasigned"
 msgstr "No asignado"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:70
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:163
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:74
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165
 msgid "User"
 msgstr "Usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405
 msgid "At least one HoursGroup is needed"
 msgstr "Es necesario al menos un grupo de horas"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71
 msgid "Interacts with applications"
 msgstr "Interactúa con aplicaciones"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:257
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:289
 msgid "Virtual worker"
 msgstr "Trabajador virtual"
 
@@ -6030,26 +6067,22 @@ msgstr "Trabajador virtual"
 msgid "Length percentage should be between 0 and 100"
 msgstr "El porcentaje de duración debería estar entre 0 y 100"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:48
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:50
 msgid "Multiple values per resource"
 msgstr "Múltiples valores por recurso"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
-msgid "Hours:"
-msgstr "Horas:"
-
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:62
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58
 msgid "Split"
 msgstr "Dividir"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:101
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:105
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:107
 msgid "please, select a project"
 msgstr "por favor, seleccione un proyecto"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:118
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:122
 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers"
 msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany"
 
@@ -6059,14 +6092,14 @@ msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany"
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:94
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51
 msgid "Starting date"
 msgstr "Fecha de inicio"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:63
 msgid "Add materials"
 msgstr "Añadir materiales"
 
@@ -6074,66 +6107,61 @@ msgstr "Añadir materiales"
 msgid "Load 100%"
 msgstr "Carga 100%"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:991
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84
 msgid "Function"
 msgstr "Función"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:775
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:394
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:745
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:364
 msgid "date in future"
 msgstr "fecha en el futuro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:654
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:630
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851
 msgid "New project version"
 msgstr "Nueva versión de proyecto"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:156
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:137
 msgid "Format"
 msgstr "Formato"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:174
-msgid "Edit Unit Type"
-msgstr "Editar tipo de unidad"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:332
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:474
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1249
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:472
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:532
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:27
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:24
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:39
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:41
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:48
 msgid "Edit"
 msgstr "Editar"
 
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
 msgid "Init date"
 msgstr "Fecha de inicio"
 
@@ -6141,7 +6169,11 @@ msgstr "Fecha de inicio"
 msgid "Responsible"
 msgstr "Responsable"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:457
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:60
+msgid "New password"
+msgstr "Nueva contraseña"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352
 msgid "percentage must be in range (0,100]"
 msgstr "el porcentaje debe pertenecer al rango (0,100]"
 
@@ -6150,7 +6182,7 @@ msgstr "el porcentaje debe pertenecer al rango (0,100]"
 msgid "New Description"
 msgstr "Descripción nueva"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1154
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150
 msgid ""
 "resources cost category assignment codes must be unique inside a resource"
 msgstr ""
@@ -6171,22 +6203,23 @@ msgstr ""
 "satisfecho con el mismo tipo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61
+#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:85
 msgid "Unable to convert {0} value to {1} type"
 msgstr "No se pudo convertir el valor {0} al tipo {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:198
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:114
 msgid "Tree {0} sucessfully flattened"
 msgstr "Árbol {0} aplanado satisfactoriamente"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:83
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:82
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31
 msgid "Unit price"
 msgstr "Precio de la unidad"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64
 msgid "Project Code"
 msgstr "Código del proyecto"
 
@@ -6198,17 +6231,11 @@ msgstr "Fecha de comunicación"
 msgid "Reassigning"
 msgstr "Reasignando"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:588
-msgid ""
-"Cannot delete that cost category because there are resources assigned to it."
-msgstr ""
-"No se puede borrar la categoría de coste porque hay recursos asignados a "
-"ella."
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:633
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:644
 msgid "{0} already assigned to resource allocation list"
 msgstr "{0} ya está en la lista de asignación de recursos"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:184
 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:27
 msgid "Unit Measure"
 msgstr "Unidad de medida"
@@ -6224,14 +6251,13 @@ msgstr "Lista de Tipos de Etiqueta"
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:128
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:46
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:98
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:127
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:101
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:42
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
@@ -6241,25 +6267,25 @@ msgstr "Lista de Tipos de Etiqueta"
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:36
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:83
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:123
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:103
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:144
 msgid "Type"
 msgstr "Tipo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:346
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:347
 msgid "{0} projects reassignation remaining"
 msgstr "quedan {0} proyectos por reasignar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:637
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:542
 msgid ""
 "This machine cannot be deleted because it has assignments to projects or "
 "imputed hours"
@@ -6267,13 +6293,16 @@ msgstr ""
 "Esta máquina no se puede borrar porque tiene asignaciones a proyectos u "
 "horas imputadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "November"
 msgstr "Noviembre"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1310
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:89
+msgid "Enable/Disable"
+msgstr "Habilitar/Deshabilitar"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304
 msgid ""
 "Value is not valid, the value must be greater than the value of the previous "
 "progress."
@@ -6289,58 +6318,56 @@ msgstr "BCWS"
 msgid " in the specified directory."
 msgstr " en el directorio especificado."
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1148
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144
 msgid "criterion satisfaction codes must be unique inside a resource"
 msgstr "el código del criterio debe ser único dentro de un recurso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865
 msgid "no"
 msgstr "no"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:360
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:347
 msgid "missing code in a work report."
 msgstr "falta el código en un parte de trabajo."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:85
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:105
 msgid "Criterion"
 msgstr "Criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:94
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:103
 msgid "unl"
 msgstr "ili"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:76
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:290
+msgid "Test LDAP connection"
+msgstr "Probar la conexión con el LDAP"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:96
 msgid "Generate code for"
 msgstr "Generar código para"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:397
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:481
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:468
 #: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103
 msgid "missing code in a label"
 msgstr "falta el código en una etiqueta"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:139
-msgid "is not supported for its use with LibrePlan."
-msgstr "no está soportado para su uso con LibrePlan."
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:123
 msgid "Actual Cost Work Performed"
 msgstr "Coste de trabajo realizado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:185
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172
 msgid "Create project from Template"
 msgstr "Crear proyecto a partir de plantilla"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310
-msgid "LibrePlan Configuration"
-msgstr "LibrePlan: Configuración"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:406
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
@@ -6350,10 +6377,6 @@ msgstr ""
 " El código no puede contener caracteres como '_' \n"
 " y no debe ser vacío"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51
-msgid "Average of the worked hours"
-msgstr "Media de horas trabajadas"
-
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43
 msgid "an authorization type must be set"
 msgstr "debe seleccionar un tipo de autorización"
@@ -6362,8 +6385,7 @@ msgstr "debe seleccionar un tipo de autorización"
 msgid "Must start after (days since beginning project)"
 msgstr "Debe empezar después de (días desde el inicio del proyecto)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:653
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:629
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850
 msgid ""
 "Confirm creating a new project version for this scenario and derived. Are "
 "you sure?"
@@ -6371,58 +6393,67 @@ msgstr ""
 "Confirmar la creación de una nueva versión del proyecto para este escenario "
 "y sus derivados. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:150
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:68
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:44
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:74
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:45
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:73
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:80
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:163
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:92
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:133
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105
 msgid "Add"
 msgstr "Añadir"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:47
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:43
+#: libreplan-webapp/src/main/webapp/common/error.zul:48
+msgid "Stacktrace"
+msgstr "Stacktrace"
+
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:48
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:82
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120
 msgid "Unselect"
 msgstr "Deseleccionar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:609
 msgid "You should select the type of exception"
 msgstr "Debe seleccionar el tipo de excepción"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:99
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46
 msgid "Deadline"
 msgstr "Fecha límite"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
+msgid "Tasks"
+msgstr "Tareas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299
 msgid "Subcontracted Tasks"
 msgstr "Tareas subcontratadas"
 
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:118
 msgid "Filter by categories or materials"
 msgstr "Filtrar por categorías o materiales"
 
@@ -6430,7 +6461,7 @@ msgstr "Filtrar por categorías o materiales"
 msgid "Amount work percentage should be between 0 and 100"
 msgstr "El porcentaje de cantidad de trabajo debe estar entre 0 y 100"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:29
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
 msgid "Machine data"
 msgstr "Datos de la máquina"
 
@@ -6438,19 +6469,18 @@ msgstr "Datos de la máquina"
 msgid "VAC"
 msgstr "VAC"
 
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:28
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:29
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55
 msgid "Label type"
 msgstr "Tipo de etiqueta"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:246
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:319
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:243
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236
 msgid "Advanced Allocation"
 msgstr "Asignación avanzada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:309
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310
 msgid "Administration / Management"
 msgstr "Administración / Gestión"
 
@@ -6462,8 +6492,8 @@ msgstr "Número de iteraciones"
 msgid "Template Tree"
 msgstr "Árbol de plantillas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:499
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
 msgid "Alpha"
 msgstr "Alfa"
 
@@ -6476,54 +6506,63 @@ msgstr "El criterio tiene subelementos"
 msgid "inconsistent parent code."
 msgstr "código padre inconsistente."
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:430
+msgid "effort is not properly calculated based on clock"
+msgstr "el esfuerzo no está bien calculado basándose en el reloj"
+
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:63
 msgid "Status"
 msgstr "Estado"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:163
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:111
 msgid "Resource load view"
 msgstr "Vista de carga de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763
-msgid "the date must be inside the visualization area"
-msgstr "la fecha debe estar dentro del área de visualización"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:84
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:34
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:69
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:76
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34
 msgid "Hours"
 msgstr "Horas"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:733
+msgid "the date must be inside the visualization area"
+msgstr "la fecha debe estar dentro del área de visualización"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56
 msgid "Quality form type"
 msgstr "Tipo de formulario de calidad"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:405
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:392
 msgid "work report has not this label type assigned"
 msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1230
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192
 msgid "Limiting assignment"
 msgstr "Asignación limitante"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523
 msgid "date not specified."
 msgstr "fecha no especificada."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:360
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318
+msgid "{0} \"{1}\" deleted"
+msgstr "{0} \"{1}\" borrado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364
 msgid " hours"
 msgstr " horas"
 
@@ -6531,43 +6570,40 @@ msgstr " horas"
 msgid "The name of the criterion is empty."
 msgstr "El nombre del criterio está vacío."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:281
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:134
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:147
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145
 msgid "Limiting Resources Planning"
 msgstr "Asignación de recursos limitantes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:770
-msgid "The max value must be not empty"
-msgstr "el valor máximo no puede ser vacío"
-
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:66
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69
 msgid "New label"
 msgstr "Nueva etiqueta"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:134
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:137
 msgid "Worker ID cannot be empty"
 msgstr "NIF del trabajador no especificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:177
-msgid "All project tasks"
-msgstr "Todas las tareas del proyecto"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352
 msgid "The start date cannot be null"
 msgstr "La fecha de inicio no puede ser nula"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:188
+msgid "All project tasks"
+msgstr "Todas las tareas del proyecto"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:367
+msgid "LDAP Roles (separated by ;)"
+msgstr "Roles del LDAP (separados por ;)"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27
 msgid "Allocation configuration"
 msgstr "Configuración de asignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:125
-msgid "Scenario \"{0}\" saved"
-msgstr "Escenario \"{0}\" guardado"
-
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:215
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:209
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:189
 msgid "Save & New work report"
 msgstr "Guardar y nuevo parte de trabajo"
@@ -6576,38 +6612,42 @@ msgstr "Guardar y nuevo parte de trabajo"
 msgid "Subcontract price"
 msgstr "Precio de subcontratación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:744
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:799
 msgid "Resources per day are zero"
 msgstr "Hay cero recursos por día"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
 msgid "Assigned criteria"
 msgstr "Criterios asignados"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:53
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:57
 msgid "Help on authentication (opens a new window)"
 msgstr "Ayuda sobre la identificación (abre una ventana nueva)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:870
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:778
 msgid "The length must be greater than 0, and not null."
 msgstr "La longitud debe ser mayor que cero y no nula."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:39
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54
 msgid "Not a valid effort duration"
 msgstr "No es una duración de esfuerzo válida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:544
+#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:199
+msgid "Cannot remove the predefined Exception Day Type \"{0}\""
+msgstr "No se puede el tipo de día de excepción predefinido \"{0}\""
+
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34
+msgid "Base calendar type"
+msgstr "Tipo de calendario base"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:613
 msgid "Could not save new calendar"
 msgstr "No se pudo guardar el calendario nuevo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1467
-msgid "Sigmoid function applied to current resource"
-msgstr "Función sigmoide aplicada al recurso actual"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:160
-msgid "Deleted unit type {0}"
-msgstr "Borrado tipo de unidad {0}"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35
+msgid "Planned end"
+msgstr "Fin planificado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:224
 msgid "Could not save the scenario"
@@ -6617,43 +6657,40 @@ msgstr "No se pudo guardar el escenario"
 msgid "Couldn't find criterion {0}"
 msgstr "No se pudo encontrar el criterio {0}"
 
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:35
 msgid "Apply filtering to tasks satisfying required criteria"
 msgstr "Aplicar filtrado a las tareas que satisfacen los criterios requeridos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37
 msgid "Task Scheduling Status In Project"
 msgstr "Estado de planificación de tareas en un proyecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:345
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:887
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313
 msgid "Confirm"
 msgstr "Confirmar"
 
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:32
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:32
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:51
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48
 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:52
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:54
 msgid "Create"
 msgstr "Crear"
 
@@ -6662,76 +6699,76 @@ msgstr "Crear"
 msgid "Permissions"
 msgstr "Permisos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1728
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1734
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1716
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1722
 msgid "please, select a work report type"
 msgstr "por favor, seleccione un tipo de parte de trabajo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:486
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:487
 msgid "List of materials for category: {0}"
 msgstr "Lista de materiales para la categoría {0}"
 
+#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36
+msgid "Cancel edition"
+msgstr "Cancelar la edición"
+
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
 msgid "Total price"
 msgstr "Precio total"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:436
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1230
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:786
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1044
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1295
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46
+msgid "Labels without inheritance"
+msgstr "Etiquetas sin herencia"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:344
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:886
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1207
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1454
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:138
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:126
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:362
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:223
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:306
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1265
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1204
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:694
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:948
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:954
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:232
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:92
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:66
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:44
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213
@@ -6740,19 +6777,19 @@ msgstr "Precio total"
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127
 msgid "Delete"
 msgstr "Borrar"
 
@@ -6776,43 +6813,99 @@ msgstr "cabecera"
 msgid "line"
 msgstr "línea"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:150
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34
+msgid "Use browser language configuration"
+msgstr "Utilizar la configuración de idioma del navegador"
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:35
+msgid "Galician"
+msgstr "Gallego"
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
+msgid "Spanish"
+msgstr "Español"
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:37
+msgid "English"
+msgstr "Inglés"
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:38
+msgid "Russian"
+msgstr "Ruso"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172
 msgid "unlimited"
 msgstr "ilimitado"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99
 msgid "Monday"
 msgstr "Lunes"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99
 msgid "Tuesday"
 msgstr "Martes"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100
 msgid "Thursday"
 msgstr "Jueves"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100
 msgid "Friday"
 msgstr "Viernes"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100
 msgid "Saturday"
 msgstr "Sábado"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:85
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101
 msgid "Sunday"
 msgstr "Domingo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31
+msgid "red (default)"
+msgstr "rojo (defecto)"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32
+msgid "green"
+msgstr "verde"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33
+msgid "blue"
+msgstr "azul"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34
+msgid "cyan"
+msgstr "cian"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35
+msgid "magenta"
+msgstr "magenta"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36
+msgid "yellow"
+msgstr "amarillo"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37
+msgid "black"
+msgstr "negro"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38
+msgid "orange"
+msgstr "naranja"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39
+msgid "purple"
+msgstr "púrpura"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139
 msgid "Yes"
 msgstr "Sí"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139
 msgid "No"
 msgstr "No"
 
@@ -6820,35 +6913,19 @@ msgstr "No"
 msgid "STRATEGIC RESOURCE"
 msgstr "RECURSO ESTRATÉGICO"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:37
-msgid "WORK_RELATIONSHIP"
-msgstr "RELACIÓN_DE_TRABAJO"
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:39
+msgid "LOCATION"
+msgstr "LOCALIZACIÓN"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:43
-msgid "LOCATION_GROUP"
-msgstr "GRUPO_DE_LOCALIZACIÓN"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:50
-msgid "MACHINE LOCATION_GROUP"
-msgstr "GRUPO_DE_LOCALIZACIÓN DE MÁQUINAS"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:58
-msgid "LEAVE"
-msgstr "BAJA"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:64
-msgid "TRAINING"
-msgstr "FORMACIÓN"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:70
-msgid "JOB"
-msgstr "TRABAJO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:76
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:46
 msgid "CATEGORY"
 msgstr "CATEGORÍA"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:206
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:53
+msgid "SKILL"
+msgstr "HABILIDAD"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
 msgid "[generic all machines]"
 msgstr "[genérico todas las máquinas]"
 
@@ -6888,15 +6965,15 @@ msgstr "por porcentaje"
 msgid "by items"
 msgstr "por items"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:107
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109
 msgid "Hours cost type cannot be empty or null"
 msgstr "Tipo de coste de horas no puede ser vacío o nulo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:116
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118
 msgid "Init date cannot be empty or null"
 msgstr "La fecha de inicio no puede ser vacía o nula"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:121
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123
 msgid "End date cannot be empty or null"
 msgstr "La fecha de fin no puede ser vacía o nula"
 
@@ -6940,7 +7017,7 @@ msgstr ""
 "El valor de las horas de trabajo no es válido, teniendo en cuenta la lista "
 "actual de grupos de horas"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:577
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618
 msgid ""
 "Some ancestor has the same label assigned, so this element is already "
 "inheriting this label"
@@ -6948,17 +7025,17 @@ msgstr ""
 "Algún ancestro tiene la misma etiqueta asignada, por lo que este elemento ya "
 "está heredando esa etiqueta"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:676
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963
 msgid "Cannot spread two progress in the same task"
 msgstr "No pueden propagar dos progresos en la misma tarea"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:700
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:726
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767
 msgid "Duplicate Progress Assignment For Task"
 msgstr "Asignación de progreso duplicada para la tarea"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1053
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094
 msgid "Quality form already exists"
 msgstr "El formulario de calidad ya existe"
 
@@ -7060,14 +7137,18 @@ msgid "You can not modifiy this entity sequence, it is already in use"
 msgstr "No puede modificar esta secuencia de entidade, ya está en uso"
 
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36
+msgid "Spreading progress"
+msgstr "Progreso que propaga"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
 msgid "Progress with all tasks by hours"
 msgstr "Progreso con todas las tareas por horas"
 
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
 msgid "Progress with critical path tasks by hours"
 msgstr "Progreso con las tareas en el camino crítico por horas"
 
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
 msgid "Progress with critical path tasks by duration"
 msgstr "Progreso con las tareas del camino crítico por duración"
 
@@ -7088,19 +7169,19 @@ msgstr "Envío fallido"
 msgid "Success sent"
 msgstr "Envío exitoso"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:58
-msgid "None"
-msgstr "Ninguno"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76
+msgid "Flat"
+msgstr "Plano"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:59
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78
 msgid "Stretches"
 msgstr "Tramos"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:60
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79
 msgid "Interporlation"
 msgstr "Interpolación"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:61
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80
 msgid "Sigmoid"
 msgstr "Sigmoide"
 
@@ -7188,9 +7269,3 @@ msgstr "La hora debería tener un valor entre 0 y 23"
 msgid "A queue dependency has to have an origin different from destiny"
 msgstr ""
 "Una dependencia de la cola tiene que ter un origen diferente de su destino"
-
-#~ msgid "Derived from {0}"
-#~ msgstr "Derivado de {0}"
-
-#~ msgid "{0} is already child of another {1}"
-#~ msgstr "{0} ya es hijo de otro {1}"
diff --git a/libreplan-webapp/src/main/resources/i18n/gl.po b/libreplan-webapp/src/main/resources/i18n/gl.po
index 3d6fb6703..31a7c0b82 100644
--- a/libreplan-webapp/src/main/resources/i18n/gl.po
+++ b/libreplan-webapp/src/main/resources/i18n/gl.po
@@ -1,19 +1,19 @@
-# Galician translations for LibrePlan package
-# Traducciones al español para el paquete LibrePlan.
+# Galician translations for LibrePlan - Webapp module
+# Traducciones al español para Libreplan - módulo Webapp
 # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
 #                         Desenvolvemento Tecnolóxico de Galicia
 # Copyright (C) 2010-2011 Igalia, S.L.
 # This file is distributed under the same license as the LibrePlan package.
 # Jacobo Aragunde Pérez <jaragunde@igalia.com>, 2009, 2010.
-# Manuel Rego Casasnovas <mrego@igalia.com>, 2010, 2011.
+# Manuel Rego Casasnovas <rego@igalia.com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1.0\n"
+"Project-Id-Version: 1.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-09 16:17+0200\n"
-"PO-Revision-Date: 2011-08-09 16:35+0200\n"
-"Last-Translator: Manuel Rego Casasnovas <mrego@igalia.com>\n"
+"POT-Creation-Date: 2011-11-11 09:11+0100\n"
+"PO-Revision-Date: 2011-11-11 09:25+0100\n"
+"Last-Translator: Manuel Rego Casasnovas <rego@igalia.com>\n"
 "Language-Team: Galician <>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:368
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:373
 msgid "The resource cannot be null"
 msgstr "O recurso non pode ser nulo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:419
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:336
+msgid "Group path"
+msgstr "Path do grupo"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420
 msgid "criterion codes must be unique inside a criterion type"
 msgstr "o código do criterio debe ser único dentro dun tipo de criterio"
 
@@ -34,29 +38,23 @@ msgid "No authorizations were added because you did not select any."
 msgstr "Non se engadiron actualizacións porque non se seleccionou ningunha."
 
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:59
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:45
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:54
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58
 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71
 msgid "en"
 msgstr "gl"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:192
 msgid "Origin"
 msgstr "Orixe"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:165
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168
 msgid "Create exception"
 msgstr "Crear excepción"
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41
 msgid "Select report data"
 msgstr "Seleccione data do informe"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:399
-msgid "Up to company view"
-msgstr "Arriba á vista da compañía"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:207
 msgid "there exist multiple resource calendars with name {0}"
 msgstr "existen múltiples calendarios de recursos co nome {0}"
@@ -65,40 +63,40 @@ msgstr "existen múltiples calendarios de recursos co nome {0}"
 msgid "Create Virtual Worker"
 msgstr "Crear traballador virtual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:98
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:830
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:87
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:86
 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:69
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
@@ -110,45 +108,49 @@ msgstr "Crear traballador virtual"
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:34
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:231
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:229
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54
 msgid "Operations"
 msgstr "Operacións"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:150
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:536
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:151
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:523
 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:135
 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:195
 msgid "There is no type of work hours with this code"
 msgstr "Non hai un tipo de horas de traballo con este código"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:112
 msgid "Select"
 msgstr "Seleccionar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1355
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:215
+msgid "Work report removed successfully"
+msgstr "Parte de traballo borrado con éxito"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1514
 msgid "It can not be empty"
 msgstr "Non pode estar baleiro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:145
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55
@@ -162,57 +164,57 @@ msgstr "Materiais"
 msgid "Reassign"
 msgstr "Reasignar"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64
 msgid "Description cannot be null or empty"
 msgstr "A descrición non pode ser nula ou baleira"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:79
-msgid "login name not specified"
-msgstr "nome de usuario non especificado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:79
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:362
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:72
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:269
 msgid "MonteCarlo Method"
 msgstr "Método de Montecarlo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:292
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:229
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:247
 msgid "Project Scheduling"
 msgstr "Planificación de proxecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
 msgid "February"
 msgstr "Febreiro"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:29
 msgid "Managing fields and labels"
 msgstr "Administrar campos e etiquetas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:356
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:269
 msgid "Please, select a calendar"
 msgstr "Por favor, seleccione un calendario"
 
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170
 msgid "Predefined"
 msgstr "Predefinido"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:267
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
 msgid "Summary"
 msgstr "Resumo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53
 msgid "Quality Forms"
 msgstr "Formularios de calidade"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331
 msgid "Reports"
 msgstr "Informes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:337
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22
+msgid "LibrePlan: Advanced allocation"
+msgstr "LibrePlan: Asignación avanzada"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340
 msgid ""
 "The original workable days value {0}, is prevented because consolidated "
 "values cannot be modified"
@@ -220,24 +222,24 @@ msgstr ""
 "O valor orixinal de días laborais {0}, evíatase porque os valores "
 "consolidados non poden ser modificados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172
 msgid "The {0} sequence prefixes can not be repeated"
 msgstr "Os prefixos da secuencia de {0} non poden repetirse"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:82
 msgid "Criterion requirements"
 msgstr "Criterios requiridos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:285
 msgid "Stretch date must not be less than task start date: "
 msgstr "A data do tramo debe ser maior ou igual cá data de inicio da tarefa: "
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:66
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:68
 msgid "Dedication chart"
 msgstr "Gráfico de dedicación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:701
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:728
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729
 msgid "Progress that are reported by quality forms can not be modified"
 msgstr ""
 "O progreso notificado por formularios de calidade non se pode modificar"
@@ -246,33 +248,34 @@ msgstr ""
 msgid "Not the same hours group, impossible to update"
 msgstr "Non están no mesmo grupo de horas, imposible actualizar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:520
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
+msgid "Own exception"
+msgstr "Excepción propia"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:522
 msgid "Cannot delete that material because it is assigned to a project."
 msgstr "Non se pode borrar ese material porque está asignado a un proxecto."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:475
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479
 msgid "Remove limiting resource element"
 msgstr "Borrar elemento de recurso limitante"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:275
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:141
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:155
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150
 msgid "Resource Usage"
 msgstr "Uso de recursos"
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40
 msgid "Active period from"
 msgstr "Período activo desde"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:52
-msgid "hours type :"
-msgstr "tipo de horas :"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:481
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:485
 msgid "Unassign"
 msgstr "Desasignar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:295
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296
 msgid "Companies"
 msgstr "Empresas"
 
@@ -280,7 +283,7 @@ msgstr "Empresas"
 msgid "Manual assignment"
 msgstr "Asignación manual"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75
 msgid "Quality form items list"
 msgstr "Lista de elementos do formulario de calidade"
 
@@ -291,16 +294,22 @@ msgid ""
 msgstr ""
 "A data de fin non é válida, a nova data de fin debe ser posterior á actual"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:903
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128
+msgid "Create {0}: {1}"
+msgstr "Crear {0}: {1}"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51
 msgid "generic workers allocation"
 msgstr "Asignación xenérica de traballadores"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:914
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:516
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308
 msgid "The project has no scheduled elements"
 msgstr "O proxecto no ten elementos planificados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:796
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806
 msgid "Hour start"
 msgstr "Hora de inicio"
 
@@ -322,11 +331,11 @@ msgstr "categoría da asignación de custo non especificada"
 msgid "Delete Template element"
 msgstr "Borrar elemento de modelo"
 
-#: libreplan-webapp/src/main/webapp/planner/order.zul:90
-#: libreplan-webapp/src/main/webapp/planner/order.zul:97
-msgid "Progress Consolidation"
-msgstr "Consolidación de progreso"
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22
+msgid "LibrePlan: Calendars"
+msgstr "LibrePlan: Calendarios"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java:65
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java:66
 msgid "User with login name '{0}': not found"
 msgstr "Usuario con login '{0}': non atopado"
@@ -335,21 +344,12 @@ msgstr "Usuario con login '{0}': non atopado"
 msgid "Resources capability"
 msgstr "Capacidade de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:204
-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"
-
-#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
-msgid "Filter quality forms by :"
-msgstr "Filtrar formularios de calidade por :"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108
 msgid "changing perspective"
 msgstr "cambio de perspectiva"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:32
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31
 msgid "Transfer Projects Between Scenarios"
 msgstr "Transferir proxectos entre escenarios"
 
@@ -361,28 +361,24 @@ msgstr ""
 "Non se engadiron esas actualizacións ao perfil {0} porque xa estaban "
 "presentes."
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:55
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:63
 msgid "Default calendar"
 msgstr "Calendario por defecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:296
-msgid "Cannot delete user: it does not exist anymore"
-msgstr "Non se pode borrar o usuario: xa non existe"
-
-#: libreplan-webapp/src/main/webapp/users/profiles.zul:23
-msgid "LibrePlan: Profiles"
-msgstr "LibrePlan: Perfís"
-
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36
 msgid "Project Name"
 msgstr "Nome do proxecto"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:931
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938
 msgid "Indent"
 msgstr "Indentar"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:312
+msgid "Save passwords in database"
+msgstr "Gardar contrasinais na base de datos"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:255
 msgid "Reassignation"
 msgstr "Reasignación"
@@ -395,40 +391,54 @@ msgstr "Novo modelo"
 msgid "Total estimated hours"
 msgstr "Horas estimadas totais"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:130
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:144
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:22
+#: libreplan-webapp/src/main/webapp/common/error.zul:21
+msgid "LibrePlan: Runtime Error"
+msgstr "LibrePlan: Erro de execución"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:151
 msgid "Base calendar \"{0}\" saved"
 msgstr "Calendario base \"{0}\" gardado"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:174
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:177
 msgid "Exceptions list"
 msgstr "Lista de excepcións"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33
 msgid "Locations"
 msgstr "Ubicacións"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78
 msgid "New quality form item"
 msgstr "Novo elemento de formulario de calidade"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:41
+#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21
+msgid "LibrePlan: Labels"
+msgstr "LibrePlan: Etiquetas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242
+msgid "LDAP connection was successful"
+msgstr "A conexión co LDAP foi realizada con éxito"
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:43
 msgid "Login name"
 msgstr "Nome de usuario"
 
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29
+msgid "LibrePlan user"
+msgstr "Usuario de LibrePlan"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84
+msgid "{0} List"
+msgstr "{0} Lista"
+
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43
 msgid "Current"
 msgstr "Actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:632
-msgid "Machine deleted"
-msgstr "Máquina borrada"
-
-#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22
-msgid "LibrePlan: Progress Report"
-msgstr "LibrePlan: Informe de progreso"
-
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:67
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:63
 msgid "Dependencies"
 msgstr "Dependencias"
 
@@ -440,7 +450,7 @@ msgstr "falta código nunha excepción de calendario"
 msgid "Current selection"
 msgstr "Selección actual"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1134
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1130
 msgid ""
 "there exist criterion satisfactions referring to criterion types not "
 "applicable to this resource"
@@ -466,28 +476,32 @@ msgstr "Minutos"
 msgid "You can not remove a scenario with derived scenarios"
 msgstr "Non se pode borrar un escenario con escenarios derivados"
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23
-msgid "Create new version"
-msgstr "Crear versión nova"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:948
+msgid "Work Report Types"
+msgstr "Tipos de partes de traballo"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55
+msgid "Maximum/minimum of estimated hours"
+msgstr "Máximo/mínimo de horas estimadas"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22
+msgid "LibrePlan: Quality Forms"
+msgstr "LibrePlan: Formularios de calidade"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:63
 msgid "LIMITING"
 msgstr "LIMITANTE"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:324
-msgid "Derived"
-msgstr "Derivado"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:414
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:415
 msgid "a disabled resource has enabled subresources"
 msgstr "un recurso deshabilitado ten subrecursos habilitados"
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53
 msgid "Client"
 msgstr "Cliente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153
 msgid ""
 "there are no resources for required criteria: {0}. So the generic allocation "
@@ -496,11 +510,11 @@ msgstr ""
 "non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode "
 "engadir a asignación xenérica"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:446
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478
 msgid "Error on showing warning message removing calendar: "
 msgstr "Erro ao mostrar mensaxe de advertencia borrando un calendario: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:428
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:415
 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"
@@ -515,12 +529,12 @@ msgstr "o nome da categoría de materiais debe ser único. Xa está en uso"
 msgid "Imputed hours"
 msgstr "Horas imputadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37
 msgid "Project Costs Per Resource"
 msgstr "Custos do proxecto por recurso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143
 msgid "Confirm deleting this hour cost. Are you sure?"
 msgstr "Confirmar o borrado deste custo por hora. ¿Está seguro?"
@@ -529,15 +543,19 @@ msgstr "Confirmar o borrado deste custo por hora. ¿Está seguro?"
 msgid "Delete Milestone"
 msgstr "Borrar fito"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:152
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:155
 msgid "default password were not changed"
 msgstr "o contrasinal por defecto non foi cambiado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
+msgid "Type of hours"
+msgstr "Tipo de horas"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:48
 msgid "Non-assigned locations"
 msgstr "Ubicacións non asignadas"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:77
 msgid "Application URI"
 msgstr "URI da aplicación"
 
@@ -549,21 +567,22 @@ msgstr ""
 "{0} non é válido, criterionType solápase con outro criterionSatisfaction do "
 "mesmo criterionType"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332
 msgid "Work Report Lines"
 msgstr "Liñas do parte de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1514
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546
 msgid "Configure"
 msgstr "Configurar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "October"
 msgstr "Outubro"
 
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:58
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:57
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50
 msgid "First name"
 msgstr "Nome"
 
@@ -571,20 +590,16 @@ msgstr "Nome"
 msgid "Could not execute print command"
 msgstr "Non se puido executar o comando de impresión"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
 msgid "Complementary text fields"
 msgstr "Campos de texto complementario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:208
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:418
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:137
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:141
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:181
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200
 msgid "Confirm deleting {0}. Are you sure?"
 msgstr "Confirmar o borrado de {0}. ¿Está seguro?"
 
@@ -592,7 +607,7 @@ msgstr "Confirmar o borrado de {0}. ¿Está seguro?"
 msgid "Work Reports List"
 msgstr "Lista de partes de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313
 msgid "Accounts"
 msgstr "Contas"
 
@@ -600,7 +615,7 @@ msgstr "Contas"
 msgid "External code"
 msgstr "Código externo"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50
 msgid "Edit selected task"
 msgstr "Editar tarefa seleccionada"
 
@@ -610,32 +625,32 @@ msgstr "Ver"
 
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:84
 msgid "Limiting"
 msgstr "Limitante"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:60
 msgid "Required materials"
 msgstr "Materiales requiridos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:666
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677
 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"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341
 msgid "Backwards"
 msgstr "Atrás"
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:78
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77
 msgid "Version"
 msgstr "Versión"
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52
 msgid "Apply filtering to resources satisfying required criteria"
 msgstr "Aplicar filtrado aos recursos que satisfán os criterios requeridos"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106
 msgid "Up"
 msgstr "Arriba"
 
@@ -647,7 +662,7 @@ msgstr ""
 "CriterionType non válido, outro criterionSatisfaction solápase co mesmo "
 "criterionType"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:105
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:125
 msgid "Types of work hours"
 msgstr "Tipos de horas de traballo"
 
@@ -655,12 +670,7 @@ msgstr "Tipos de horas de traballo"
 msgid "EAC"
 msgstr "EAC"
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:43
-#: libreplan-webapp/src/main/webapp/common/error.zul:48
-msgid "Stacktrace:"
-msgstr "Stacktrace:"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:144
 msgid ""
 "Its planning is not in the current scene.\n"
 "Should change to any of the following scenarios:\n"
@@ -668,11 +678,11 @@ msgstr ""
 "A súa planificación non está no escenario actual.\n"
 "Debe cambiar a un dos seguintes:\n"
 
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:37
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39
 msgid "Predecessor"
 msgstr "Predecesor"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:189
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:172
 msgid "Some stretch has higher or equal values than the previous stretch"
 msgstr "Algún tramo ten valores maiores ou iguais có tramo anterior"
 
@@ -680,25 +690,7 @@ msgstr "Algún tramo ten valores maiores ou iguais có tramo anterior"
 msgid "Please select a task"
 msgstr "Por favor, seleccione unha tarefa"
 
-#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23
-msgid "LibrePlan: Cost Categories"
-msgstr "LibrePlan: Categorías de custo"
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:58
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:75
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62
-msgid "End date"
-msgstr "Data de fin"
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:255
-msgid "missing worker code in the work report"
-msgstr "falta código de traballador nun parte de traballo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:142
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101
 msgid ""
 "Value is not valid, the default max value must be greater than the precision "
 "value "
@@ -706,56 +698,56 @@ msgstr ""
 "O valor non é válido, o valor máximo por defecto debe ser maior có valor de "
 "precisión "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146
-msgid ""
-"You can not remove the company \"{0}\" because is already in use in some "
-"project or in some subcontrated task."
-msgstr ""
-"Non pode eliminar a empresa \"{0}\" porque está sendo utilizada nalgún "
-"proxecto ou nalgunha tarefa subcontrada."
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:58
+msgid "End date"
+msgstr "Data de fin"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:88
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245
+msgid "missing worker code in the work report"
+msgstr "falta código de traballador nun parte de traballo"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89
 msgid "profile name is already being used by another profile"
 msgstr "o nome do perfil xa está a ser usado por outro perfil"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:63
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:68
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:209
-msgid "Prefix:"
-msgstr "Prefixo:"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:107
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:112
 msgid "This project has already been added."
 msgstr "Este proxecto xa fora engadido."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:381
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:386
 msgid "The task code cannot be null"
 msgstr "O código da tarefa non pode ser nulo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32
 msgid "Criteria"
 msgstr "Criterios"
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134
 msgid "Resource / Criteria"
 msgstr "Recurso / Criterios"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:26
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:27
 msgid "User data"
 msgstr "Datos do usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97
-msgid "Error setting up creation form."
-msgstr "Erro preparando o formulario de creación."
-
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44
 msgid "Lines"
 msgstr "Liñas"
@@ -764,12 +756,16 @@ msgstr "Liñas"
 msgid "Add new progress assignment"
 msgstr "Engadir nova asignación de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:193
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32
+msgid "Set Filter Options"
+msgstr "Establecer as opcións de filtrado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:977
 msgid "Error on showing warning message removing workReportType: "
 msgstr ""
 "Erro ao mostrar mensaxe de advertencia borrando tipo de parte de traballo: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:624
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:633
 msgid "Edit Work Report"
 msgstr "Editar parte de traballo"
 
@@ -781,36 +777,35 @@ msgstr "Lista de formularios de calidade"
 msgid "Project version is the same in source and destination scenarios"
 msgstr "A versión do proxecto é a mesma nos escenarios de orixe e destino"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:30
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
 msgid "Personal data"
 msgstr "Datos persoais"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:732
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733
 msgid "Calculated progress can not be removed"
 msgstr "O progreso calculado non se pode borrar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:299
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:162
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:158
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:202
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202
 msgid "please, select a Criterion"
 msgstr "por favor, seleccione un criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationModel.java:127
-msgid "Project does not exist"
-msgstr "O proxecto non existe"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:112
+msgid "Work reports"
+msgstr "Partes de traballo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143
 msgid "{0} annotation required on {1}"
 msgstr "{0} anotación obrigatoria en {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "June"
 msgstr "Xuño"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1031
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038
 msgid "Modified"
 msgstr "Modificado"
 
@@ -822,14 +817,14 @@ msgstr "Engadir criterio"
 msgid "You can not remove the current scenario"
 msgstr "Non se pode borrar o escenario actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:648
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653
 msgid "format prefix invalid. It cannot be empty or contain whitespaces."
 msgstr ""
 "formato de prefixo inválido. Non pode estar baleiro ou conter espazos en "
 "branco."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:89
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:334
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:338
 msgid "MessagesContainer is needed"
 msgstr "É necesario un MessagesContainer"
 
@@ -841,10 +836,14 @@ msgstr "Código da tarefa"
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56
 msgid "Ending date"
 msgstr "Data de fin"
 
+#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21
+msgid "LibrePlan: Page not found"
+msgstr "LibrePlan: Páxina non atopada"
+
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:21
 msgid "Templates List"
 msgstr "Lista de modelos"
@@ -853,7 +852,7 @@ msgstr "Lista de modelos"
 msgid "Export options"
 msgstr "Opcións de exportación"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:229
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:227
 msgid "Last value"
 msgstr "Último valor"
 
@@ -861,7 +860,11 @@ msgstr "Último valor"
 msgid "Subcontracted Tasks List"
 msgstr "Lista de tarefas subcontratadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:705
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51
+msgid "Average of worked hours in finished applications"
+msgstr "Media de horas traballadas nas aplicacións finalizadas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706
 msgid "Calculated progress can not be modified"
 msgstr "O progreso calculado non se pode modificar"
 
@@ -869,40 +872,51 @@ msgstr "O progreso calculado non se pode modificar"
 msgid "Statistics log"
 msgstr "Histórico de estadísticas"
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:51
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:58
+msgid "Work done from starting date"
+msgstr "Traballo realizado desde a data de inicio"
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40
 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
 msgid "Edit Calendar"
 msgstr "Editar calendario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:112
+msgid "Profile"
+msgstr "Perfil"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37
 msgid "Materials Needs At Date"
 msgstr "Necesidades de materiais en data"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:277
+msgid "UserDn"
+msgstr "UserDn"
+
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:52
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:59
 msgid "Cannot be empty or null"
 msgstr "Non pode ser baleiro ou nulo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:275
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300
 msgid "filtering"
 msgstr "filtrado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233
+msgid "{0} \"{1}\" saved"
+msgstr "{0} \"{1}\" gardado"
+
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:33
 msgid "Total Budget"
 msgstr "Presuposto total"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:53
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:55
 msgid "Hierarchy"
 msgstr "Xerarquía"
 
-#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23
-msgid "LibrePlan: Work Hours"
-msgstr "LibrePlan: Horas de traballo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:830
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:833
 msgid ""
 "This worker cannot be deleted because it has assignments to projects or "
 "imputed hours"
@@ -910,6 +924,10 @@ msgstr ""
 "Este traballador non se pode borrar porque ten asignacións a proxectos ou "
 "horas imputadas"
 
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62
+msgid "Work done until ending date"
+msgstr "Traballo realizado ata a data de fin"
+
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:22
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:26
 msgid "Print configuration"
@@ -919,19 +937,23 @@ msgstr "Imprimir configuración"
 msgid "Overload due to other assignments"
 msgstr "Sobrecarga debido a outras asignacións"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117
+msgid "Types of hours"
+msgstr "Tipos de horas"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:149
 msgid "Time period saved"
 msgstr "Período de tiempo gardado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:305
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:168
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:206
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:164
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:205
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208
 msgid "This Criterion has already been added."
 msgstr "Este criterio xa fora engadido."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252
 msgid ""
 "Are you sure of changing the resource type? You will lose the criteria with "
 "different resource type."
@@ -939,7 +961,7 @@ msgstr ""
 "¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente tipo "
 "de recurso perderanse."
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:215
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:209
 msgid "add"
 msgstr "engadir"
 
@@ -947,16 +969,11 @@ msgstr "engadir"
 msgid "Unsaved changes will be lost. Would you like to continue?"
 msgstr "Perderánse os cambios sen gardar. Gustaríalle continuar?"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:35
-msgid "Filter work report by :"
-msgstr "Filtrar parte de traballo por :"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:38
 msgid "NON_LIMITING"
 msgstr "NON_LIMITANTE"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:290
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291
 msgid "Workers"
 msgstr "Traballadores"
 
@@ -965,8 +982,7 @@ msgid "Cannot remove {0}, since it is being used by some Exception Day"
 msgstr ""
 "Non se pode borrar {0} porque está a ser usado por algún día de excepción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "August"
 msgstr "Agosto"
 
@@ -974,11 +990,23 @@ msgstr "Agosto"
 msgid "Resources matching selected criteria"
 msgstr "Recursos que cumpren os criterios seleccionados"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27
+msgid "with"
+msgstr "con"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:297
+msgid "Label Type"
+msgstr "Tipo de etiqueta"
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:48
 msgid "Year"
 msgstr "Ano"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:67
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:327
+msgid "{0} \"{1}\" could not be deleted, it was already removed"
+msgstr "{0} \"{1}\" non puido ser borrado, xa fora eliminado"
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68
 msgid "profile name not specified"
 msgstr "nome do perfil non especificado"
 
@@ -986,50 +1014,42 @@ msgstr "nome do perfil non especificado"
 msgid "Date Start"
 msgstr "Data de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1281
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275
 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"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
-msgid "From Chosen"
-msgstr "A partir de elixidos"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
-#: libreplan-webapp/src/main/webapp/planner/order.zul:109
+#: libreplan-webapp/src/main/webapp/planner/order.zul:108
 msgid "Value"
 msgstr "Valor"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66
 msgid "Hour costs"
 msgstr "Custos por hora"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:718
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:773
 msgid "there are no valid periods for this calendar"
 msgstr "non hai períodos válidos para este calendario"
 
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:52
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93
 msgid "Add role"
 msgstr "Engadir rol"
 
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:41
-msgid "Edit Scenario"
-msgstr "Editar escenario"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1112
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:634
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271
 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"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:601
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:611
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453
 msgid "Repeated Project code {0} in Project {1}"
 msgstr "Código {0} de proxecto repetedio no proxecto {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:277
 msgid "Project from client"
 msgstr "Proxecto do cliente"
 
@@ -1045,39 +1065,36 @@ msgstr ""
 "O {0} non se pode asignar a este recurso. O seu intervalo solápase con outro "
 "criterio"
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66
-msgid "Work done until ending date:"
-msgstr "Traballo realizado ata a data de fin:"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:132
 msgid "Schedule Performance Index"
 msgstr "Índice de rendemento da planificación"
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135
 msgid "Earlier starting date"
 msgstr "Data de inicio máis cedo"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:27
 msgid "Type data"
 msgstr "Datos do tipo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314
 msgid "Profiles"
 msgstr "Perfís"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:800
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:256
+msgid "Host"
+msgstr "Host"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810
 msgid "Hour finish"
 msgstr "Hora de fin"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:173
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:165
 msgid "Perspectives"
 msgstr "Perspectivas"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:40
-msgid "Edit Work Report Type"
-msgstr "Editar tipo de parte de traballo"
-
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:104
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:107
 msgid "Workable time"
 msgstr "Tempo traballable"
 
@@ -1085,20 +1102,11 @@ msgstr "Tempo traballable"
 msgid "missing code in a subcategory"
 msgstr "falta código nunha subcategoría"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544
-msgid "Confirm deleting this cost category. Are you sure?"
-msgstr "Confirmar o borrado desta categoría de custo. ¿Está seguro?"
-
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:66
 msgid "Non limiting resource allocation"
 msgstr "Asignación de recursos non limitantes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:191
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:297
-msgid "Error removing element: "
-msgstr "Erro ao borrar elemento: "
-
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:40
 msgid "Company name"
 msgstr "Nome da empresa"
 
@@ -1111,16 +1119,15 @@ msgid "Split new assignment"
 msgstr "Dividir nova asignación"
 
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:53
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57
 msgid "Pagination"
 msgstr "Paxinación"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:265
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:286
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263
 msgid "Expiry date"
 msgstr "Data de vencemento"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342
 msgid ""
 "The operation does not perform because the task has progress reports that is "
 "spread associated with this quality form"
@@ -1137,41 +1144,32 @@ msgstr "Cambiar escenario"
 msgid "Critical path"
 msgstr "Camiño crítico"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260
 msgid ""
 "Deleting this item, it will disable the report progress option. Are you sure?"
 msgstr ""
 "Borrando este elemento, isto deshabilitará a opción de notificar progreso. "
 "¿Está seguro?"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:38
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:41
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:80
 msgid "Categories"
 msgstr "Categorías"
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:39
-#: libreplan-webapp/src/main/webapp/common/error.zul:44
-msgid "Status code:"
-msgstr "Código de estado:"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:46
 msgid "Project Details"
 msgstr "Detalles do proxecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:94
-msgid "Create Criterion Type"
-msgstr "Crear tipo de criterio"
-
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162
 msgid " to go to output directly"
 msgstr " ir á saída directamente"
 
@@ -1179,16 +1177,20 @@ msgstr " ir á saída directamente"
 msgid "Add new hours group"
 msgstr "Engadir novo grupo de horas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:219
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221
 msgid "Criteria: {0} "
 msgstr "Criterios: {0} "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:44
+msgid "Cancel changes and back to scheduling"
+msgstr "Cancelar cambios e volver á planificación"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
-#: libreplan-webapp/src/main/webapp/planner/order.zul:110
+#: libreplan-webapp/src/main/webapp/planner/order.zul:109
 msgid "Percentage"
 msgstr "Porcentaxe"
 
@@ -1196,7 +1198,7 @@ msgstr "Porcentaxe"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:71
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:81
 msgid "Company logo URL"
 msgstr "URL do logo da empresa"
 
@@ -1204,11 +1206,12 @@ msgstr "URL do logo da empresa"
 msgid "No worker selected"
 msgstr "Ningún traballador seleccionado"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:227
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:207
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:225
 msgid "Number of digits"
 msgstr "Número de díxitos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1651
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1639
 msgid "Task not found"
 msgstr "Tarefa non atopada"
 
@@ -1217,24 +1220,12 @@ msgstr "Tarefa non atopada"
 msgid "Total capability"
 msgstr "Capacidade total"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:732
-msgid "It not could remove the task "
-msgstr "Non se puido borrar a tarefa "
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:217
 msgid "Problems connecting with client web service"
 msgstr "Problemas conectando co servizo web cliente"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21
-msgid "LibrePlan: User access"
-msgstr "LibrePlan: Acceso de usuarios"
-
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:21
-msgid "LibrePlan: Materials"
-msgstr "LibrePlan: Materiais"
-
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:154
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:183
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186
 msgid "Exception Type"
 msgstr "Tipo de excepción"
 
@@ -1242,11 +1233,11 @@ msgstr "Tipo de excepción"
 msgid "Profiles List"
 msgstr "Listado de perfís"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:567
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:944
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:869
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
@@ -1258,7 +1249,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"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319
 msgid "Data Types"
 msgstr "Tipos de datos"
 
@@ -1267,25 +1258,25 @@ msgstr "Tipos de datos"
 msgid "Total hours"
 msgstr "Total de horas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:342
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:38
+msgid "Data"
+msgstr "Datos"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:343
 msgid "Reassigning {0} projects"
 msgstr "Reasignando {0} proxectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:84
-msgid "Create Work Hours Type"
-msgstr "Crear novo tipo de horas de traballo"
-
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55
 msgid "Filter by task status"
 msgstr "Filtrar por estado da tarefa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:528
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:430
-msgid "Select date:"
-msgstr "Seleccione data:"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:420
+msgid "Select date"
+msgstr "Seleccione data"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:635
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1105
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264
 msgid "You should select a end date for the exception"
 msgstr "Debe seleccionar unha data de fin para a excepción"
 
@@ -1293,7 +1284,7 @@ msgstr "Debe seleccionar unha data de fin para a excepción"
 msgid "Please try it again."
 msgstr "Por favor, volva a intentalo."
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:49
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:56
 msgid "Company code"
 msgstr "Código da empresa"
 
@@ -1301,57 +1292,54 @@ msgstr "Código da empresa"
 msgid "Unknown attribute '{0}' in class {1}"
 msgstr "Atributo descoñecido '{0}' na clase {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:714
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:717
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33
 msgid "NON LIMITING RESOURCE"
 msgstr "RECURSO NON LIMITANTE"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22
-msgid "LibrePlan: Workers"
-msgstr "LibrePlan: Traballadores"
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:90
+msgid "passwords can not be empty"
+msgstr "os contrasinais non poden estar baleiros"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:117
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:120
 msgid "Activation periods"
 msgstr "Períodos de activación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:390
 msgid "Passed"
 msgstr "Pasado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176
 msgid "already assigned"
 msgstr "xa asignado"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:68
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:509
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:131
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:119
-#: libreplan-webapp/src/main/webapp/planner/order.zul:155
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:139
+#: libreplan-webapp/src/main/webapp/planner/order.zul:154
 msgid "Calendar"
 msgstr "Calendario"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:119
+msgid "Resources"
+msgstr "Recursos"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56
 msgid "Read"
 msgstr "Leer"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:99
-msgid "Resources"
-msgstr "Recursos"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153
 msgid "Source and destination scenarios should be different"
 msgstr "Os escenarios de orixe e destino deben ser diferentes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:230
-msgid "CriterionType and its criteria saved"
-msgstr "Tipo de criterio e os seus criterios gardados"
-
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:137
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:141
 msgid "The browser you are using"
 msgstr "O navegador que está usando"
 
@@ -1360,33 +1348,24 @@ msgid "scenario"
 msgstr "escenario"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:51
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:248
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:42
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:29
 msgid "to"
 msgstr "a"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:197
-msgid "Error on removing typeOfWorkHours: "
-msgstr "Erro borrando tipo de horas de traballo : "
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:112
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:115
 msgid "worker's first name not specified"
 msgstr "nome do traballador non especificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281
 msgid "date not specified"
 msgstr "data non especificada"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:95
-msgid "Select type :"
-msgstr "Seleccione tipo :"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:259
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:269
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206
 msgid "Projects Planning"
 msgstr "Planificación de proxectos"
 
@@ -1394,12 +1373,18 @@ msgstr "Planificación de proxectos"
 msgid "Shrink to fit page width"
 msgstr "Reducir para axustar ao ancho de páxina"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:67
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773
+msgid "The max value must be greater than 0"
+msgstr "O valor máximo debe ser maior que 0"
+
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:63
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
 msgid "Last name"
 msgstr "Apelidos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:551
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:380
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556
 msgid "Remove"
 msgstr "Borrar"
 
@@ -1407,19 +1392,27 @@ msgstr "Borrar"
 msgid "cost category name not specified"
 msgstr "nome da categoría de custo non especificado"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22
-msgid "LibrePlan: Virtual Workers Groups"
-msgstr "LibrePlan: Grupos de traballadores virtuais"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41
+msgid "Planned workable days"
+msgstr "Días laborais planificados"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:131
 msgid "SPI"
 msgstr "SPI"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1334
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:232
+msgid "Progress Type"
+msgstr "Tipo de progreso"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295
 msgid "Task contains consolidated progress. Cannot apply sigmoid function."
 msgstr ""
 "A tarefa contén progreso consolidado. Non se pode aplicar a función sigmoide."
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:305
+msgid "UserId"
+msgstr "UserId"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:218
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:245
 msgid ""
@@ -1429,19 +1422,23 @@ msgstr ""
 "A data de inicio non é válida, a data de inicio nova debe ser anterior data "
 "de inicio actual"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:516
+msgid "This date can not include the whole previous work week"
+msgstr "Esta data non pode incluír á semana de traballo anterior completa"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390
 msgid "the code must be not null or not empty"
 msgstr "o código non pode ser nulo ou baleiro"
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:35
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:119
 msgid "Create New Project"
 msgstr "Crear proxecto novo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1420
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430
 msgid "Stretches list"
 msgstr "Lista de tramos"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:187
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:180
 msgid "Enable scenarios module"
 msgstr "Habilitar módulo de escenarios"
 
@@ -1449,52 +1446,50 @@ msgstr "Habilitar módulo de escenarios"
 msgid "Zoom"
 msgstr "Zoom"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:608
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:41
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:52
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:95
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:124
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:88
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45
 #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40
 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:106
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:117
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:115
 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:41
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:38
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:42
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:81
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:80
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:135
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:130
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:241
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:135
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:376
 msgid "Save"
 msgstr "Gardar"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:62
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
 msgid "Standard Effort"
 msgstr "Esforzo estándar"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:109
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
 msgid "Material categories"
 msgstr "Categorías de materiais"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:240
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:570
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:669
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674
 msgid "number of digits must be between {0} and {1}"
 msgstr "o número de díxitos debe estar entre {0} e {1}"
 
@@ -1506,10 +1501,6 @@ msgstr "Criterios requiridos"
 msgid "Pending update"
 msgstr "Actualización pendente"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59
-msgid "End date:"
-msgstr "Data de fin:"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:160
 msgid "Criterion previously selected"
 msgstr "Criterio seleccionado previamente"
@@ -1522,23 +1513,43 @@ msgstr "Autorización de usuarios"
 msgid "Problems connecting with subcontractor web service"
 msgstr "Problemas conectando co servizo web subcontratista"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:219
+msgid "Entity type"
+msgstr "Tipo de entidade"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263
+msgid "Unsaved changes will be lost. Are you sure?"
+msgstr "Perderánse os cambios sen gardar. Está seguro?"
+
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:22
+#: libreplan-webapp/src/main/webapp/planner/order.zul:22
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22
+#: libreplan-webapp/src/main/webapp/planner/index.zul:22
+#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22
+#: libreplan-webapp/src/main/webapp/planner/main.zul:22
+#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22
+msgid "LibrePlan: Scheduling"
+msgstr "LibrePlan: planificación"
+
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44
 msgid "Assigned load"
 msgstr "Carga asignada"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:142
 msgid "End Date"
 msgstr "Data de fin"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:64
 msgid "Filter by workers"
 msgstr "Filtrar por traballadores"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:374
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
 msgid "Some allocations needed"
 msgstr "Precísanse algunas asignacións"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83
 msgid "Resources Per Day"
 msgstr "Recursos por día"
 
@@ -1554,7 +1565,7 @@ msgstr ""
 "Data de fin estimada para a tarefa (presione enter no cadro de texto para "
 "abrir o calendario ou escriba a data directamente)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:281
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:292
 msgid "Expand/Collapse all"
 msgstr "Expandir/Pregar todo"
 
@@ -1562,34 +1573,33 @@ msgstr "Expandir/Pregar todo"
 msgid "Overload due to current project"
 msgstr "Sobrecarga debido ao proxecto actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:857
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907
 msgid "Name: {0}"
 msgstr "Nome: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:867
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874
 msgid "Move down"
 msgstr "Mover abaixo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:116
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:112
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:137
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139
 msgid "Please, select a project"
 msgstr "Por favor, seleccione un proxecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:29
+msgid "Inherits from date"
+msgstr "Herda da data"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "September"
 msgstr "Setembro"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28
 msgid "Report structure"
 msgstr "Estrutura do parte"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:88
-msgid "password not specified"
-msgstr "contrasinal non especificado"
-
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:119
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:42
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:59
 msgid "General data"
@@ -1599,11 +1609,12 @@ msgstr "Datos xerais"
 msgid "BAC"
 msgstr "BAC"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:399
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379
 msgid "Calculate Number of Hours"
 msgstr "Calcular número de horas"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
 msgid "Assign"
@@ -1613,34 +1624,24 @@ msgstr "Asignar"
 msgid "missing code in a criterion"
 msgstr "falta código nun criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1296
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273
 msgid "Create Template"
 msgstr "Crear modelo"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23
-msgid "LibrePlan: Work Reports"
-msgstr "LibrePlan: Partes de traballo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:115
-msgid "Edit Company"
-msgstr "Editar empresa"
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68
 msgid "Advanced search"
 msgstr "Búsqueda avanzada"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:82
 msgid "Filter by labels"
 msgstr "Filtrar por etiquetas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:577
 msgid ""
 "IMPORTANT: Don't forget to communicate to subcontractor that his contract "
 "has been cancelled"
@@ -1648,30 +1649,37 @@ msgstr ""
 "IMPORTANTE: Non olvide comunicar ao subcontratista que o seu contrato foi "
 "cancelado"
 
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:38
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36
 msgid "MonteCarlo chart"
 msgstr "Diagrama de Montecarlo"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
-msgid "LibrePlan: Hours Worked Per Resource"
-msgstr "LibrePlan: Horas traballadas por recurso"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126
 msgid "Schedule Variance"
 msgstr "Desviación en planificación"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:496
+msgid "Error on showing warning message removing qualityForm: "
+msgstr ""
+"Erro ao mostrar mensaxe de advertencia borrando un formulario de calidade: "
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:410
 msgid "Service does not manage resource of type: {0}"
 msgstr "O servizo non xestiona recursos de tipo: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:191
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:185
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:210
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:506
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:544
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:575
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1365
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:39
+#: libreplan-webapp/src/main/webapp/common/error.zul:44
+msgid "Status code"
+msgstr "Código de estado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:974
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:474
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:492
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
 msgid "Warning"
 msgstr "Advertencia"
 
@@ -1680,15 +1688,13 @@ msgstr "Advertencia"
 msgid "Select parent calendar"
 msgstr "Seleccionar o calendario pai"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:96
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:168
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:463
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:526
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:513
 msgid "There is no task with this code"
 msgstr "Non hai ningunha tarefa con este código"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:433
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:214
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:146
 msgid "The type of hours cannot be null"
 msgstr "O tipo de horas no pode ser nulo"
 
@@ -1697,14 +1703,14 @@ msgid "criterion satisfaction with end date less than start date"
 msgstr "o criterio satisfeito ten data de fin anterior á de inicio"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
 msgid "Show"
 msgstr "Mostrar"
 
@@ -1716,18 +1722,6 @@ msgstr "Duración (días)"
 msgid "Assignment Type"
 msgstr "Tipo de asignación"
 
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:22
-#: libreplan-webapp/src/main/webapp/planner/order.zul:22
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22
-#: libreplan-webapp/src/main/webapp/planner/index.zul:22
-#: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22
-#: libreplan-webapp/src/main/webapp/planner/main.zul:22
-#: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22
-msgid "LibrePlan: Scheduling"
-msgstr "LibrePlan: planificación"
-
 #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29
 msgid "Back to log in"
 msgstr "Volver a iniciar sesión"
@@ -1737,35 +1731,28 @@ msgstr "Volver a iniciar sesión"
 msgid "Error on splitting"
 msgstr "Erro ao dividir"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31
-msgid "Planned start :"
-msgstr "Inicio planificado :"
-
-#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
-msgid "Company"
-msgstr "Empresa"
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66
 msgid "Node without children"
 msgstr "Nodo sen fillos"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:152
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
+msgid "Company"
+msgstr "Empresa"
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118
 msgid "There is no label with this code "
 msgstr "Non hai ningunha etiqueta con este código"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212
 msgid "Task: {0} "
 msgstr "Tarefa: {0} "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:138
-msgid "Profile saved"
-msgstr "Perfil gardado"
-
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:65
 msgid "Task properties"
 msgstr "Propiedades da tarefa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:75
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:84
 msgid "There is no type of work report with this code"
 msgstr "Non hai ningún tipo de parte de traballo con este código"
 
@@ -1778,10 +1765,6 @@ msgstr "Suma de horas imputadas directamente"
 msgid "Surname"
 msgstr "Apelidos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1364
-msgid "You need to select some function to configure"
-msgstr "Necesita seleccionar algunha función para configurar"
-
 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22
 msgid "Exception Day Types List"
 msgstr "Lista de tipos de día de excepción"
@@ -1790,70 +1773,61 @@ msgstr "Lista de tipos de día de excepción"
 msgid "the name must be not null or not empty"
 msgstr "o nome non pode ser nulo ou baleiro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:741
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:157
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:750
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:394
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:68
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:131
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
-#: libreplan-webapp/src/main/webapp/planner/order.zul:111
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45
+#: libreplan-webapp/src/main/webapp/planner/order.zul:110
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41
 msgid "Date"
 msgstr "Data"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:363
-msgid "there must be {0} effort instead of {1}"
-msgstr "debe haber {0} esforzo en lugar de {1}"
-
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
 msgid "Add From Template"
 msgstr "Engadir a partir de modelo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:505
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:543
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:508
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:546
 msgid "Assigned resources for this task will be deleted. Are you sure?"
 msgstr "Os recursos asignados para esta tarefa serán borrados. Está seguro?"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22
-msgid "LibrePlan: Exception Days"
-msgstr "LibrePlan: Días de excepción"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:646
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651
 msgid ""
 "format prefix invalid. It cannot be empty or contain '_' or whitespaces."
 msgstr ""
 "formato de prefixo inválido. Non pode estar baliero ou conter '_' ou espazos "
 "en branco."
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41
 msgid "Filter by month"
 msgstr "Filtrar por mes"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322
 msgid "The criterion and its type cannot be null"
 msgstr "O criterio e o seu tipo non poden ser nulos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:526
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421
 msgid "The quality form must have an item with 100% value to report progress"
 msgstr ""
 "O formulario de calidaed debe ter un ítem con valor 100% para notificar "
 "progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "July"
 msgstr "Xullo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:220
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156
 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"
 
@@ -1861,16 +1835,15 @@ msgstr "O código non é válido. Hai outro tipo de unidade co mesmo código"
 msgid "( max: {0} )"
 msgstr "( máx: {0} )"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:218
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:222
 msgid "Error on removing element: "
 msgstr "Erro ao borrar elemento: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
 msgid "January"
 msgstr "Xaneiro"
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:64
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60
 msgid "Cannot calculate charts for current data"
 msgstr "Non se poden calcular gráficos para os datos actuais"
 
@@ -1878,9 +1851,9 @@ msgstr "Non se poden calcular gráficos para os datos actuais"
 msgid "Select queue"
 msgstr "Seleccionar cola"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:582
-msgid "The cost category had already been removed."
-msgstr "A categoría de custo xa fora borrada."
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173
+msgid "project name already being used"
+msgstr "o nome de proxecto xa está sendo usado"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48
 msgid "Work description"
@@ -1899,43 +1872,41 @@ msgstr "Non hai ningún progreso asignado á tarefa actual"
 msgid "You can not remove the default scenario called \"{0}\""
 msgstr "Non se pode borrar o escenario por defecto, chamado \"{0}\""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161
 msgid "direct link"
 msgstr "enlace directo"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112
 msgid "Down"
 msgstr "Abaixo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:934
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:842
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:48
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:89
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:109
 msgid "Label"
 msgstr "Etiqueta"
 
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:37
-msgid "Create Scenario"
-msgstr "Crear Escenario"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:834
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841
 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"
 
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:48
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90
 msgid "Association with roles"
 msgstr "Asociación con roles"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:371
 msgid "missing type of work hours in a work report line"
 msgstr "falta tipo de horas de traballo nunha liña do parte"
 
@@ -1943,8 +1914,8 @@ msgstr "falta tipo de horas de traballo nunha liña do parte"
 msgid "Quality forms"
 msgstr "Formularios de calidade"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:624
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:634
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476
 msgid "Repeated Hours Group code {0} in Project {1}"
 msgstr "Código {0} de groupo de horas repetido no proxecto {1}"
 
@@ -1952,6 +1923,10 @@ msgstr "Código {0} de groupo de horas repetido no proxecto {1}"
 msgid "Hours group"
 msgstr "Grupo de horas"
 
+#: libreplan-webapp/src/main/webapp/users/users.zul:23
+msgid "LibrePlan: Accounts"
+msgstr "LibrePlan: Contas"
+
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:96
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:30
 msgid "Days from Beginning to Deadline"
@@ -1961,55 +1936,35 @@ msgstr "Días desde o comezo ata a data límite"
 msgid "Estimate At Completion"
 msgstr "Estimación de custo total actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194
-msgid "Delete item. Are you sure?"
-msgstr "Borrar elemento. ¿Está seguro?"
-
 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:102
 msgid "cost assignment's start date not specified"
 msgstr "data de inicio da asignación de custo non especificada"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178
-msgid "Output format:"
-msgstr "Formato de saída:"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1029
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1192
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45
 msgid "Direct"
 msgstr "Directo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:818
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:268
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:289
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:828
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:245
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:266
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:52
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86
 msgid "Op."
 msgstr "Op."
 
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55
-msgid "Reference date:"
-msgstr "Data de referencia:"
-
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44
 msgid "Pessimistic"
 msgstr "Pesimista"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:373
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:376
 msgid "Limiting resource assignation"
 msgstr "Asignación de recursos limitantes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238
 msgid ""
 "This progress can not be removed, because it is spread. It is necessary to "
 "select another progress as spread."
@@ -2017,7 +1972,7 @@ msgstr ""
 "Este progreso non se pode eliminar porque é propagado. Cómpre seleccionar "
 "outro progreso como propagado"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:116
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:119
 msgid "Work week"
 msgstr "Semana de traballo"
 
@@ -2026,15 +1981,15 @@ msgid "You will lose the changes. Are you sure?"
 msgstr "Perderanse os cambios. ¿Está seguro?"
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47
 msgid "Company ID"
 msgstr "NIF"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:192
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:129
 msgid "Unit type name cannot be empty"
 msgstr "O nome do tipo de unidade non pode ser baleiro"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:38
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:42
 msgid "Entity sequences"
 msgstr "Secuencias de entidade"
 
@@ -2043,15 +1998,19 @@ msgstr "Secuencias de entidade"
 msgid "Delay from beginning (days)"
 msgstr "Retraso desde o comezo (en días)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:319
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:324
 msgid "Resource cannot be null"
 msgstr "O recurso non pode ser nulo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:505
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453
 msgid "Total Hours"
 msgstr "Horas totais"
 
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:366
+msgid "LibrePlan Role"
+msgstr "Rol LibrePlan"
+
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:36
 msgid "Create Progress Type"
 msgstr "Crear novo tipo de progreso"
 
@@ -2059,12 +2018,8 @@ msgstr "Crear novo tipo de progreso"
 msgid "Confirm cancel"
 msgstr "Confirmar cancelación"
 
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:62
-msgid "Label list"
-msgstr "Lista de etiquetas"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37
 msgid "Work And Progress Per Task"
 msgstr "Traballo e progreso por tarefa"
 
@@ -2072,70 +2027,69 @@ msgstr "Traballo e progreso por tarefa"
 msgid "WBS (tasks)"
 msgstr "EDT (tarefas)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1250
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:423
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:133
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:538
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:552
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:227
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:310
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:859
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:894
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208
 msgid "Error on showing removing element: "
 msgstr "Erro ao mostrar o elemento a borrar: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:698
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701
 msgid "Deleting sequence"
 msgstr "Borrando secuencia"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:87
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:88
 msgid "Select scenario"
 msgstr "Seleccionar escenario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:218
-msgid "Create Label Type"
-msgstr "Crear tipo de etiqueta"
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:51
+msgid "Login"
+msgstr "Nome de usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:233
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:225
 msgid "missing work report code in a work report"
 msgstr "falta o código nun parte de traballo"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36
-msgid "Create Work Report Type"
-msgstr "Crear tipo de parte de traballo"
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:299
+msgid "Edit Virtual Workers Group: {0}"
+msgstr "Editar grupo de traballadores virtuais: {0}"
 
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
 msgid "Criterion requirement"
 msgstr "Criterios requiridos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1245
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1404
 msgid "Only the last activation period allows to delete end date."
 msgstr "Só o último periodo de activación permite borrar a data de fin."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63
+msgid "Maximum/minimum of worked hours in finished applications"
+msgstr "Máximo/mínimo das horas traballadas nas aplicacións finalizadas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333
 msgid "Scheduling saved"
 msgstr "Planificación gardada"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:197
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:192
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:171
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70
 msgid "Add new row"
 msgstr "Engadir nova fila"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:782
-msgid "incorrect initialization of the progress assignment controller."
-msgstr "inicialización incorrecta do controlador de asignación de progreso."
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:488
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:492
 msgid "Move"
 msgstr "Mover"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:67
+msgid "Password saved"
+msgstr "Contrasinal gardado"
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:224
 msgid "missing code in the resource calendar"
 msgstr "falta código no calendario de recursos"
@@ -2154,7 +2108,7 @@ msgstr "Histórico de asignacións"
 msgid "CutycaptTimeout thread exception"
 msgstr "Excepción no thread CutycaptTimeout"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22
 msgid "Work Report Models"
 msgstr "Modelos de partes de traballo"
@@ -2167,11 +2121,15 @@ msgstr "Data da última medida de progreso"
 msgid "Deadline (days since beggining project)"
 msgstr "Data límite (días desde o inicio do proxecto)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:422
-msgid "number of hours is not properly calculated based on clock"
-msgstr "número de horas non calculado correctamente basado en reloxo"
+#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23
+msgid "LibrePlan: Companies"
+msgstr "LibrePlan: Empresas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:385
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22
+msgid "LibrePlan: Progress Report"
+msgstr "LibrePlan: Informe de progreso"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:417
 msgid ""
 "Calendar cannot be removed because it still has children. Some other "
 "calendar is derived from this one."
@@ -2179,15 +2137,15 @@ msgstr ""
 "O calendario non se pudo borrar porque aínda ten fillos. Algún outro "
 "calendario deriva deste."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:918
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921
 msgid "Value is not valid, the type must be not empty"
 msgstr "O valor non é válido, o tipo non pode estar baleiro"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:444
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:445
 msgid "criterion type name is already being used"
 msgstr "o nome de tipo de criterio está sendo usado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:326
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:331
 msgid "Task code cannot be null"
 msgstr "O código da tarefa non pode ser nulo"
 
@@ -2195,17 +2153,13 @@ msgstr "O código da tarefa non pode ser nulo"
 msgid "It is not allowed to consolidate progress."
 msgstr "Non se pode borrar progreso consolidado."
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32
 msgid "Create Task"
 msgstr "Crear tarefa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:98
-msgid "Error setting up creation form for Criterion Type"
-msgstr "Erro preparando o formulario de creación para un tipo de criterio"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:151
-msgid "Edit Cost Category"
-msgstr "Editar categoría de custo"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:242
+msgid "LDAP Authentication enabled"
+msgstr "Autenticación co LDAP activada"
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27
 msgid "External company"
@@ -2215,66 +2169,70 @@ msgstr "Empresa externa"
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:58
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:82
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:112
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68
 msgid "Actions"
 msgstr "Accións"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:115
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:118
 msgid "Exceptions"
 msgstr "Excepcións"
 
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:32
+msgid "User settings"
+msgstr "Preferencias de usuario"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:80
 msgid "Start hour"
 msgstr "Hora de inicio"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140
 msgid "Assign materials"
 msgstr "Asignar materiais"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33
 msgid "Over assignable"
 msgstr "Sobreasignable"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:231
 msgid "format filters are not valid"
 msgstr "o formato dos filtros non é válido"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:72
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76
 msgid "ID"
 msgstr "NIF"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:419
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343
+msgid "Settings"
+msgstr "Preferencias"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:346
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:181
 msgid "The init date cannot be empty"
 msgstr "A data de inicio non pode ser baleira"
 
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28
-msgid "Is administrator"
-msgstr "É administrador"
-
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:90
 msgid "Our company password"
 msgstr "Contrasinal da nosa empresa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:275
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:134
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:172
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:130
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:171
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174
 msgid "This label has already been added."
 msgstr "Esta etiqueta xa fora engadida."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:79
-#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:179
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80
+#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:181
 msgid "Could not get code, please try again later"
 msgstr "Non se puido obter o código, por favor volva intentalo máis tarde"
 
@@ -2286,19 +2244,15 @@ msgstr ""
 "O valor non é válido.\n"
 " o código no pode conter caracteres como '_'."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625
-msgid "Confirm deleting this machine. Are you sure?"
-msgstr "Confirmar o borrado desta máquina. ¿Está seguro?"
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161
 msgid "Hours Group"
 msgstr "Grupo de horas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:915
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:823
 msgid "Unallocated name"
 msgstr "Nome no asignado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:888
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895
 msgid "Move up"
 msgstr "Mover arriba"
 
@@ -2311,10 +2265,10 @@ msgid "Subcontract communication date"
 msgstr "Data de comunicación da subcontratación"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:262
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:354
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:129
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134
 msgid "Scheduling"
 msgstr "Planificación"
 
@@ -2322,7 +2276,13 @@ msgstr "Planificación"
 msgid "Dependencies have priority"
 msgstr "As dependencias teñen prioridade"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:206
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:516
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:901
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126
+msgid "Create {0}"
+msgstr "Crear {0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:218
 msgid "Unlimited"
 msgstr "Ilimitado"
 
@@ -2334,20 +2294,17 @@ msgstr "Total custo planificado"
 msgid "Assign Label"
 msgstr "Asignar etiqueta"
 
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23
+msgid "Create new project"
+msgstr "Crear novo proxecto"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73
 msgid "Page up"
 msgstr "Páxina arriba"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:228
-msgid "Create new project"
-msgstr "Crear novo proxecto"
-
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62
-msgid "Work done from starting date:"
-msgstr "Traballo realizado desde a data de inicio:"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:865
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:159
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
@@ -2359,38 +2316,30 @@ msgstr "Estado"
 msgid "Must start after"
 msgstr "Debe empezar despois"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1345
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306
 msgid "Confirm change"
 msgstr "Confirmar cambio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:864
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840
 msgid "You don't have permissions to edit this project"
 msgstr "Non ten permisos para editar este proxecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:104
-msgid "Edit Profile"
-msgstr "Editar perfil"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192
 msgid "missing date in a calendar exception"
 msgstr "falta a data nunha excepción de calendario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:432
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:213
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:440
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:145
 msgid ""
 "Type of hours is empty. Please, create some type of hours before proceeding"
 msgstr ""
 "O tipo de horas está baleiro. Por favor, cree algún tipo de horas antes de "
 "proceder"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:598
-msgid "Exception"
-msgstr "Excepción"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:108
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:180
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:515
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:172
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:437
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:502
 msgid "There is no resource with this ID"
 msgstr "Non hai un recurso con este NIF"
 
@@ -2399,15 +2348,20 @@ msgstr "Non hai un recurso con este NIF"
 msgid "Send"
 msgstr "Enviar"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:103
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104
 msgid "user"
 msgstr "usuario"
 
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:21
+msgid "LibrePlan: Materials"
+msgstr "LibrePlan: Materiais"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeModel.java:53
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:33
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192
 msgid "The password for a new user cannot be empty"
 msgstr "O contrasinal non pode ser baleiro para un usuario novo"
 
@@ -2419,23 +2373,19 @@ msgstr "Usuario asociado"
 msgid "Type name"
 msgstr "Nome do tipo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69
-msgid "Progress assignment"
-msgstr "Asignacións de progreso"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:182
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:440
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:687
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27
 msgid "All"
 msgstr "Todo"
 
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:40
-msgid "Edit Progress Type"
-msgstr "Editar tipo de progreso"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69
+msgid "Progress assignment"
+msgstr "Asignacións de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:459
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77
 msgid "Manual"
 msgstr "Manual"
 
@@ -2447,11 +2397,11 @@ msgstr "Lista de calendarios"
 msgid "Receipt date"
 msgstr "Data de recepción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:209
 msgid "Cannot be higher than Ending date"
 msgstr "Non pode ser posterior á data de fin"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:292
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269
 msgid "Create activation period"
 msgstr "Crear período de activación"
 
@@ -2463,9 +2413,9 @@ msgstr "Lista de traballadores"
 msgid "Personal details"
 msgstr "Detalles persoais"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1027
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1190
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:214
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:217
 msgid "Inherited"
 msgstr "Herdado"
 
@@ -2473,12 +2423,8 @@ msgstr "Herdado"
 msgid "Delete project template. Are you sure?"
 msgstr "Borrar modelo de proxecto. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:255
-msgid "Worker"
-msgstr "Traballador"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:517
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:595
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599
 msgid ""
 "Cannot allocate selected element. There is not any queue that matches "
 "resource allocation criteria at any interval of time"
@@ -2486,20 +2432,29 @@ 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"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287
+msgid "Worker"
+msgstr "Traballador"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:217
 msgid "Criterion must be not-null"
 msgstr "O criterio non debe ser nulo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:161
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:299
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:300
 msgid "criterion name not specified"
 msgstr "nome do criterio non especificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95
 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 "
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:343
+msgid "Role property"
+msgstr "Propiedade do rol"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25
 msgid "Manual allocation"
 msgstr "Asignación manual"
@@ -2517,15 +2472,19 @@ msgstr "Autorizar"
 msgid "Recommended allocation"
 msgstr "Asignación recomendada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:303
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:241
+msgid "Activation"
+msgstr "Activación"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304
 msgid "Scenarios"
 msgstr "Escenarios"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376
 msgid "Materials saved"
 msgstr "Materiais gardados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252
 msgid ""
 "This progress measurement can not be in current date, because it is "
 "consolidated. it is necessary to select other date."
@@ -2533,15 +2492,24 @@ msgstr ""
 "Esta medida de progreso non pode estar na data actual, porque está "
 "consolidada. Débese seleccionar outra data."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:705
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37
+msgid "Total Worked Hours By Resource In A Month"
+msgstr "Total horas traballadas por recurso nun mes"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672
 msgid "Other projects"
 msgstr "Outros proxectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:159
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:111
+msgid "Tasks input buffer"
+msgstr "Buffer de tarefas de entrada"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168
 msgid "At least one {0} sequence must be active"
 msgstr "Polo menos unha secuencia de {0} debe estar activa"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:111
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66
@@ -2560,15 +2528,19 @@ msgstr "Deshabilitar borrado"
 msgid "You should select a source scenario"
 msgstr "Debe seleccionar un escenario de orixe"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:154
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163
 msgid "At least one {0} sequence is needed"
 msgstr "Necesítase polo menos unha secuencia de {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37
 msgid "Estimated/Planned Hours Per Task"
 msgstr "Horas estimadas/planificadas por tarefa"
 
+#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23
+msgid "LibrePlan: Cost Categories"
+msgstr "LibrePlan: Categorías de custo"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:68
 msgid "Assigned"
 msgstr "Asignado"
@@ -2577,11 +2549,15 @@ msgstr "Asignado"
 msgid "Details"
 msgstr "Detalles"
 
+#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21
+msgid "LibrePlan: Units"
+msgstr "LibrePlan: Unidades"
+
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45
 msgid "Communication"
 msgstr "Comunicación"
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36
 msgid "More options"
 msgstr "Máis opcións"
 
@@ -2590,15 +2566,11 @@ msgstr "Máis opcións"
 msgid "Error: {0}"
 msgstr "Erro: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:185
-msgid "Company saved"
-msgstr "Empresa gardada"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240
 msgid "Confirm create template"
 msgstr "Confirmar a creación do modelo"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:261
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:238
 msgid "Parent"
 msgstr "Pai"
 
@@ -2606,19 +2578,21 @@ msgstr "Pai"
 msgid "Earliest date"
 msgstr "Data máis cedo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:126
-msgid "Type of work hours saved"
-msgstr "Tipo de horas de traballo gardado"
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21
+msgid "LibrePlan: Work And Progress Per Task"
+msgstr "LibrePlan: Traballo e progreso por tarefa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:46
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344
+msgid "Change Password"
+msgstr "Cambiar o contrasinal"
+
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48
 msgid "Projects"
 msgstr "Proxectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:150
-msgid "Create Quality Form"
-msgstr "Crear formulario de calidade"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264
+msgid "Confirm exit dialog"
+msgstr "Diálogo para confirmar a salida"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64
 msgid "Not found converter for {0}"
@@ -2628,16 +2602,19 @@ msgstr "Non se atopou un conversor para {0}"
 msgid "Material assignments"
 msgstr "Asignacións de materiais"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:46
 msgid "December"
 msgstr "Decembro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:922
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:35
+msgid "Change password"
+msgstr "Cambiar o contrasinal"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:830
 msgid "Text field"
 msgstr "Campo de texto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:122
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81
 msgid ""
 "Value is not valid, the Precision value must be less than the defalt max "
 "value."
@@ -2645,11 +2622,11 @@ msgstr ""
 "O valor non é válido, o valor de precisión debe ser menor que o valor máximo "
 "por defecto."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97
 msgid "Question"
 msgstr "Pregunta"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249
 msgid ""
 "This progress measurement can not be changed or removed, because it is "
 "consolidated. It is needed to remove its consolidation."
@@ -2657,17 +2634,18 @@ msgstr ""
 "Esta medida de progreso non pode ser cambiada ou borrada, porque está "
 "consolidada. Débese borrar a consolidación."
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:222
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225
 msgid "Create new work week"
 msgstr "Crear nova semana de traballo"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:134
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:137
 msgid "The admin's account password remains the default one. This is unsecure"
 msgstr ""
 "O contrasinal da conta de admin segue sendo o contrasinal por defecto. Esto "
 "non é seguro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:713
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:716
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:34
 msgid "LIMITING RESOURCE"
 msgstr "RECURSO LIMITANTE"
@@ -2676,7 +2654,7 @@ msgstr "RECURSO LIMITANTE"
 msgid "Subcontratation"
 msgstr "Subcontratación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:198
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:135
 msgid ""
 "The meausure name is not valid. There is another unit type with the same "
 "measure name"
@@ -2684,24 +2662,26 @@ msgstr ""
 "O nome da medida non é válido. Hai outro tipo de unidade co mesmo nome de "
 "medida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:535
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:590
 msgid "{0} cannot be fulfilled"
 msgstr "Non se pode cumprir {0}"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:69
 msgid "Extended view"
 msgstr "Vista expandida"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34
 msgid "Work record"
 msgstr "Rexistro de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:116
-msgid "Error setting up edition form."
-msgstr "Erro preparando o formulario de edición."
-
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:204
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:147
 msgid "Output format"
 msgstr "Formato de saída"
 
@@ -2709,14 +2689,6 @@ msgstr "Formato de saída"
 msgid "Print"
 msgstr "Imprimir"
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22
-msgid "LibrePlan: Calendars"
-msgstr "LibrePlan: Calendarios"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:412
-msgid "Hours cannot be null"
-msgstr "As horas non poden ser nulas"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:179
 msgid "{0} not found type for criterion "
 msgstr "{0} non atopado tipo para criterio "
@@ -2725,56 +2697,53 @@ msgstr "{0} non atopado tipo para criterio "
 msgid "Page down"
 msgstr "Páxina abaixo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:485
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:486
 msgid "resource type does not allow enabled criteria"
 msgstr "o tipo de recurso non permite criterios habilitados"
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:22
-#: libreplan-webapp/src/main/webapp/common/error.zul:21
-msgid "LibrePlan: Runtime Error"
-msgstr "LibrePlan: Erro de execución"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:416
+msgid "Effort cannot be null"
+msgstr "O esforzo non pode ser nulo"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:39
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:43
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1015
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:191
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:49
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:55
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:101
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:46
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116
 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:40
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:44
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:87
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:84
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:81
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:134
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:99
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:243
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:139
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:100
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:379
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50
-#: libreplan-webapp/src/main/webapp/planner/order.zul:72
-#: libreplan-webapp/src/main/webapp/planner/order.zul:135
-#: libreplan-webapp/src/main/webapp/planner/order.zul:170
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:85
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41
+#: libreplan-webapp/src/main/webapp/planner/order.zul:73
+#: libreplan-webapp/src/main/webapp/planner/order.zul:134
+#: libreplan-webapp/src/main/webapp/planner/order.zul:169
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:32
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:35
 msgid "General user data"
 msgstr "Datos xerais do usuario"
 
@@ -2786,7 +2755,7 @@ msgstr "Quitar planificación"
 msgid "Subcontracted task sent successfully"
 msgstr "A tarefa subcontratada enviouse con éxito"
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:73
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:77
 msgid "Accumulated hours chart"
 msgstr "Gráfico de horas acumuladas"
 
@@ -2798,13 +2767,13 @@ msgstr "Lista de máquinas"
 msgid "CPI"
 msgstr "CPI"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:660
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:923
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:526
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318
 msgid "You don't have read access to this project"
 msgstr "Non ten acceso de lectura a este proxecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:180
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:96
 msgid ""
 "Disable hierarchy will cause criteria tree to be flattened. Are you sure?"
 msgstr ""
@@ -2817,17 +2786,13 @@ msgstr ""
 msgid "Units"
 msgstr "Unidades"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:48
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:43
 msgid "Dates"
 msgstr "Datas"
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:45
-msgid "Create Calendar"
-msgstr "Crear Calendario"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:185
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168
 msgid "At least one stretch is needed"
 msgstr "Necesítase alo menos un tramo"
 
@@ -2835,10 +2800,26 @@ msgstr "Necesítase alo menos un tramo"
 msgid "a day is not valid"
 msgstr "un día non é válido"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:87
+msgid "Autocomplete login form"
+msgstr "Autocompletar o formulario de inicio de sesión"
+
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21
+msgid "LibrePlan: Project Costs Per Resource"
+msgstr "LibrePlan: Custos de proxectos por recurso"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61
 msgid "Task Properties"
 msgstr "Propiedades da tarefa"
 
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:51
+msgid "hours type"
+msgstr "tipo de horas"
+
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
+msgid "LibrePlan: Task Scheduling Status In Project"
+msgstr "LibrePlan: Estado de planificación de proxecto"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:229
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214
@@ -2847,20 +2828,11 @@ msgid ""
 msgstr ""
 "Data de fin inválida, a data de fin nova debe ser posterior á data de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:192
-msgid "Cost category saved"
-msgstr "Categoría de custo gardada"
-
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33
 msgid "name"
 msgstr "nome"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:170
-msgid "Progress type saved"
-msgstr "Tipo de progreso gardado"
-
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:73
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:75
 msgid "Delete selected task"
 msgstr "Borrar tarefa seleccionada"
 
@@ -2868,10 +2840,18 @@ msgstr "Borrar tarefa seleccionada"
 msgid "{0} (max: {1})"
 msgstr "{0} (máx: {1})"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:459
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470
 msgid "end"
 msgstr "fin"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:529
+msgid "Cost Category"
+msgstr "Categoría de custo"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:350
+msgid "Role search query"
+msgstr "Consulta para a búsqueda de roles"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:63
 msgid "Log"
 msgstr "Diario"
@@ -2894,7 +2874,7 @@ msgstr "Editar tarefa: {0}"
 msgid "Start date cannot be null"
 msgstr "A data de inicio non pode ser nula"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298
 msgid "Subcontracting"
 msgstr "Subcontratación"
 
@@ -2902,7 +2882,7 @@ msgstr "Subcontratación"
 msgid "references"
 msgstr "referencias"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1284
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278
 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 "
 
@@ -2910,11 +2890,11 @@ msgstr "O valor non é válido, o valor de precisión debe ser exacto "
 msgid "Generic"
 msgstr "Xenérico"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41
-msgid "Planned workable days :"
-msgstr "Días laborais planificados :"
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:51
+msgid "Template"
+msgstr "Modelo"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49
 msgid "Default max value"
 msgstr "Valor máximo por defecto"
 
@@ -2922,7 +2902,7 @@ msgstr "Valor máximo por defecto"
 msgid "Add criterion requirement"
 msgstr "Engadir criterio requirido"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855
 msgid ""
 "You can not remove the project \"{0}\" because of any of its tasks are "
 "already in use in some work reports and the project just exists in the "
@@ -2939,35 +2919,40 @@ msgstr "Porcentaxe de horas presupostadas / horas consumidas"
 msgid "Criterion Name"
 msgstr "Nome do criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502
 msgid "Automatic"
 msgstr "Automático"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48
 msgid "Task"
 msgstr "Tarefa"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35
-msgid "Planned end :"
-msgstr "Fin planificado :"
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:21
+msgid "LibrePlan: Change password"
+msgstr "LibrePlan: Cambiar o contrasinal"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:270
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:128
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:167
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:124
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:169
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168
 msgid "please, select a label"
 msgstr "por favor, seleccione unha etiqueta"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123
 msgid "Add profile"
 msgstr "Engadir perfil"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215
+#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23
+msgid "LibrePlan: Scenarios Management"
+msgstr "LibrePlan: Xestión de escenarios"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220
 msgid "filter already exists"
 msgstr "o filtro xa existe"
 
@@ -2985,6 +2970,10 @@ msgstr "Nome do criterio"
 msgid "values are not valid, the values must not be null"
 msgstr "os valores non son válidos, non deben ser nulos"
 
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41
+msgid "Apply changes and go back to scheduling"
+msgstr "Aplicar cambios e volver á planificación"
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50
@@ -2997,9 +2986,9 @@ msgstr "recurso da asignación de custo non especificado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45
 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:73
 msgid "Project"
 msgstr "Proxecto"
@@ -3008,11 +2997,7 @@ msgstr "Proxecto"
 msgid "Unassigned"
 msgstr "Non asignado"
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:25
-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"
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:102
 msgid "Add new criterion requirement"
 msgstr "Engadir novo criterio requirido"
 
@@ -3020,11 +3005,11 @@ msgstr "Engadir novo criterio requirido"
 msgid "Budgeted Cost Work Performed"
 msgstr "Custo presupostado do traballo realizado"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:135
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:138
 msgid "Change the password"
 msgstr "Cambiar o contrasinal"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:95
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:115
 msgid "Work report"
 msgstr "Parte de traballo"
 
@@ -3032,24 +3017,29 @@ msgstr "Parte de traballo"
 msgid "the name must be not empty"
 msgstr "o nome non pode ser baleiro"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:86
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:58
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:85
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71
 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:731
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:347
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:701
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:326
 msgid "Earned value"
 msgstr "Valor gañado"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:216
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
+msgid "Overtime Effort"
+msgstr "Esforzo extra"
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:219
 msgid "Inherited from parent calendar"
 msgstr "Herdado do calendario pai"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:146
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:184
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:210
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:187
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:213
 msgid "Normal Effort"
 msgstr "Esforzo normal"
 
@@ -3067,51 +3057,48 @@ msgstr ""
 "tentando crear un modelo a  partir dunha tarefa nova.\n"
 "Por favor garde o seu proxecto antes de continuar."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:92
-msgid "Edit Work Hours Type"
-msgstr "Editar tipo de horas de traballo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43
-msgid "From Today"
-msgstr "A partir de hoxe"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1060
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1075
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129
 msgid "{0} not supported yet"
 msgstr "{0} aínda non soportado"
 
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:143
+msgid "is not supported for its use with LibrePlan."
+msgstr "no está soportado para o seu uso con LibrePlan."
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53
 msgid "New entry"
 msgstr "Entrada nova"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220
 msgid "Some sequences to remove not existed"
 msgstr "Algunhas secuencias para borrar non existen"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:105
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:114
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:212
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:100
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:109
 msgid "Resources Load"
 msgstr "Carga de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214
 msgid "Changes have been canceled"
 msgstr "Cambios cancelados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:266
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:281
-msgid "Machine saved"
-msgstr "Máquina gardada"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
+msgid "LibrePlan: Hours Worked Per Worker In A Month"
+msgstr "LibrePlan: Horas traballadas por traballador nun mes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143
-msgid "Create Cost Category"
-msgstr "Crear categoría de custo"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:297
+msgid "Authentication"
+msgstr "Autenticación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "March"
 msgstr "Marzo"
 
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:85
+msgid "Select language"
+msgstr "Seleccionar idioma"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104
 msgid "Appropriative allocation"
 msgstr "Asignación apropiativa"
@@ -3120,11 +3107,11 @@ msgstr "Asignación apropiativa"
 msgid "Assigned criterion requirements"
 msgstr "Criterios requiridos asignados"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:115
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:123
 msgid "Filter by criteria"
 msgstr "Filtrar por criterios"
 
@@ -3137,11 +3124,11 @@ msgstr "Valor máximo"
 msgid "Scenarios List"
 msgstr "Lista de escenarios"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:156
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:115
 msgid "The name is not valid, the name must not be null "
 msgstr "O nome non é válido, non debe ser nulo "
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136
 msgid "Hours to allocate"
 msgstr "Horas a asignar"
 
@@ -3149,7 +3136,7 @@ msgstr "Horas a asignar"
 msgid "A category must be selected"
 msgstr "Debe seleccionar unha categoría"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:134
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:137
 msgid "Period"
 msgstr "Periodo"
 
@@ -3162,91 +3149,80 @@ msgstr "Propagación"
 msgid "Select start date"
 msgstr "Seleccionar data de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:188
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:214
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877
+msgid "Removed {0}"
+msgstr "{0} borrado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152
 msgid "Error on showing warning message removing typeOfWorkHours: "
 msgstr ""
 "Erro ao mostrar mensaxe de advertencia borrando tipo de horas de traballo: "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:153
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:151
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:189
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:901
-msgid "Removed {0}"
-msgstr "{0} borrado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821
 msgid "Confirm deleting this worker. Are you sure?"
 msgstr "Confirmar o borrado deste traballador. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:62
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:64
 msgid "Group name"
 msgstr "Nome do grupo"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
-msgid "Start date:"
-msgstr "Data de inicio:"
-
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:57
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98
 msgid "Role name"
 msgstr "Nome do rol"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:837
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:840
 msgid "This worker was already removed by other user"
 msgstr "Este traballador xa foi borrado por outro usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:611
-msgid "Create Work Report"
-msgstr "Crear parte de traballo"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:116
-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"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:821
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:484
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:791
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:474
 msgid "h"
 msgstr "h"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:359
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:620
+msgid "Create Work Report"
+msgstr "Crear parte de traballo"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:75
+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"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363
 msgid "Workable capacity for this period "
 msgstr "Capacidade de traballo para este período "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:218
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:150
 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159
 msgid "Cannot be null or empty"
 msgstr "Non pode ser nulo ou baleiro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:190
-msgid "Cannot delete profile: it does not exist anymore"
-msgstr "Non se pode borrar o perfil: xa non existe"
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:440
+msgid "Quality Form"
+msgstr "Formulario de calidade"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:225
-msgid "Edit Machine"
-msgstr "Editar máquina"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:77
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:67
 msgid "Add Milestone"
 msgstr "Engadir fito"
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:116
 msgid "Assign selected items"
 msgstr "Asignar elementos seleccionados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:438
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449
 msgid "init"
 msgstr "inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1212
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215
 msgid "Add new progress measurement"
 msgstr "Engadir nova medida de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:528
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:532
 msgid "Select for automatic queuing"
 msgstr "Seleccione para encolar automáticamente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305
 msgid "Scenarios Management"
 msgstr "Administración de escenarios"
 
@@ -3258,86 +3234,96 @@ msgstr "Proxecto {0} transferido"
 msgid "Create & Assign"
 msgstr "Crear e asignar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:148
-msgid "Edit User"
-msgstr "Editar usuario"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549
+msgid "Not configurable"
+msgstr "Non configurable"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55
-msgid "Maximum/minimum of the estimated hours"
-msgstr "Máximo/mínimo das horas estimadas"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationCommand.java:47
+msgid "Advanced allocation"
+msgstr "Asignación avanzada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:753
-msgid "D"
-msgstr "D"
-
-#: libreplan-webapp/src/main/webapp/planner/order.zul:112
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90
+#: libreplan-webapp/src/main/webapp/planner/order.zul:111
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96
 msgid "Consolidated"
 msgstr "Consolidado"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:125
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:145
 msgid "Work report types"
 msgstr "Tipos de partes de traballo"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:182
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:174
 msgid "MonteCarlo method"
 msgstr "Método de Montecarlo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1057
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1220
 msgid "derived exception can not be removed"
 msgstr "a excepción derivada non se pode borrar"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:307
+msgid "Edit Worker: {0}"
+msgstr "Editar traballador: {0}"
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:217
 msgid "missing code in a material"
 msgstr "falta o código nun material"
 
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21
+msgid "LibrePlan: User access"
+msgstr "LibrePlan: Acceso de usuarios"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:61
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:109
 msgid "Customer"
 msgstr "Cliente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:86
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
 msgid "Hours type"
 msgstr "Tipo de horas"
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:156
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:210
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211
 msgid "criterion type name not specified"
 msgstr "nome do tipo de criterio non especificado"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246
+msgid "Cannot connect to LDAP server"
+msgstr "Non se pode conectar ao servidor de LDAP"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220
 msgid "Add Exception"
 msgstr "Engadir excepción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:405
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:427
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:451
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346
 msgid "cannot be empty"
 msgstr "non pode ser baleiro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1468
-msgid "Sigmoid function"
-msgstr "Función sigmoide"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:421
+msgid "Effort must be greater than zero"
+msgstr "O esforzo debe ser maior que cero"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:49
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:48
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:47
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27
 msgid "from"
 msgstr "desde"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:147
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:146
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:121
 msgid "Heading Fields"
 msgstr "Campos de cabeceira"
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:70
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:80
 msgid "Progress type"
 msgstr "Tipo de progreso"
 
@@ -3357,7 +3343,7 @@ msgstr ""
 "O período de tempo contén datos inválidos. A data de fin debe ser maior cá "
 "de inicio"
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:43
+#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33
 msgid "Save Project"
 msgstr "Gardar proxecto"
 
@@ -3366,8 +3352,8 @@ msgstr "Gardar proxecto"
 msgid "Day is not valid"
 msgstr "O día non é válido"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1097
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:619
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1256
 msgid "You should select a start date for the exception"
 msgstr "Debe seleccionar unha data de inicio para a excepción"
 
@@ -3383,6 +3369,10 @@ msgstr "Desviación ao custo final"
 msgid "Exportation options"
 msgstr "Opcións de exportación"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:92
+msgid "Settings saved"
+msgstr "Preferencias gardadas"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160
 msgid ""
 "Could not save time period. Time period overlaps with another non-compatible "
@@ -3391,83 +3381,83 @@ msgstr ""
 "Non se puido gardar o período de tiempo. O período solápase con outro "
 "período de tempo incompatible"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:376
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/BaseCalendarBandboxFinder.java:46
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:493
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:978
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:88
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:27
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:55
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:38
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:41
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:74
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76
 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:31
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:50
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:39
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:27
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32
 #: libreplan-webapp/src/main/webapp/planner/main.zul:49
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:90
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:134
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:175
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:104
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45
 msgid "Name"
 msgstr "Nome"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:162
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168
 msgid "Delete task"
 msgstr "Borrar tarefa"
 
@@ -3479,11 +3469,11 @@ msgstr "Segundos"
 msgid "please, select an item"
 msgstr "por favor, seleccione un elemento"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:392
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:397
 msgid "Time Start cannot be null"
 msgstr "A hora de inicio non pode ser nula"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:208
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212
 msgid "Day of week"
 msgstr "Día da semana"
 
@@ -3491,12 +3481,12 @@ msgstr "Día da semana"
 msgid "Companies List"
 msgstr "Lista de empresas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1443
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453
 msgid "Stretches with Interpolation"
 msgstr "Tramos con interpolación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37
 msgid "Hours Worked Per Resource"
 msgstr "Horas traballadas por recurso"
 
@@ -3508,31 +3498,33 @@ msgstr "A data de fin non pode ser anterior á data de inicio"
 msgid "cost assignment with end date less than start date"
 msgstr "a asignación de custo ten data de fin anterior á de inicio"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63
-msgid "Maximum/minimum of the worked hours"
-msgstr "Máximo/mínimo das horas traballadas"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:91
+msgid ""
+"Enable/Disable autocomplete property in login form, if the admin password is "
+"still in default"
+msgstr ""
+"Habilitar/Deshabilitar a propiedade de autocompletado no formulario de "
+"inicio de sesión, se o contrasinal de admin tovadía é o contrasinal por "
+"defecto"
 
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26
 msgid "Category name"
 msgstr "Nome da categoría"
 
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21
-msgid "LibrePlan: Work And Progress Per Task"
-msgstr "LibrePlan: Traballo e progreso por tarefa"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:766
 msgid "Not the same material, impossible to update"
 msgstr "Non é o mesmo material, imposible actualizar"
 
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34
+msgid "Filter work report by"
+msgstr "Filtrar parte de traballo por"
+
 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:65
 msgid "Main menu"
 msgstr "Menú principal"
 
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22
-msgid "LibrePlan: Progress"
-msgstr "LibrePlan: Progreso"
-
 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:31
 msgid "MonteCarlo"
 msgstr "Montecarlo"
@@ -3541,24 +3533,27 @@ msgstr "Montecarlo"
 msgid "Duration"
 msgstr "Duración"
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:39
-msgid "Create From Template"
-msgstr "Crear a partir de modelo"
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:585
+msgid "Exception: {0}"
+msgstr "Excepción: {0}"
+
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:46
+msgid "Password settings"
+msgstr "Configuración do contrasinal"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:381
 msgid "There exists other workReportType with the same name."
 msgstr "Xa existe outro tipo de parte de traballo co mesmo nome."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22
+msgid "LibrePlan: Progress"
+msgstr "LibrePlan: Progreso"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:149
 #: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29
 msgid "Schedule"
 msgstr "Planificar"
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:35
-#: libreplan-webapp/src/main/webapp/common/error.zul:40
-msgid "Exception type:"
-msgstr "Tipo de excepción:"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:164
 msgid "Unexpected: {0}"
 msgstr "Inesperado: {0}"
@@ -3568,45 +3563,43 @@ msgstr "Inesperado: {0}"
 msgid "Notes"
 msgstr "Notas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:224
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178
 msgid "Connect"
 msgstr "Conectar"
 
-#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21
-msgid "LibrePlan: Units"
-msgstr "LibrePlan: Unidades"
-
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23
-msgid "LibrePlan: Transfer Projects Between Scenarios"
-msgstr "LibrePlan: Transferir proxectos entre escenarios"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223
 msgid "Allocation: [{0},{1}]"
 msgstr "Asignación: [{0},{1}]"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:194
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:892
+msgid "Virtual Workers Group"
+msgstr "Grupo de traballadores virtuais"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198
 msgid "Changes saved"
 msgstr "Cambios gardados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258
 msgid "See scheduling"
 msgstr "Ver planificación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
 msgid "Progress measurements"
 msgstr "Medidas de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1211
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214
 msgid "Add measure"
 msgstr "Engadir medida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:253
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:258
 msgid "Work report saved"
 msgstr "Parte de traballo gardado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:52
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:374
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:377
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:68
 msgid "Subcontract"
 msgstr "Subcontratar"
@@ -3626,7 +3619,7 @@ msgstr "Relación"
 msgid "End"
 msgstr "Fin"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1366
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360
 msgid "The date is not valid, the date must be not empty"
 msgstr "A data non é válida, non debe ser baleira"
 
@@ -3634,11 +3627,12 @@ msgstr "A data non é válida, non debe ser baleira"
 msgid "User login name"
 msgstr "Nome de usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318
 msgid "Cost Categories"
 msgstr "Categorías de custo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:312
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313
 msgid "criterion type not specified"
 msgstr "tipo de criterio non especificado"
 
@@ -3646,14 +3640,13 @@ msgstr "tipo de criterio non especificado"
 msgid "must be not empty"
 msgstr "non pode ser baleiro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "April"
 msgstr "Abril"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23
-msgid "LibrePlan: Companies"
-msgstr "LibrePlan: Empresas"
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:301
+msgid "Derived of Calendar "
+msgstr "Derivado do calendario "
 
 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22
 msgid "Users List"
@@ -3665,16 +3658,20 @@ msgstr "Lista de usuarios"
 msgid "Task quality forms"
 msgstr "Formularios de calidade de tarefa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:600
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593
 msgid "Not working day"
 msgstr "Día non laborable"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:237
+msgid "Progress Types"
+msgstr "Tipos de progreso"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:135
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:155
 msgid "Cost category"
 msgstr "Categoría de custo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:697
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700
 msgid "It can not be deleted. At least one sequence is necessary."
 msgstr "Non se pode borrar. Polo menos unha secuencia é necesaria."
 
@@ -3682,23 +3679,29 @@ msgstr "Non se pode borrar. Polo menos unha secuencia é necesaria."
 msgid "Resource allocation"
 msgstr "Asignación de recursos"
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
 msgid "Amount work"
 msgstr "Cantidade de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:172
 msgid "please, select a quality form"
 msgstr "por favor, seleccione un formulario de calidade"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:201
-msgid "Select entity:"
-msgstr "Seleccione entidade:"
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:522
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:907
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:132
+msgid "Edit {0}: {1}"
+msgstr "Editar {0}: {1}"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:400
 msgid "Exist other workReportType with the same code."
 msgstr "Xa existe outro tipo de parte de traballo co mesmo código."
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:65
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
+msgid "Filter quality forms by"
+msgstr "Filtrar formularios de calidade por"
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67
 msgid "Unindent selected task"
 msgstr "Desindentar tarefa seleccionada"
 
@@ -3710,20 +3713,11 @@ msgstr "Código de referencia do cliente"
 msgid "Constraint"
 msgstr "Restrición"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155
-msgid "Create Exception Day Type"
-msgstr "Crear tipo de día de excepción"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41
-msgid "Hours Worked Per Resource In A Month"
-msgstr "Horas traballadas por recurso nun mes"
-
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150
 msgid "Add New Label Type Field"
 msgstr "Engadir novo campo de tipo de etiqueta"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:402
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:407
 msgid "Time finish cannot be null"
 msgstr "A hora de fin non pode ser nula"
 
@@ -3731,23 +3725,22 @@ msgstr "A hora de fin non pode ser nula"
 msgid "Customer reference"
 msgstr "Referencia del cliente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:661
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:865
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:915
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:924
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947
-#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:461
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:517
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:527
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319
 msgid "Information"
 msgstr "Información"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:946
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926
 msgid "Sorry, you do not have permissions to access this project"
 msgstr "Sentímolo, non ten permisos para acceder a este proxecto"
 
@@ -3755,11 +3748,11 @@ msgstr "Sentímolo, non ten permisos para acceder a este proxecto"
 msgid "END"
 msgstr "FIN"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:223
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:226
 msgid "Worker saved"
 msgstr "Traballador gardado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266
 msgid "can not pass until the previous item is passed."
 msgstr "non se pode pasar mentres o elemento anterior non sexa pasado."
 
@@ -3767,11 +3760,7 @@ msgstr "non se pode pasar mentres o elemento anterior non sexa pasado."
 msgid "New hours group "
 msgstr "novo grupo de horas "
 
-#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22
-msgid "LibrePlan: Quality Forms"
-msgstr "LibrePlan: Formularios de calidade"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:460
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464
 msgid "Assign element to queue manually"
 msgstr "Asignar elemento á cola manualmente"
 
@@ -3779,15 +3768,15 @@ msgstr "Asignar elemento á cola manualmente"
 msgid "Edit Template"
 msgstr "Editar modelo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:216
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:218
 msgid "Resource: {0} "
 msgstr "Recurso: {0} "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:463
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358
 msgid "percentage cannot be duplicated"
 msgstr "a porcentaxe non pode estar duplicada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325
 msgid "Work Hours"
 msgstr "Horas de traballo"
 
@@ -3795,7 +3784,7 @@ msgstr "Horas de traballo"
 msgid "Heading"
 msgstr "Cabeceira"
 
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:164
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:165
 msgid "Company ID already used. It has to be be unique"
 msgstr "NIF da empresa xa está sendo usado. Debe ser único"
 
@@ -3807,23 +3796,20 @@ msgstr "Non hai ningunha categoría de materiais con este código"
 msgid "Percentages should sum 100"
 msgstr "As porcentaxes deberían sumar 100"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:284
-msgid "Could not save machine"
-msgstr "Non se puido gardar a máquina"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:339
 msgid "The calendar exception type not found"
 msgstr "Tipo de excepción de calendario non atopado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81
+#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:106
 msgid "Unable to convert value to {0} type"
 msgstr "No se puido convertir o valor a tipo {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:220
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:223
 msgid "Worker must be not-null"
 msgstr "O traballador non debe ser nulo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1067
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1063
 msgid "Some criterion satisfactions overlap in time"
 msgstr "Algúns criterios satisfeitos solápanse no tempo"
 
@@ -3831,47 +3817,57 @@ msgstr "Algúns criterios satisfeitos solápanse no tempo"
 msgid "Value last progress measurement"
 msgstr "Valor da última medida de progreso"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
+msgid "LibrePlan: Materials Needs At Date"
+msgstr "LibrePlan: Necesidades de materiais en data"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44
 msgid "Worker assignments"
 msgstr "Asignacións de traballador"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:541
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:402
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:147
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:610
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:270
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:409
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:431
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221
 msgid "{0} already exists"
 msgstr "{0} xa existe"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:314
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:318
 msgid "Create Worker"
 msgstr "Crear traballador"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587
+msgid "Exception: {0} (Inh)"
+msgstr "Excepción: {0} (Her)"
+
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
 msgid "Code "
 msgstr "Código"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:52
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65
 msgid "Password confirmation"
 msgstr "Confirmación de contrasinal"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:69
-msgid "Indent selected task"
-msgstr "Indentar tarefa seleccionada"
-
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88
 msgid "Work Report"
 msgstr "Parte de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:115
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71
+msgid "Indent selected task"
+msgstr "Indentar tarefa seleccionada"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:135
 msgid "Unit Measures"
 msgstr "Unidades de medida"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:63
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:72
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39
 msgid "Show progress"
 msgstr "Mostrar progreso"
@@ -3880,7 +3876,15 @@ msgstr "Mostrar progreso"
 msgid "Work"
 msgstr "Traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:459
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297
+msgid ""
+"Error saving the project\n"
+"{0}"
+msgstr ""
+"Erro gardando un proxecto\n"
+"{0}"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:358
 msgid ""
 "The task has got progress consolidations. It must delete all consolidations "
 "to change the resource allocation type "
@@ -3888,10 +3892,15 @@ msgstr ""
 "A tarefa ten consolidacións de progreso. Debe borrar as consolidacións para "
 "cambiar o tipo de asignación de recursos "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:626
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22
+msgid "LibrePlan: Machines"
+msgstr "LibrePlan: Máquinas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1335
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1296
 msgid "Error"
 msgstr "Erro"
 
@@ -3911,15 +3920,15 @@ msgstr ""
 msgid "ETC"
 msgstr "ETC"
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:105
 msgid "Log out"
 msgstr "Saír"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:25
 msgid "Add new configuration unit"
 msgstr "engadir nova unidade de configuración"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:37
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:41
 msgid "Main preferences"
 msgstr "Preferencias principais"
 
@@ -3932,24 +3941,20 @@ msgstr ""
 "criterionType"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67
-#: libreplan-webapp/src/main/webapp/planner/order.zul:82
+#: libreplan-webapp/src/main/webapp/planner/order.zul:83
 msgid "Progress consolidation"
 msgstr "Consolidación de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:246
-msgid "Label type saved"
-msgstr "Tipo de etiqueta gardado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:419
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:568
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:406
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:556
 msgid "missing field name in a description value"
 msgstr "falta o nome de campo nun valor de descrición"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47
 msgid "Add new worker assignment"
 msgstr "Engadir nova asignación de traballador"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:688
 msgid "Show all elements"
 msgstr "Mostrar todos os elementos"
 
@@ -3957,11 +3962,7 @@ msgstr "Mostrar todos os elementos"
 msgid "It couldn't complete all the reassignations"
 msgstr "No se puideron completar todas as reasignacións"
 
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77
-msgid "Show dependencies:"
-msgstr "Mostrar dependencias:"
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:66
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:68
 msgid "Limited resource"
 msgstr "Recursos limitantes"
 
@@ -3979,8 +3980,8 @@ msgstr ""
 "A súa sesión expirou tras un tiempo de inactividade. Por favor, inicie "
 "sesión de novo."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:166
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:191
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:190
 msgid "SPREAD"
 msgstr "PROPAGACIÓN"
 
@@ -3992,27 +3993,26 @@ msgstr "un día está baleiro"
 msgid "Budgeted Cost Work Scheduled"
 msgstr "Custo de traballo presupostado planificado"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:57
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703
+msgid "Changes applied"
+msgstr "Cambios aplicados"
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58
 msgid "Name cannot be null or empty"
 msgstr "O nome non pode ser nulo ou baleiro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
-msgid "Progress measurements: "
-msgstr "Medidas de progreso: "
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:43
+msgid "LDAP configuration"
+msgstr "Configuración do LDAP"
 
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32
 msgid "Queue Element Information"
 msgstr "Información de elemento de cola"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:136
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:31
-msgid "Create Order"
-msgstr "Crear proxecto"
-
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22
 msgid "Virtual Workers Groups List"
 msgstr "Lista de grupos de traballadores virtuais"
@@ -4021,13 +4021,13 @@ msgstr "Lista de grupos de traballadores virtuais"
 msgid "Cost Variance"
 msgstr "Desviación en custo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:470
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471
 msgid "criterion type does not allow resource hierarchy"
 msgstr "o tipo de criterio non permite xerarquía de recursos"
 
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:150
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95
 msgid "Total"
 msgstr "Total"
 
@@ -4040,25 +4040,26 @@ msgstr "Invalidar"
 msgid "Budget hours"
 msgstr "Horas do presuposto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:150
 msgid "Edit task: {0}"
 msgstr "Editar tarefa: {0}"
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:53
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:52
 msgid "Select destination"
 msgstr "Seleccionar destino"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529
+#: libreplan-webapp/src/main/webapp/planner/order.zul:92
+#: libreplan-webapp/src/main/webapp/planner/order.zul:98
+msgid "Check consolidated progresses"
+msgstr "Marcar progresos consolidados"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530
 msgid "must be greater than the previous date."
 msgstr "debe ser maior cá data anterior."
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22
-msgid "LibrePlan: Advanced allocation"
-msgstr "LibrePlan: Asignación avanzada"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1481
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:583
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585
 msgid "Show all"
 msgstr "Mostrar todo"
 
@@ -4067,19 +4068,20 @@ msgid "Estimated hours"
 msgstr "Horas estimadas"
 
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:59
 msgid "Default price"
 msgstr "Prezo por defecto"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121
 msgid "Apply tab changes"
 msgstr "Aplicar cambios da pestana"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171
 msgid "passwords don't match"
 msgstr "os contrasinais non coinciden"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:85
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:88
 msgid "Day properties"
 msgstr "Propiedades do día"
 
@@ -4095,7 +4097,7 @@ msgstr "Transferir"
 msgid "Work Hours Types List"
 msgstr "Lista de tipos de horas de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:62
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54
 msgid "new milestone"
 msgstr "novo fito"
 
@@ -4103,19 +4105,15 @@ msgstr "novo fito"
 msgid "Value last progress reported"
 msgstr "Valor último progreso notificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300
 msgid "Report Progress"
 msgstr "Notificar progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:154
-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"
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:73
+msgid "Show dependencies"
+msgstr "Mostrar dependencias"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:133
-msgid "Create User"
-msgstr "Crear usuario"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339
 msgid "Schedule from start to deadline"
 msgstr "Planificar dende o principio á data límite"
 
@@ -4125,33 +4123,43 @@ msgstr "Planificar dende o principio á data límite"
 msgid "Estimated days"
 msgstr "Días estimadas"
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:51
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:61
 msgid "Reference date"
 msgstr "Data de referencia"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46
-msgid "Selected node:"
-msgstr "Nodo seleccionado:"
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21
+msgid "LibrePlan: Estimated/Planned Hours Per Task"
+msgstr "LibrePlan: Horas estimadas/planificadas por tarefa"
 
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
-msgid "LibrePlan: Task Scheduling Status In Project"
-msgstr "LibrePlan: Estado de planificación de proxecto"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
+msgid "From chosen date"
+msgstr "A partir da data escollida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:249
-msgid "Create new project from template"
-msgstr "Crear novo proxecto a partir de modelo"
-
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81
 msgid "Progress Evolution"
 msgstr "Evolución do progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:112
+#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22
+msgid "LibrePlan: Exception Days"
+msgstr "LibrePlan: Días de excepción"
+
+#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23
+msgid "LibrePlan: Work Hours"
+msgstr "LibrePlan: Horas de traballo"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311
+msgid "LibrePlan Configuration"
+msgstr "LibrePlan: Configuración"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118
 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)"
 msgstr ""
 "Completa, parcialmente ou non planificada. (Pinche e arrastre para mover "
 "tarefas)"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
 msgid "Original"
 msgstr "Orixinal"
 
@@ -4172,21 +4180,26 @@ msgstr "Non indentable"
 msgid "Resource allocation type"
 msgstr "Tipo de asignación de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:491
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:493
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:71
 msgid "List of materials for all categories (select one to filter)"
 msgstr ""
 "Lista de materiais paa tódalas categorías (seleccione unha para filtrar)"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:99
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:103
 msgid "User disabled"
 msgstr "Usuario deshabilitado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:733
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:35
+#: libreplan-webapp/src/main/webapp/common/error.zul:40
+msgid "Exception type"
+msgstr "Tipo de excepción"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:788
 msgid "In the available periods {0} only {1} hours are available."
 msgstr "Nos períodos dispoñibles {0} só hai dispoñibles {1} horas."
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118
 msgid "Association with profiles"
 msgstr "Asociación con perfís"
 
@@ -4199,20 +4212,32 @@ msgstr "Tarefa {0} : Código duplicado en BD"
 msgid "Message - {0}"
 msgstr "Mensaxe - {0}"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:121
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:21
+msgid "LibrePlan: Settings"
+msgstr "LibrePlan: Preferencias"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:124
 msgid "worker's surname not specified"
 msgstr "apelidos do traballador non especificados"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:211
-msgid "Error on removing workReportType: "
-msgstr "Erro ao borrar tipo de parte de traballo: "
-
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41
 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:48
 msgid "Save changes"
 msgstr "Gardar cambios"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:77
+msgid "Application settings"
+msgstr "Preferencias da aplicación"
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
+msgid "Average of estimated hours"
+msgstr "Media de horas estimadas"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:270
+msgid "Base"
+msgstr "Base"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682
 msgid ""
 "You can not remove the task \"{0}\" because of this or any of its children "
 "are already in use in some work reports"
@@ -4220,59 +4245,60 @@ msgstr ""
 "Non se pode borrar a tarefa \"{0}\" porque algún dos seus fillos está a "
 "usarse nalgún parte de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:192
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203
 msgid "Total dedication"
 msgstr "Dedicación total"
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:45
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44
 msgid "Select source"
 msgstr "Seleccionar orixe"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:825
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:828
 msgid "Worker deleted"
 msgstr "Traballador borrado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:735
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733
 msgid "Select entity, please"
 msgstr "Seleccionar entidade, por favor"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:293
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:291
 msgid "Stretch date must not be greater than the task's end date: "
 msgstr "A data do tramo non debe ser menor cá data de fin da tarefa: "
 
+#: libreplan-webapp/src/main/webapp/users/profiles.zul:23
+msgid "LibrePlan: Profiles"
+msgstr "LibrePlan: Perfís"
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44
 msgid "Subcontratation date"
 msgstr "Data de subcontratación"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:212
-msgid "Number of digits:"
-msgstr "Número de díxitos:"
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22
+msgid "LibrePlan: Subcontracted Tasks"
+msgstr "LibrePlan: Tarefas subcontratadas"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:93
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:182
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:96
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185
 msgid "Day"
 msgstr "Día"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:233
-msgid "Edit Label Type"
-msgstr "Editar tipo de etiqueta"
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:54
+msgid "Current password"
+msgstr "Contrasinal actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:911
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1197
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:349
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:921
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1181
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:276
 msgid "Please, select an item"
 msgstr "Por favor, seleccione un elemento"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:180
-msgid "Work report type saved"
-msgstr "Tipo de partes de traballo gardado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1122
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1096
 msgid "Cannot be higher than finish hour"
 msgstr "Non pode ser posterior á data de fin"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:225
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:204
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:223
 msgid "Prefix"
 msgstr "Prefixo"
 
@@ -4285,44 +4311,48 @@ msgstr "Código subcontratado"
 msgid "New Template element"
 msgstr "Novo elemento de modelo"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
-msgid "LibrePlan: Hours Worked Per Worker In A Month"
-msgstr "LibrePlan: Horas traballadas por traballador nun mes"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:251
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:325
 msgid "The base calendar parent not found"
 msgstr "Calendario base pai non atopado"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97
 msgid "Non Consolidated"
 msgstr "Non consolidado"
 
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43
+msgid "From date"
+msgstr "A partir da data"
+
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34
 msgid "Reassigning type"
 msgstr "Tipo de reasignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:295
-msgid "Edit Virtual Workers Group"
-msgstr "Editar grupo de traballadores virtuais"
+#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22
+msgid "LibrePlan: Virtual Workers Groups"
+msgstr "LibrePlan: Grupos de traballadores virtuais"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:190
+msgid "{0} \"{1}\" can not be deleted because of it is being used"
+msgstr "{0} \"{1}\" non se pode borrar porque está sendo usado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445
 msgid "Edit limiting resource element"
 msgstr "Editar elemento de recurso limitante"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:770
 msgid "The field name must be unique, not null and not empty"
 msgstr "O nome do campo debe ser único, non nulo e non baleiro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85
 msgid "Position"
 msgstr "Posición"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:104
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:108
 msgid "Incorrect authentication"
 msgstr "Identificación incorrecta"
 
@@ -4336,15 +4366,15 @@ msgstr "Editar tarefa"
 msgid "Edit work report"
 msgstr "Editar parte de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:45
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:44
 msgid "Limiting resources (project)"
 msgstr "Recursos limitantes (proxecto)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:764
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:672
 msgid "A description field of the same name already exists."
 msgstr "Xa existe un campo de descrición co mesmo nome."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1174
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177
 msgid ""
 "Progress measurements that are reported by quality forms can not be removed"
 msgstr ""
@@ -4355,26 +4385,21 @@ msgstr ""
 msgid "Current value"
 msgstr "Valor actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:165
-msgid "Edit Quality Form"
-msgstr "Editar formulario de calidade"
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:823
 msgid "Duplicate progress assignment for task "
 msgstr "Asignación de progreso duplicada para a tarefa"
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:54
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:84
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94
 msgid "Save and Continue"
 msgstr "Gardar e continuar"
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:46
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:50
 msgid "Zoom level"
 msgstr "Nivel de zoom"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:166
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:29
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168
 msgid "Quality form"
 msgstr "Formulario de calidade"
 
@@ -4382,46 +4407,64 @@ msgstr "Formulario de calidade"
 msgid "Go!"
 msgstr "Ir!"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:271
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:30
+msgid "Inherits up to date"
+msgstr "Herda ata a data"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:280
 msgid "The name of the label is empty."
 msgstr "O nome da etiqueta está baleiro."
 
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:26
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:27
 msgid "Profile data"
 msgstr "Datos do perfil"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:31
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:35
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:248
 msgid "Configuration"
 msgstr "Configuración"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java:99
-msgid "It was not possible load entity. Not found. Id: "
-msgstr "Non foi posible cargar a entidade. Non atopada. Id: "
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:496
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:528
+msgid "This date can not be empty"
+msgstr "A data non pode ser baleira"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:569
+#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22
+msgid "LibrePlan: Workers"
+msgstr "LibrePlan: Traballadores"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:572
 msgid "Create Virtual Workers Group"
 msgstr "Crear grupo de traballadores virtuais"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:933
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:861
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:95
+msgid "Select type"
+msgstr "Seleccione tipo"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911
 msgid "Hours invested"
 msgstr "Horas invertidas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:160
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:324
+msgid "Authorization"
+msgstr "Autorización"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:119
 msgid ""
 "The name is not valid, there is another progress type with the same name. "
 msgstr "O nome non é válido, xa hai outro tipo de progreso co mesmo nome. "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318
 msgid "Project saved"
 msgstr "Proxecto gardado"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:45
-msgid "task :"
-msgstr "tarefa :"
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44
+msgid "task"
+msgstr "tarefa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:712
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:715
 msgid "ALL"
 msgstr "TODOS"
 
@@ -4429,11 +4472,11 @@ msgstr "TODOS"
 msgid "criterion satisfaction's resource not specified"
 msgstr "recurso do criterio satisfeito non especificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68
 msgid "Derived exception"
 msgstr "Excepción derivada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292
 msgid "Machines"
 msgstr "Máquinas"
 
@@ -4441,10 +4484,6 @@ msgstr "Máquinas"
 msgid "Unit Measures List"
 msgstr "Lista de unidades de medida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:222
-msgid "Confirm deleting this profile. Are you sure?"
-msgstr "Confirmar o borrado deste perfil. ¿Está seguro?"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153
 msgid "Couldn't find element: {0}"
 msgstr "Non se puido atopar o elemento: {0}"
@@ -4458,27 +4497,23 @@ msgstr "Debe seleccionar un escenario de destino"
 msgid "unit type code not found"
 msgstr "código de tipo de unidade non atopado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180
-msgid "Calendar Exception Type saved"
-msgstr "Tipo de excepción de calendario gardado"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342
+msgid "My account"
+msgstr "A miña conta"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:42
-msgid "Resource :"
-msgstr "Recurso :"
-
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:40
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39
 msgid "Destination scenario"
 msgstr "Escenario de destino"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:153
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:105
 msgid "Company view"
 msgstr "Vista da compañía"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:18
-msgid "LibrePlan: Configuration"
-msgstr "LibrePlan: Configuración"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114
+msgid "Both"
+msgstr "Ambos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:751
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758
 msgid "Not editable for containing more that an hours group."
 msgstr "Non editable por conter máis dun grupo de horas."
 
@@ -4486,43 +4521,43 @@ msgstr "Non editable por conter máis dun grupo de horas."
 msgid "Filter by"
 msgstr "Filtrar por"
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:80
 msgid "Limiting resource"
 msgstr "Recurso limitante"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58
-#: libreplan-webapp/src/main/webapp/planner/order.zul:147
+#: libreplan-webapp/src/main/webapp/planner/order.zul:146
 msgid "Calendar allocation"
 msgstr "Asignación de calendario"
 
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
+msgid "Up to date"
+msgstr "Actualizado"
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:819
 msgid "Duplicate value true report global progress for task"
 msgstr ""
 "Valor verdadeiro duplicado para a propiedade 'notificar progreso global' na "
 "tarefa"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:85
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:84
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33
 msgid "Category"
 msgstr "Categoría"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:154
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:156
 msgid "must be greater than finish date"
 msgstr "debe ser maior que a data de fin"
 
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
-msgid "LibrePlan: Materials Needs At Date"
-msgstr "LibrePlan: Necesidades de materiais en data"
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:202
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203
 msgid "[generic all workers]"
 msgstr "[xenérico todos os traballadores]"
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27
 msgid "Category data"
 msgstr "Datos de categoría"
 
@@ -4530,18 +4565,30 @@ msgstr "Datos de categoría"
 msgid "Search"
 msgstr "Buscar"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:242
+msgid "Valid until"
+msgstr "Válido ata"
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128
 msgid "Add New Complementary Field"
 msgstr "Engadir novo campo complementario"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232
 msgid "Work weeks list"
 msgstr "Lista de semanas de traballo"
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:38
 msgid "Source scenario"
 msgstr "Escenario de origen"
 
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
+msgid "LibrePlan: Criteria"
+msgstr "LibrePlan: Criterios"
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23
+msgid "LibrePlan: Transfer Projects Between Scenarios"
+msgstr "LibrePlan: Transferir proxectos entre escenarios"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118
 msgid "%"
 msgstr "%"
@@ -4551,25 +4598,28 @@ msgstr "%"
 msgid "Remove calendar"
 msgstr "Borrar calendario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1548
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1712
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:512
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:648
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1346
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:656
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:228
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:312
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:139
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141
 msgid "must be lower than finish date"
 msgstr "debe ser anterior á data de fin"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:757
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:161
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:766
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:41
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:70
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:135
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33
 msgid "Resource"
 msgstr "Recurso"
@@ -4582,16 +4632,16 @@ msgstr "Total de horas de tarefa"
 msgid "Date last progress reported"
 msgstr "Data último progreso notificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:123
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125
 msgid "Could not load any resource"
 msgstr "Non se puido cargar un recurso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37
 msgid "Work And Progress Per Project"
 msgstr "Traballo e progreso por proxecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:383
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:386
 msgid ""
 "You must allow multiple active criteria for this type to use this assignment "
 "strategy"
@@ -4607,80 +4657,64 @@ msgstr "sub elementos"
 msgid "Default Label"
 msgstr "Etiqueta por defecto"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:113
 msgid "Close"
 msgstr "Pechar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:471
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945
 msgid "Specific Allocations"
 msgstr "Asignacións específicas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:271
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:119
 msgid "error doing reassignation: {0}"
 msgstr "Erro realizando reasignación: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:349
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:423
 msgid "Time filter"
 msgstr "Filtrado de tempo"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:61
-msgid "Move selected task up"
-msgstr "Mover tarefa seleccionada cara arriba"
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27
 msgid "Select criteria set or specific resources for allocation"
 msgstr ""
 "Seleccione conxunto de criterios ou recursos específicos para asignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:316
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63
+msgid "Move selected task up"
+msgstr "Mover tarefa seleccionada cara arriba"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348
 msgid "Create copy"
 msgstr "Crear copia"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33
 msgid "Work Report Lines List"
 msgstr "Lista de liñas de parte de traballo"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28
 msgid "Company data"
 msgstr "Datos da empresa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:215
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151
 msgid "Unit type code cannot be empty"
 msgstr "O código de tipo de unidade non pode ser baleiro"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
-msgid "Average of the estimated hours"
-msgstr "Media de horas estimadas"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:178
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:240
-msgid "Quality form saved"
-msgstr "Formulario de calidade gardado"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:167
-msgid "Create Unit Type"
-msgstr "Crear tipo de unidade"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312
 msgid "Users"
 msgstr "Usuarios"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145
 msgid "Label Type fields"
 msgstr "Campos de tipo de etiqueta"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:105
 msgid "Hours Management"
 msgstr "Administración de horas"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:33
-msgid "New task:"
-msgstr "Nova tarefa:"
-
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:140
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:144
 msgid ""
 "Please use some of the compatible browsers: Chrome, Firefox, Safari or "
 "Epiphany."
@@ -4692,7 +4726,7 @@ msgstr ""
 msgid "specific allocation"
 msgstr "asignación específica"
 
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:147
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:148
 msgid "company name has to be unique. It is already used"
 msgstr "o nome da empresa debe ser único. Xa está a ser usado"
 
@@ -4709,27 +4743,23 @@ msgstr ""
 msgid "Template saved"
 msgstr "Modelo gardado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:305
-msgid "Confirm deleting this User. Are you sure?"
-msgstr "Confirmar o borrado deste usuario. ¿Está seguro?"
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:577
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:565
 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"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179
-msgid "User saved"
-msgstr "Usuario gardado"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:23
+msgid "LibrePlan: Configuration"
+msgstr "LibrePlan: Configuración"
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47
 msgid "Task quality form name"
 msgstr "Nombre del formulario de calidad de tarea"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1097
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:156
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:161
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:181
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1093
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:158
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:163
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:183
 msgid "Some cost category assignments overlap in time"
 msgstr "Algunhas asignacións a categorías de custo solápanse no tempo"
 
@@ -4753,49 +4783,49 @@ msgstr "Saír da sesión"
 msgid "Group"
 msgstr "Grupo"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111
+msgid "Apply filter to"
+msgstr "Aplicar filtro a"
+
 #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
 msgid "Statistics list "
 msgstr "Lista de estatísticas"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116
+msgid "Please, enter a valid effort"
+msgstr "Por favor, introduza un esforzo válido"
+
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:59
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58
 msgid "Enabled"
 msgstr "Activado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143
-msgid "Edit Exception Day Type"
-msgstr "Editar tipo de día de excepción"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222
 msgid "All resources must be limiting. "
 msgstr "Todos os recursos deben ser limitantes. "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:327
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:525
 msgid "Filter by worker"
 msgstr "Filtrar por traballadores"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22
-msgid "LibrePlan: Machines"
-msgstr "LibrePlan: Máquinas"
-
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47
 msgid "Load due to current project"
 msgstr "Carga debido ao proxecto actual"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1344
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305
 msgid "You are going to change the assignment function. Are you sure?"
 msgstr "Vai cambiar a función de asignación. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322
 msgid "Exception Days"
 msgstr "Días de excepción"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:200
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:183
 msgid "There must be at least 2 stretches for doing interpolation"
 msgstr "Debe haber alo menos dous tramos para facer interpolación"
 
@@ -4803,59 +4833,58 @@ msgstr "Debe haber alo menos dous tramos para facer interpolación"
 msgid "Incompatible update: stored resource is not of type: {0}"
 msgstr "Actualización incompatible: i recurso almacenado non é de tipo: {0}"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:42
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:213
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:98
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:109
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114
 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:42
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:82
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:132
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:137
 msgid "Save & Continue"
 msgstr "Gardar e continuar"
 
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
+msgid "LibrePlan: Work And Progress Per Project"
+msgstr "LibrePlan: Traballo e progreso por proxecto"
+
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:90
 msgid "Scheduling mode"
 msgstr "Modo de planificación"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:53
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:55
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23
 msgid "Filter"
 msgstr "Filtrar"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:943
+msgid "Work Report Type"
+msgstr "Tipo de parte de traballo"
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:26
 msgid "Assigned locations"
 msgstr "Ubicacións asignadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:247
-msgid "Unit type saved"
-msgstr "Tipo de unidade gardado"
-
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:267
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:129
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:138
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:270
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:131
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:140
 msgid "Two hour costs with the same type overlap in time"
 msgstr "Dous custos por hora co mesmo tipo solápanse no tempo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:201
-msgid "Create Machine"
-msgstr "Crear máquina"
-
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49
 msgid "Report progress"
 msgstr "Notificar progreso"
@@ -4864,7 +4893,7 @@ msgstr "Notificar progreso"
 msgid "ACWP"
 msgstr "ACWP"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:736
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:791
 msgid "The periods available depend on the resource's calendar."
 msgstr "Os períodos dispoñibles dependen do calendario do recurso."
 
@@ -4872,7 +4901,7 @@ msgstr "Os períodos dispoñibles dependen do calendario do recurso."
 msgid "START"
 msgstr "INICIO"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342
 msgid "Schedule from the deadline to start"
 msgstr "Planificar dende a data límite ao principio"
 
@@ -4880,18 +4909,18 @@ msgstr "Planificar dende a data límite ao principio"
 msgid "generic machines allocation"
 msgstr "asignación xenérica de máquinas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:372
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:375
 msgid "Non limiting resource assignation"
 msgstr "Asignación de recursos non limitantes"
 
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:82
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
 msgid "Back"
 msgstr "Atrás"
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58
 msgid "Subcontractor"
 msgstr "Subcontratista"
 
@@ -4900,22 +4929,18 @@ msgstr "Subcontratista"
 msgid "Administration"
 msgstr "Administración"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1531
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1694
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:495
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:631
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1329
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:638
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:211
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:293
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:239
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242
 msgid "must be greater than start date"
 msgstr "debe ser maior que a data de inicio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:93
-msgid "Create Company"
-msgstr "Crear empresa"
-
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47
 msgid "Cancel and return"
 msgstr "Cancelar e volver"
@@ -4925,7 +4950,6 @@ msgstr "Cancelar e volver"
 msgid "Assign quality form"
 msgstr "Asignar formulario de calidade"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387
 msgid "Delete item {0}. Are you sure?"
 msgstr "Borrar elemento {0}. ¿Está seguro?"
@@ -4934,16 +4958,15 @@ msgstr "Borrar elemento {0}. ¿Está seguro?"
 msgid "worked hours"
 msgstr "horas traballadas"
 
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:50
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:51
 msgid "Unit measure name"
 msgstr "Nome da unidade de medida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:772
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144
 msgid "cannot include a progress of the same progress type twice"
 msgstr "non se pode asignar un progreso do mesmo tipo dúas veces"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:489
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:476
 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"
 
@@ -4952,35 +4975,34 @@ msgstr "unha liña de parte de traballo non ten este tipo de etiqueta asignado"
 msgid "Allocations"
 msgstr "Asignacións"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:32
-msgid "Choosing Template"
-msgstr "Selección de modelo"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52
 msgid "Task code"
 msgstr "Código da tarefa"
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49
 msgid "Length"
 msgstr "Lonxitude"
 
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:85
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89
 msgid "Capacity"
 msgstr "Capacidade"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:299
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133
 msgid "Create derived"
 msgstr "Crear derivado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:627
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:302
+msgid "Label Types"
+msgstr "Tipos de etiqueta"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:638
 msgid "it must be greater than zero"
 msgstr "debe ser maior que cero"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
 msgid "must be a real positive number"
 msgstr "debe ser un número real positivo"
 
@@ -4993,35 +5015,34 @@ msgstr "Non se fixeron asignacións"
 msgid "Total hours task"
 msgstr "Total de horas de tarefa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:409
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:441
 msgid "Removed calendar \"{0}\""
 msgstr "Borrado calendario \"{0}\""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1083
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063
 msgid "Create project"
 msgstr "Crear proxecto"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:49
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:542
+msgid "This date can not include the whole next work week"
+msgstr "Esta data non pode incluír á próxima semana de traballo completa"
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:51
 msgid ""
 "Allow multiple values of this type of criterion in the same period of time"
 msgstr ""
 "Permitir múltiples valores deste tipo de criterio no mesmo período de tempo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294
 msgid ""
 "The date is not valid, the date must be unique for this progress assignment"
 msgstr "A data non é válida, debe ser única para esta asignación de progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:113
-msgid "Edit Criterion Type"
-msgstr "Editar tipo de criterio"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:445
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:453
 msgid "The code cannot be empty."
 msgstr "O código non pode estar baleiro"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
 msgid "Human hours per machine working hour within configuration unit"
 msgstr ""
 "Horas humanas por hora de traballo de máquina dentro de unidade de "
@@ -5040,12 +5061,20 @@ msgstr ""
 msgid "New work report"
 msgstr "Novo parte de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865
 msgid "yes"
 msgstr "si"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:304
+msgid "Root calendar"
+msgstr "Calendario raíz"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:263
+msgid "Port"
+msgstr "Porto"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862
 msgid ""
 "Deleting this subcontracted project, you are going to lose the relation to "
 "report progress. Are you sure?"
@@ -5066,17 +5095,17 @@ msgstr "Data de fin"
 msgid "Validate"
 msgstr "Validar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:143
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:175
 msgid "This resource has already been added."
 msgstr "Este recurso xa fora engadido."
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:149
 msgid "Calendar exception types"
 msgstr "Tipos de excepcións de calendario"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
 msgid "Cost category assignment"
 msgstr "Asignación de categoría de custo"
 
@@ -5084,14 +5113,10 @@ msgstr "Asignación de categoría de custo"
 msgid "missing code in a hour cost"
 msgstr "falta código nun custo por hora"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:822
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870
 msgid "All workers"
 msgstr "Todos os traballadores"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:304
-msgid "Label saved"
-msgstr "Etiqueta gardada"
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25
 msgid "Select criteria or resources"
 msgstr "Seleccione criterios ou recursos"
@@ -5102,44 +5127,47 @@ msgstr "Seleccione criterios ou recursos"
 msgid "Select required criteria set and press filter button"
 msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1018
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1279
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:990
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1181
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1438
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:229
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:231
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:233
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:280
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:380
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:147
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:740
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:135
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:63
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:47
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:72
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:49
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:44
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:50
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:84
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:88
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:93
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:33
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:53
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:42
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:44
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:94
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:92
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:94
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:44
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:55
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:44
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96
@@ -5150,10 +5178,6 @@ msgstr "non pode ser nulo ou baleiro"
 msgid "Hours Group {0} : Duplicate code in DB"
 msgstr "Grupo de horas {0} : Clave duplicada en BD"
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
-msgid "LibrePlan: Work And Progress Per Project"
-msgstr "LibrePlan: Traballo e progreso por proxecto"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:52
 msgid "New code"
@@ -5163,25 +5187,21 @@ msgstr "Novo código"
 msgid "The progress type cannot be modified"
 msgstr "O tipo de progreso non pode ser modificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:412
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392
 msgid "Calculate Resources per Day"
 msgstr "Calcular recursos por día"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:996
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:904
 msgid "The index fields and labels must be uniques and consecutives"
 msgstr "Os campos de índice e as etiquetas deben ser únicas e consecutivas"
 
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21
-msgid "LibrePlan: Estimated/Planned Hours Per Task"
-msgstr "LibrePlan: Horas estimadas/planificadas por tarefa"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130
 msgid "Estimate To Complete"
 msgstr "Estimación do custo pendente"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:84
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:83
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30
 msgid "Unit type"
 msgstr "Tipo de unidade"
@@ -5194,21 +5214,17 @@ msgstr "Carga debido a outras asignacións"
 msgid "Sum of all task leafs imputed hours"
 msgstr "Suma de horas imputadas por todas as tarefas folla"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:644
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554
 msgid "This machine was already removed by other user"
 msgstr "Esta máquina xa foi borrada por outro usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293
-msgid "Work Reports"
-msgstr "Partes de traballo"
-
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:26
 msgid "Calendar data"
 msgstr "Datos do calendario"
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:173
-msgid "login name is already being used by another user"
-msgstr "o nome de usuario xa está sendo usado"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294
+msgid "Work Reports"
+msgstr "Partes de traballo"
 
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22
 msgid "Cost Categories List"
@@ -5218,31 +5234,33 @@ msgstr "Lista de categorías de custo"
 msgid "code is already used"
 msgstr "o código xa está a ser usado"
 
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:67
+msgid "Labels list"
+msgstr "Lista de etiquetas"
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152
 msgid "Criterion Requirements"
 msgstr "Criterios requiridos"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:148
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:215
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76
 msgid "Extra Effort"
 msgstr "Esforzo extra"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:57
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59
 msgid "Move selected task down"
 msgstr "Mover tarefa seleccionada cara abaixo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:260
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269
 msgid "Already exists other label with the same name"
 msgstr "Xa existe outra etiqueta co mesmo nome"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:32
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32
 msgid "Customer Reference"
 msgstr "Referencia do cliente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:777
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147
 msgid "spread values are not valid, at least one value should be true"
@@ -5261,15 +5279,15 @@ msgstr "Optimista"
 msgid "SV"
 msgstr "SV"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:85
 msgid "Our company login"
 msgstr "Nome de usuario da nosa empresa"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1483
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1471
 msgid "Filter work reports"
 msgstr "Filtrar partes de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:395
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:427
 msgid ""
 "Default calendar cannot be removed. Please, change the default calendar in "
 "the Configuration window before."
@@ -5277,10 +5295,10 @@ msgstr ""
 "O calendario por defecto non se pode borrar. Por favor, cambie antes o "
 "calendario por defecto na ventá de configuración."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:587
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:932
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63
@@ -5288,7 +5306,7 @@ msgstr ""
 msgid "Progress"
 msgstr "Progreso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:128
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:257
 msgid ""
 "This criterion type cannot be deleted because it has assignments to projects "
 "or resources"
@@ -5296,31 +5314,27 @@ msgstr ""
 "Este tipo de criterio non se pode borrar porque ten asignacións a proxectos "
 "ou recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1221
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224
 msgid "All progress types have already been assigned."
 msgstr "Xa se asignaron todos os tipos de progreso."
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
 msgid "Price per hour"
 msgstr "Prezo por hora"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:209
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211
 msgid "Project: {0} "
 msgstr "Proxecto: {0} "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315
 msgid "Calendars"
 msgstr "Calendarios"
 
-#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21
-msgid "LibrePlan: Page not found"
-msgstr "LibrePlan: Páxina non atopada"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:355
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:360
 msgid "The date cannot be null"
 msgstr "A data non pode ser nula"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:317
 msgid ""
 "Another task in the same branch is already reporting progress for this "
 "quality form"
@@ -5328,6 +5342,10 @@ msgstr ""
 "Outra tarefa na mesma rama xa está informando dun progreso para este "
 "formulario de calidade"
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30
+msgid "options"
+msgstr "opcións"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92
 msgid "Latest date"
 msgstr "Data máis tardía"
@@ -5336,13 +5354,18 @@ msgstr "Data máis tardía"
 msgid "Show only current satisfied criteria"
 msgstr "Mostrar só os criterios satisfeitos actualmente"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23
+msgid "LibrePlan: Work Reports"
+msgstr "LibrePlan: Partes de traballo"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373
 msgid "Error on showing delete confirm"
 msgstr "Erro ao mostrar a confirmación de borrado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:671
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623
 msgid "Sum of all rows"
 msgstr "Suma de todas as filas"
 
@@ -5358,15 +5381,11 @@ msgstr "Hora de fin"
 msgid "Done {0} of {1}"
 msgstr "Feito {0} de {1}"
 
-#: libreplan-webapp/src/main/webapp/users/users.zul:23
-msgid "LibrePlan: Accounts"
-msgstr "LibrePlan: Contas"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31
+msgid "Planned start"
+msgstr "Inicio planificado"
 
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23
-msgid "LibrePlan: Scenarios Management"
-msgstr "LibrePlan: Xestión de escenarios"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:194
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:177
 msgid ""
 "Last stretch should have one hundred percent for length and amount of work "
 "percentage"
@@ -5374,12 +5393,12 @@ msgstr ""
 "O último tramo debe ter 100% de porcentaxes de lonxitude e cantidade de "
 "traballo"
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:60
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:96
 msgid "Filter by projects"
 msgstr "Filtrar por proxectos"
 
@@ -5387,17 +5406,17 @@ msgstr "Filtrar por proxectos"
 msgid "Criteria of selected type "
 msgstr "Criterios do tipo seleccionado "
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33
 msgid "Each worker configuration unit name"
 msgstr "Nome da unidade de configuración de cada traballador"
 
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:224
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:221
 msgid "Active"
 msgstr "Activo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1258
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261
 msgid "This progress measurement can not be in "
 msgstr "Esta medida de progreso non pode estar en "
 
@@ -5405,7 +5424,7 @@ msgstr "Esta medida de progreso non pode estar en "
 msgid "Inherited labels"
 msgstr "Etiquetas herdadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1243
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246
 msgid ""
 "This progress can not be changed or removed, because it has got consolidated "
 "progress. It is needed to remove the consolidation on all its progress."
@@ -5415,12 +5434,12 @@ msgstr ""
 "progreso."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:910
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917
 msgid "Unindent"
 msgstr "Desindentar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:932
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1390
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384
 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"
 
@@ -5428,7 +5447,11 @@ msgstr "O valor non é válido, o valor actual non debe estar baleiro"
 msgid "Direct labels"
 msgstr "Etiquetas directas"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:92
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43
+msgid "From today"
+msgstr "A partir de hoxe"
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:96
 msgid "Log in"
 msgstr "Entrar"
 
@@ -5436,15 +5459,15 @@ msgstr "Entrar"
 msgid "Project name"
 msgstr "Nome do proxecto"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55
 msgid "Precision"
 msgstr "Precisión"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:372
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:359
 msgid "missing code in a work report line"
 msgstr "falta código nunha liña de parte de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:985
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928
 msgid "Efforts"
 msgstr "Esforzos"
 
@@ -5452,32 +5475,30 @@ msgstr "Esforzos"
 msgid "Show all reported hours"
 msgstr "Mostrar todas as horas notificadas"
 
-#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22
-msgid "LibrePlan: Subcontracted Tasks"
-msgstr "LibrePlan: Tarefas subcontratadas"
-
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113
 msgid "Projects List"
 msgstr "Listado de proxectos"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:137
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:65
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:49
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:51
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:52
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:136
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:44
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:80
 msgid "Generate code"
 msgstr "Xerar código"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:116
 msgid "Scheduling state"
 msgstr "Estado de planificación"
 
@@ -5489,19 +5510,27 @@ msgstr "Este modelo non pode borrarse porque ten aplicacións."
 msgid "The code sequence is already in use and it can not be updated."
 msgstr "O código da secuencia xa está en uso e non se pode actualizar."
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21
-msgid "LibrePlan: Project Costs Per Resource"
-msgstr "LibrePlan: Custos de proxectos por recurso"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:332
+msgid "Import LDAP roles"
+msgstr "Importar roles do LDAP"
+
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:43
+msgid "Personal Data"
+msgstr "Datos persoais"
 
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:206
 msgid "criterion satisfaction's criterion not specified"
 msgstr "criterio do criterio satisfeito non especificado"
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
+msgid "LibrePlan: Hours Worked Per Resource"
+msgstr "LibrePlan: Horas traballadas por recurso"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:163
 msgid "Number of iterations should be between 1 and "
 msgstr "O número de iteracións debe estar entre 1 e "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:126
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142
 msgid "Scenarios must be enabled as more elements than master exist"
 msgstr ""
 "Os escenarios deben estar habilitados xa que existen máis elementos que "
@@ -5521,11 +5550,11 @@ msgstr "Tarefa {0} : O grupo de tarefas ten un tipo incompatible con {1}"
 msgid "Profiles authorization"
 msgstr "Autorización de perfís"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293
 msgid "Virtual Workers Groups"
 msgstr "Grupos de traballadores virtuais"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:144
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:95
 msgid "Planning charts expanded"
 msgstr "Gráficas de planificación expandidas"
 
@@ -5533,14 +5562,26 @@ msgstr "Gráficas de planificación expandidas"
 msgid "Assignation"
 msgstr "Asignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:431
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:694
+msgid "Inh"
+msgstr "Her"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:339
 msgid "Not deletable"
 msgstr "Imborrable"
 
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28
+msgid "Administrator"
+msgstr "Administrador"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:189
 msgid "Doing {0} reassignations"
 msgstr "Realizando {0} reasignacións"
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:195
+msgid "Select entity"
+msgstr "Seleccione entidade"
+
 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48
 msgid "code not specified"
 msgstr "código non especificado"
@@ -5549,7 +5590,7 @@ msgstr "código non especificado"
 msgid "Projects list"
 msgstr "Lista de proxectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:190
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:973
 msgid ""
 "Cannot delete work report type. There are some work reports bound to it."
 msgstr ""
@@ -5560,41 +5601,41 @@ msgstr ""
 msgid "Criterion Type List"
 msgstr "Lista de tipos de criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:732
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:702
 msgid "Overall progress"
 msgstr "Progreso global"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:52
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54
 msgid "Create template from selected task"
 msgstr "Crear modelo a partir de tarefa seleccionada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:119
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:129
 msgid "All projects"
 msgstr "Todos os proxectos"
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:79
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:83
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:284
 msgid "Password"
 msgstr "Contrasinal"
 
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:93
 msgid "Observations"
 msgstr "Observacións"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:962
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942
 msgid "Edit project"
 msgstr "Editar proxecto"
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:27
 msgid "Progress assignments"
 msgstr "Asignación de progreso"
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:27
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:285
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:262
 msgid "Valid from"
 msgstr "Válido desde"
 
@@ -5606,24 +5647,24 @@ msgstr "a data de excepción xa existe"
 msgid "There exists other template with the same name."
 msgstr "Xa existe outro modelo co mesmo nome."
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53
 msgid "Month"
 msgstr "Mes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:900
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:911
 msgid "{0} could not be allocated. Cannot allocate more than one resource"
 msgstr "Non se puido asignar {0}. Non se pode asignar máis que un recurso"
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:56
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
 msgid "Color"
 msgstr "Cor"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759
-msgid "Advanced assignment saved"
-msgstr "Asignación avanzada gardada"
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:105
+msgid "Current password is incorrect"
+msgstr "O contrasinal actual é incorrecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367
 msgid "Cannot insert material in general view. Please, select a category"
 msgstr ""
 "Non se pode insertar material na vista xeral. Por favor, seleccione unha "
@@ -5633,36 +5674,40 @@ msgstr ""
 msgid "criterion satisfaction's start date not specified"
 msgstr "data de inicio do criterio satisfeito non especificada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:371
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405
 msgid "Only {0} resources per day were achieved for current allocation"
 msgstr "Só se lograon {0} recursos por día para a asignación actual"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311
+msgid "Delete {0} \"{1}\". Are you sure?"
+msgstr "Borrar {0} \"{1}\". ¿Está seguro?"
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:79
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:97
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
-#: libreplan-webapp/src/main/webapp/planner/order.zul:69
-#: libreplan-webapp/src/main/webapp/planner/order.zul:132
-#: libreplan-webapp/src/main/webapp/planner/order.zul:167
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:83
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:43
+#: libreplan-webapp/src/main/webapp/planner/order.zul:70
+#: libreplan-webapp/src/main/webapp/planner/order.zul:131
+#: libreplan-webapp/src/main/webapp/planner/order.zul:166
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79
 #: libreplan-webapp/src/main/webapp/planner/main.zul:66
 msgid "Accept"
 msgstr "Aceptar"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:259
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:266
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:273
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:280
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:308
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:339
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:346
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:353
 msgid "Example: {0}"
 msgstr "Exemplo: {0}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:283
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:303
-#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:40
-msgid "Edit Worker"
-msgstr "Editar traballador"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:458
 msgid ""
 "Create new material assignment out of material assignment {0}. Are you sure?"
@@ -5670,7 +5715,7 @@ msgstr ""
 "Crear nova asignación de material fóra da asignación de material {0}. ¿Está "
 "seguro?"
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:190
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:167
 msgid "Work report lines"
 msgstr "Liñas do parte de traballo"
@@ -5679,16 +5724,11 @@ msgstr "Liñas do parte de traballo"
 msgid "Calculated"
 msgstr "Calculado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:213
 msgid "Completed: {0}% "
 msgstr "Completado: {0}% "
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:118
-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}"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1178
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181
 msgid "Calculated progress measurement can not be removed"
 msgstr "As medidas de progreso calculadas non se poden borrar"
 
@@ -5697,22 +5737,22 @@ msgstr "As medidas de progreso calculadas non se poden borrar"
 msgid " The "
 msgstr " O "
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:51
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:55
 msgid "Access to the system"
 msgstr "Acceso ao sistema"
 
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:48
 msgid "Probability"
 msgstr "Probabilidade"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159
 msgid "Click on "
 msgstr "Click en"
 
@@ -5737,16 +5777,20 @@ msgstr "instancia non atopada"
 msgid "Priority"
 msgstr "Prioridade"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:207
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:219
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80
 msgid "Infinitely Over Assignable"
 msgstr "Sobreasignable infinitamente"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:425
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47
+msgid "Apply changes and continue edition"
+msgstr "Aplicar cambios e continuar a edición"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426
 msgid "criterion names must be unique inside a criterion type"
 msgstr "o nome do criterio debe ser único dentro dun tipo de criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:735
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:790
 msgid ""
 "The periods available depend on the satisfaction of the criteria by the "
 "resources and their calendars."
@@ -5754,52 +5798,53 @@ msgstr ""
 "Os períodos dispoñibles dependen da satisfacción dos criterios polos "
 "recursos e os seus calendarios."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:814
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:79
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:59
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:287
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:44
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:131
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:264
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:69
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:47
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:76
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:59
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:81
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:36
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:49
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:80
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:51
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:76
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116
 msgid "Code"
 msgstr "Código"
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:41
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40
 msgid "Add stretch"
 msgstr "Engadir tramo"
 
@@ -5811,7 +5856,7 @@ msgstr "Mostrar asignacións de recursos"
 msgid "Assignation type"
 msgstr "Tipo de asignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:387
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367
 msgid "Calculate Workable Days"
 msgstr "Calcular días laborais"
 
@@ -5823,16 +5868,17 @@ msgstr ""
 "A data de inicio non é válida, a data de inicio nova debe ser anterior á "
 "data de fin"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:55
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:53
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117
 msgid "Start date"
 msgstr "Data de inicio"
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:171
 msgid "Update exception"
 msgstr "Actualizar excepción"
 
@@ -5845,8 +5891,7 @@ msgstr "Non se pode realizar a operación"
 msgid "Budget"
 msgstr "Presuposto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "May"
 msgstr "Maio"
 
@@ -5854,7 +5899,7 @@ msgstr "Maio"
 msgid "Already exists other criterion with the same name"
 msgstr "Xa existe outro criterio co mesmo nome"
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38
 msgid "Unit name"
 msgstr "Nome da unidade"
 
@@ -5863,10 +5908,6 @@ msgstr "Nome da unidade"
 msgid "Write"
 msgstr "Escribir"
 
-#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21
-msgid "LibrePlan: Labels"
-msgstr "LibrePlan: Etiquetas"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35
@@ -5875,7 +5916,7 @@ msgstr "LibrePlan: Etiquetas"
 msgid "Project code"
 msgstr "Código de proxecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:499
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503
 msgid "Assign element to queue automatically"
 msgstr "Asignar elemento á cola automáticamente"
 
@@ -5891,32 +5932,27 @@ msgstr ""
 "Data despois da cal a tarefa debe empezar (presione enter no cadro de texto "
 "para abrir o calendario ou escriba a data directamente)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:326
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:603
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43
 msgid "Normal"
 msgstr "Normal"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:317
 msgid "Date cannot be null"
 msgstr "A data non pode ser nula"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:765
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:169
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:108
+msgid "Project view"
+msgstr "Vista de proxecto"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:774
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:166
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:76
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:142
 msgid "Task Code"
 msgstr "Código da tarefa"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:157
-msgid "Project view"
-msgstr "Vista de proxecto"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:96
-msgid "Create Profile"
-msgstr "Crear perfil"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:747
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:655
 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."
 
@@ -5931,50 +5967,52 @@ msgstr "Probabilidade %"
 msgid "New criterion"
 msgstr "Criterio novo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:730
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:346
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:542
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:700
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:813
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49
 msgid "Load"
 msgstr "Carga"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:937
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:60
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:682
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:65
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:82
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:81
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:41
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:120
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:101
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51
 msgid "Description"
 msgstr "Descrición"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
-msgid "LibrePlan: Criteria"
-msgstr "LibrePlan: Criterios"
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:45
+msgid "Apply"
+msgstr "Aplicar"
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117
-msgid "Go to advanced Allocation"
-msgstr "Ir a asignación avanzada"
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48
+msgid "Selected node"
+msgstr "Nodo seleccionado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:660
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:671
 msgid "already exists an allocation for criteria {0}"
 msgstr "xa existe unha asignación para os criterios {0}"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288
 msgid "Project Templates"
 msgstr "Modelos de proxectos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339
 msgid "Forward"
 msgstr "Adiante"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:465
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469
 msgid "Invalid queue element"
 msgstr "Elemento de cola inválido"
 
@@ -5988,21 +6026,22 @@ msgstr "Número de aplicacións finalizadas"
 msgid "Unnasigned"
 msgstr "Non asignado"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:70
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:163
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:74
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165
 msgid "User"
 msgstr "Usuario"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405
 msgid "At least one HoursGroup is needed"
 msgstr "É necesario alo menos un HoursGroup"
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71
 msgid "Interacts with applications"
 msgstr "Interactúa con aplicacións"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:257
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:289
 msgid "Virtual worker"
 msgstr "Traballador virtual"
 
@@ -6010,26 +6049,22 @@ msgstr "Traballador virtual"
 msgid "Length percentage should be between 0 and 100"
 msgstr "A porcentaxe de duración debería estar entre 0 e 100"
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:48
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:50
 msgid "Multiple values per resource"
 msgstr "Múltiples valores por recurso"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
-msgid "Hours:"
-msgstr "Horas:"
-
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:62
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58
 msgid "Split"
 msgstr "Dividir"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:101
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:105
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:107
 msgid "please, select a project"
 msgstr "por favor, seleccione un proxecto"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:118
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:122
 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers"
 msgstr "Compatible cos navegadores Chrome, Firefox, Safari e Epiphany"
 
@@ -6039,14 +6074,14 @@ msgstr "Compatible cos navegadores Chrome, Firefox, Safari e Epiphany"
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:94
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51
 msgid "Starting date"
 msgstr "Data de inicio"
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:63
 msgid "Add materials"
 msgstr "Engadir materiais"
 
@@ -6054,66 +6089,61 @@ msgstr "Engadir materiais"
 msgid "Load 100%"
 msgstr "Carga 100%"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:991
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84
 msgid "Function"
 msgstr "Función"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:775
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:394
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:745
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:364
 msgid "date in future"
 msgstr "data no futuro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:654
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:630
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851
 msgid "New project version"
 msgstr "Nova versión de proxecto"
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:156
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:137
 msgid "Format"
 msgstr "Formato"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:174
-msgid "Edit Unit Type"
-msgstr "Editar tipo de unidade"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:332
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:474
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1249
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:472
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:532
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:27
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:24
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:39
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:41
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:48
 msgid "Edit"
 msgstr "Editar"
 
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
 msgid "Init date"
 msgstr "Data de inicio"
 
@@ -6121,7 +6151,11 @@ msgstr "Data de inicio"
 msgid "Responsible"
 msgstr "Responsable"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:457
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:60
+msgid "New password"
+msgstr "Novo contrasinal"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352
 msgid "percentage must be in range (0,100]"
 msgstr "a porcentaxe debe estar no rango (0,100]"
 
@@ -6130,7 +6164,7 @@ msgstr "a porcentaxe debe estar no rango (0,100]"
 msgid "New Description"
 msgstr "Nova descrición"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1154
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150
 msgid ""
 "resources cost category assignment codes must be unique inside a resource"
 msgstr ""
@@ -6151,22 +6185,23 @@ msgstr ""
 "criterionSatisfaction co mesmo criterionType"
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61
+#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:85
 msgid "Unable to convert {0} value to {1} type"
 msgstr "Non se puido convertir o valor {0} ao tipo {1}"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:198
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:114
 msgid "Tree {0} sucessfully flattened"
 msgstr "Árobre {0} aplanada satisfatoriamente"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:83
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:82
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31
 msgid "Unit price"
 msgstr "Prezo da unidade"
 
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64
 msgid "Project Code"
 msgstr "Código do proxecto"
 
@@ -6178,16 +6213,11 @@ msgstr "Data de comunicación"
 msgid "Reassigning"
 msgstr "Reasignando"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:588
-msgid ""
-"Cannot delete that cost category because there are resources assigned to it."
-msgstr ""
-"Non se pode borrara categoría de custo porque hai recursos asignados a ela."
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:633
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:644
 msgid "{0} already assigned to resource allocation list"
 msgstr "{0} xa está na lista de asignación de recursos"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:184
 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:27
 msgid "Unit Measure"
 msgstr "Unidade de medida"
@@ -6203,14 +6233,13 @@ msgstr "Lista de tipos de etiqueta"
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:128
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:46
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:98
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:127
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:101
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:42
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
@@ -6220,25 +6249,25 @@ msgstr "Lista de tipos de etiqueta"
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:36
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:83
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:123
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:103
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:144
 msgid "Type"
 msgstr "Tipo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:346
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:347
 msgid "{0} projects reassignation remaining"
 msgstr "quedan {0} proxectos por reasignar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:637
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:542
 msgid ""
 "This machine cannot be deleted because it has assignments to projects or "
 "imputed hours"
@@ -6246,13 +6275,16 @@ msgstr ""
 "Esta máquina non se pode borrar porque ten asignacións a proxectos ou horas "
 "imputadas"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "November"
 msgstr "Novembro"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1310
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:89
+msgid "Enable/Disable"
+msgstr "Habilitar/Deshabilitar"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304
 msgid ""
 "Value is not valid, the value must be greater than the value of the previous "
 "progress."
@@ -6267,58 +6299,56 @@ msgstr "BCWS"
 msgid " in the specified directory."
 msgstr " no directorio especificado."
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1148
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144
 msgid "criterion satisfaction codes must be unique inside a resource"
 msgstr "o código do criterio debe ser único dentro dun recurso"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865
 msgid "no"
 msgstr "non"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:360
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:347
 msgid "missing code in a work report."
 msgstr "falta código nun parte de traballo."
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:85
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:105
 msgid "Criterion"
 msgstr "Criterio"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:94
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:103
 msgid "unl"
 msgstr "ili"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:76
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:290
+msgid "Test LDAP connection"
+msgstr "Probar a conexión co LDAP"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:96
 msgid "Generate code for"
 msgstr "Xerar código para"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:397
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:481
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:468
 #: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103
 msgid "missing code in a label"
 msgstr "falta o código nunha etiqueta"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:139
-msgid "is not supported for its use with LibrePlan."
-msgstr "no está soportado para o seu uso con LibrePlan."
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:123
 msgid "Actual Cost Work Performed"
 msgstr "Custo de traballo realizado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:185
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172
 msgid "Create project from Template"
 msgstr "Crear proxecto a partir de modelo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310
-msgid "LibrePlan Configuration"
-msgstr "LibrePlan: Configuración"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:406
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
@@ -6328,10 +6358,6 @@ msgstr ""
 " O código non pode conter caracteres como '_' \n"
 " e non debe ser baleiro"
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51
-msgid "Average of the worked hours"
-msgstr "Media de horas traballadas"
-
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43
 msgid "an authorization type must be set"
 msgstr "Debe seleccionar un tipo de autorización"
@@ -6340,8 +6366,7 @@ msgstr "Debe seleccionar un tipo de autorización"
 msgid "Must start after (days since beginning project)"
 msgstr "Debe empezar despois de (días desde o inicio do proxecto)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:653
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:629
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850
 msgid ""
 "Confirm creating a new project version for this scenario and derived. Are "
 "you sure?"
@@ -6349,58 +6374,67 @@ msgstr ""
 "Confirmar a creación dunha nova versión do proxecto para este escenario e os "
 "seus derivados. ¿Está seguro?"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:150
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:68
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:44
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:74
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:45
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:73
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:80
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:163
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:92
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:133
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105
 msgid "Add"
 msgstr "Engadir"
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:47
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:43
+#: libreplan-webapp/src/main/webapp/common/error.zul:48
+msgid "Stacktrace"
+msgstr "Stacktrace"
+
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:48
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:82
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120
 msgid "Unselect"
 msgstr "Deseleccionar"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:609
 msgid "You should select the type of exception"
 msgstr "Debe seleccionar o tipo de excepción"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:99
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46
 msgid "Deadline"
 msgstr "data límite"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299
 msgid "Subcontracted Tasks"
 msgstr "Tarefas subcontratadas"
 
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:118
 msgid "Filter by categories or materials"
 msgstr "Filtrar por categorías ou materiais"
 
@@ -6408,7 +6442,7 @@ msgstr "Filtrar por categorías ou materiais"
 msgid "Amount work percentage should be between 0 and 100"
 msgstr "A porcentaxe de cantidade de traballo debe estar entre 0 y 100"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:29
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
 msgid "Machine data"
 msgstr "Datos da máquina"
 
@@ -6416,19 +6450,18 @@ msgstr "Datos da máquina"
 msgid "VAC"
 msgstr "VAC"
 
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:28
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:29
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55
 msgid "Label type"
 msgstr "Tipo de etiqueta"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:246
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:319
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:243
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236
 msgid "Advanced Allocation"
 msgstr "Asignación avanzada"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:309
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310
 msgid "Administration / Management"
 msgstr "Administración / Xestión"
 
@@ -6440,8 +6473,8 @@ msgstr "Número de iteracións"
 msgid "Template Tree"
 msgstr "Árbore de modelos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:499
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
 msgid "Alpha"
 msgstr "Alfa"
 
@@ -6454,54 +6487,63 @@ msgstr "O criterio ten subelementos"
 msgid "inconsistent parent code."
 msgstr "código pai inconsistente."
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:430
+msgid "effort is not properly calculated based on clock"
+msgstr "o esforzo non está ben calculado baseándose no reloxo"
+
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:63
 msgid "Status"
 msgstr "Estado"
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:163
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:111
 msgid "Resource load view"
 msgstr "Vista de carga de recursos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763
-msgid "the date must be inside the visualization area"
-msgstr "a data debe estar dentro da área de visualización"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:84
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:34
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:69
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:76
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34
 msgid "Hours"
 msgstr "Horas"
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:733
+msgid "the date must be inside the visualization area"
+msgstr "a data debe estar dentro da área de visualización"
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56
 msgid "Quality form type"
 msgstr "Tipo de formulario de calidade"
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:405
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:392
 msgid "work report has not this label type assigned"
 msgstr "o parte de traballo non ten este tipo de etiqueta asignado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1230
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192
 msgid "Limiting assignment"
 msgstr "Asignación limitante"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523
 msgid "date not specified."
 msgstr "data non especificada."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:360
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318
+msgid "{0} \"{1}\" deleted"
+msgstr "{0} \"{1}\" borrado"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364
 msgid " hours"
 msgstr " horas"
 
@@ -6509,43 +6551,40 @@ msgstr " horas"
 msgid "The name of the criterion is empty."
 msgstr "O nome do criterio está baleiro."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:281
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:134
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:147
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145
 msgid "Limiting Resources Planning"
 msgstr "Planificación de recursos limitantes"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:770
-msgid "The max value must be not empty"
-msgstr "O valor máximo non pode ser baleiro"
-
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:66
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69
 msgid "New label"
 msgstr "Nova etiqueta"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:134
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:137
 msgid "Worker ID cannot be empty"
 msgstr "NIF do traballador non especificado"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:177
-msgid "All project tasks"
-msgstr "Todas as tarefas do proxecto"
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352
 msgid "The start date cannot be null"
 msgstr "A data de inicio non pode ser nula"
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:188
+msgid "All project tasks"
+msgstr "Todas as tarefas do proxecto"
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:367
+msgid "LDAP Roles (separated by ;)"
+msgstr "Roles do LDAP (separados por ;)"
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27
 msgid "Allocation configuration"
 msgstr "Configuración de asignación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:125
-msgid "Scenario \"{0}\" saved"
-msgstr "Escenario \"{0}\" gardado"
-
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:215
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:209
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:189
 msgid "Save & New work report"
 msgstr "Gardar e novo parte de traballo"
@@ -6554,38 +6593,42 @@ msgstr "Gardar e novo parte de traballo"
 msgid "Subcontract price"
 msgstr "Prezo de subcontratación"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:744
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:799
 msgid "Resources per day are zero"
 msgstr "Hai cero recursos por día"
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
 msgid "Assigned criteria"
 msgstr "Criterios asignados"
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:53
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:57
 msgid "Help on authentication (opens a new window)"
 msgstr "Axuda sobre a identificación (abre unha ventana nova)"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:870
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:778
 msgid "The length must be greater than 0, and not null."
 msgstr "A lonxitude debe ser maior que cero e non nula."
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:39
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54
 msgid "Not a valid effort duration"
 msgstr "Non é unha duración de esforzo válida"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:544
+#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:199
+msgid "Cannot remove the predefined Exception Day Type \"{0}\""
+msgstr "Non se pode borrar o tipo de día de excepción predefinido \"{0}\""
+
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34
+msgid "Base calendar type"
+msgstr "Tipo de calendario base"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:613
 msgid "Could not save new calendar"
 msgstr "Non se puido gardar o calendario novo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1467
-msgid "Sigmoid function applied to current resource"
-msgstr "Función sigmoide aplicada ao recurso actual"
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:160
-msgid "Deleted unit type {0}"
-msgstr "Borrado tipo de unidade {0}"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35
+msgid "Planned end"
+msgstr "Fin planificado"
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:224
 msgid "Could not save the scenario"
@@ -6595,43 +6638,40 @@ msgstr "Non se puido gardar o escenario"
 msgid "Couldn't find criterion {0}"
 msgstr "Non se puido atopar o criterio {0}"
 
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:35
 msgid "Apply filtering to tasks satisfying required criteria"
 msgstr "Aplicar filtrado ás tarefas que satisfán os criterios requeridos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37
 msgid "Task Scheduling Status In Project"
 msgstr "Estado de planificación de tarefas en proxecto"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:345
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:887
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313
 msgid "Confirm"
 msgstr "Confirmar"
 
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:32
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:32
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:51
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48
 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:52
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:54
 msgid "Create"
 msgstr "Crear"
 
@@ -6640,76 +6680,76 @@ msgstr "Crear"
 msgid "Permissions"
 msgstr "Permisos"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1728
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1734
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1716
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1722
 msgid "please, select a work report type"
 msgstr "por favor, seleccione un tipo de parte de traballo"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:486
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:487
 msgid "List of materials for category: {0}"
 msgstr "Lista de materiais para a categoría: {0}"
 
+#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36
+msgid "Cancel edition"
+msgstr "Cancelar a edición"
+
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
 msgid "Total price"
 msgstr "Prezo total"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:436
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1230
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:786
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1044
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1295
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46
+msgid "Labels without inheritance"
+msgstr "Etiquetas sen herdanza"
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:344
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:886
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1207
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1454
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:138
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:126
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:362
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:223
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:306
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1265
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1204
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:694
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:948
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:954
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:232
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:92
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:66
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:44
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213
@@ -6718,19 +6758,19 @@ msgstr "Prezo total"
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127
 msgid "Delete"
 msgstr "Borrar"
 
@@ -6754,43 +6794,99 @@ msgstr "cabeceira"
 msgid "line"
 msgstr "liña"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:150
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34
+msgid "Use browser language configuration"
+msgstr "Utilizar a configuración de idioma do navegador"
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:35
+msgid "Galician"
+msgstr "Galego"
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
+msgid "Spanish"
+msgstr "Castelán"
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:37
+msgid "English"
+msgstr "Inglés"
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:38
+msgid "Russian"
+msgstr "Ruso"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172
 msgid "unlimited"
 msgstr "ilimitado"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99
 msgid "Monday"
 msgstr "Luns"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99
 msgid "Tuesday"
 msgstr "Martes"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100
 msgid "Thursday"
 msgstr "Xoves"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100
 msgid "Friday"
 msgstr "Venres"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100
 msgid "Saturday"
 msgstr "Sábado"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:85
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101
 msgid "Sunday"
 msgstr "Domingo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31
+msgid "red (default)"
+msgstr "vermello (defecto)"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32
+msgid "green"
+msgstr "verde"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33
+msgid "blue"
+msgstr "azul"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34
+msgid "cyan"
+msgstr "ciano"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35
+msgid "magenta"
+msgstr "maxenta"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36
+msgid "yellow"
+msgstr "amarelo"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37
+msgid "black"
+msgstr "negro"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38
+msgid "orange"
+msgstr "laranxa"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39
+msgid "purple"
+msgstr "púrpura"
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139
 msgid "Yes"
 msgstr "Si"
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139
 msgid "No"
 msgstr "Non"
 
@@ -6798,35 +6894,19 @@ msgstr "Non"
 msgid "STRATEGIC RESOURCE"
 msgstr "RECURSO ESTRATÉXICO"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:37
-msgid "WORK_RELATIONSHIP"
-msgstr "RELACIÓN_DE_TRABALLO"
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:39
+msgid "LOCATION"
+msgstr "LOCALIZACIÓN"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:43
-msgid "LOCATION_GROUP"
-msgstr "GRUPO_DE_LOCALIZACIÓN"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:50
-msgid "MACHINE LOCATION_GROUP"
-msgstr "GRUPO_DE_LOCALIZACIÓN DE MÁQUINA"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:58
-msgid "LEAVE"
-msgstr "BAIXA"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:64
-msgid "TRAINING"
-msgstr "FORMACIÓN"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:70
-msgid "JOB"
-msgstr "TRABALLO"
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:76
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:46
 msgid "CATEGORY"
 msgstr "CATEGORÍA"
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:206
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:53
+msgid "SKILL"
+msgstr "HABILIDADE"
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
 msgid "[generic all machines]"
 msgstr "[xenérico todas as máquinas]"
 
@@ -6866,15 +6946,15 @@ msgstr "por porcentaxe"
 msgid "by items"
 msgstr "por ítems"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:107
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109
 msgid "Hours cost type cannot be empty or null"
 msgstr "O tipo de coste de horas non pode ser baleiro ou nulo"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:116
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118
 msgid "Init date cannot be empty or null"
 msgstr "A data de inicio non pode ser baleira ou nula"
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:121
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123
 msgid "End date cannot be empty or null"
 msgstr "A data de fin non pode ser baleira ou nula"
 
@@ -6918,7 +6998,7 @@ msgstr ""
 "O valor das horas de traballo non é válido, tendo en conta a lista actual de "
 "grupos de horas"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:577
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618
 msgid ""
 "Some ancestor has the same label assigned, so this element is already "
 "inheriting this label"
@@ -6926,17 +7006,17 @@ msgstr ""
 "Algún ancestro ten a misma etiqueta asignada, polo que este elemento xa está "
 "herdando esa etiqueta"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:676
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963
 msgid "Cannot spread two progress in the same task"
 msgstr "Non poden propagar dous progresos na mesma tarefa"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:700
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:726
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767
 msgid "Duplicate Progress Assignment For Task"
 msgstr "Asignación de progreso duplicada para a tarefa"
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1053
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094
 msgid "Quality form already exists"
 msgstr "O formulario de calidade xa existe"
 
@@ -7038,14 +7118,18 @@ msgid "You can not modifiy this entity sequence, it is already in use"
 msgstr "Non pode modificar esta secuencia de entidade, xa está en uso"
 
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36
+msgid "Spreading progress"
+msgstr "Progreso que propaga"
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
 msgid "Progress with all tasks by hours"
 msgstr "Progreso con todas as tarefas por horas"
 
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
 msgid "Progress with critical path tasks by hours"
 msgstr "Progreso coas tarefas no camiño crítico por horas"
 
-#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
 msgid "Progress with critical path tasks by duration"
 msgstr "Progreso coas tarefas do camiño crítico por duración"
 
@@ -7066,19 +7150,19 @@ msgstr "Envío fallido"
 msgid "Success sent"
 msgstr "Envío exitoso"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:58
-msgid "None"
-msgstr "Ningún"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76
+msgid "Flat"
+msgstr "Plano"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:59
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78
 msgid "Stretches"
 msgstr "Tramos"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:60
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79
 msgid "Interporlation"
 msgstr "Interpolación"
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:61
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80
 msgid "Sigmoid"
 msgstr "Sigmoide"
 
@@ -7166,9 +7250,3 @@ msgstr "A hora debería ter un valor entre 0 e 23"
 msgid "A queue dependency has to have an origin different from destiny"
 msgstr ""
 "Unha dependencia da cola ten que ter unha orixe diferente do seu destino"
-
-#~ msgid "Derived from {0}"
-#~ msgstr "Derivado de {0}"
-
-#~ msgid "{0} is already child of another {1}"
-#~ msgstr "{0} xa é fillo doutro {1}"
diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot
index ea5cf1a7e..5a8cb2855 100644
--- a/libreplan-webapp/src/main/resources/i18n/keys.pot
+++ b/libreplan-webapp/src/main/resources/i18n/keys.pot
@@ -5,14 +5,14 @@
 # This file is distributed under the same license as the LibrePlan package.
 # Diego Pino García <dpino@igalia.com>, 2009.
 # Jacobo Aragunde Pérez <jaragunde@igalia.com>, 2009, 2010.
-# Manuel Rego Casasnovas <mrego@igalia.com>, 2010, 2011.
+# Manuel Rego Casasnovas <rego@igalia.com>, 2010, 2011.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1.3\n"
+"Project-Id-Version: 1.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-09 16:17+0200\n"
+"POT-Creation-Date: 2011-11-11 09:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,11 +21,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:368
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:373
 msgid "The resource cannot be null"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:419
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:336
+msgid "Group path"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:420
 msgid "criterion codes must be unique inside a criterion type"
 msgstr ""
 
@@ -34,29 +38,23 @@ msgid "No authorizations were added because you did not select any."
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:59
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:45
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:54
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58
 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71
 msgid "en"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:192
 msgid "Origin"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:165
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168
 msgid "Create exception"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:45
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41
 msgid "Select report data"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:399
-msgid "Up to company view"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:207
 msgid "there exist multiple resource calendars with name {0}"
 msgstr ""
@@ -65,40 +63,40 @@ msgstr ""
 msgid "Create Virtual Worker"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:98
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:830
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:140
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:87
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:86
 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:88
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:69
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
@@ -110,45 +108,49 @@ msgstr ""
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:34
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:231
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:101
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:101
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:142
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:229
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54
 msgid "Operations"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:150
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:536
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:151
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:523
 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:135
 #: libreplan-webapp/src/main/java/org/libreplan/ws/costcategories/impl/CostCategoryConverter.java:195
 msgid "There is no type of work hours with this code"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:84
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:107
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:112
 msgid "Select"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1355
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:215
+msgid "Work report removed successfully"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1514
 msgid "It can not be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:98
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:97
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:53
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:145
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:55
@@ -162,80 +164,80 @@ msgstr ""
 msgid "Reassign"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:64
 msgid "Description cannot be null or empty"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:79
-msgid "login name not specified"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:79
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:362
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:72
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MonteCarloTabCreator.java:269
 msgid "MonteCarlo Method"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:292
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:229
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:247
 msgid "Project Scheduling"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:62
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
 msgid "February"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:29
 msgid "Managing fields and labels"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:356
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:269
 msgid "Please, select a calendar"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170
 msgid "Predefined"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:267
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
 msgid "Summary"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53
 msgid "Quality Forms"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331
 msgid "Reports"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:337
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22
+msgid "LibrePlan: Advanced allocation"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340
 msgid ""
 "The original workable days value {0}, is prevented because consolidated "
 "values cannot be modified"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172
 msgid "The {0} sequence prefixes can not be repeated"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:81
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:82
 msgid "Criterion requirements"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:285
 msgid "Stretch date must not be less than task start date: "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:66
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:68
 msgid "Dedication chart"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:701
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:728
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:702
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:729
 msgid "Progress that are reported by quality forms can not be modified"
 msgstr ""
 
@@ -243,33 +245,34 @@ msgstr ""
 msgid "Not the same hours group, impossible to update"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:520
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
+msgid "Own exception"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:522
 msgid "Cannot delete that material because it is assigned to a project."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:475
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479
 msgid "Remove limiting resource element"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:275
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:141
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:155
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150
 msgid "Resource Usage"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:39
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40
 msgid "Active period from"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:52
-msgid "hours type :"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:481
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:485
 msgid "Unassign"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:295
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:296
 msgid "Companies"
 msgstr ""
 
@@ -277,7 +280,7 @@ msgstr ""
 msgid "Manual assignment"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:73
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:75
 msgid "Quality form items list"
 msgstr ""
 
@@ -287,16 +290,22 @@ msgid ""
 "End date is not valid, the new end date must be later the current end date"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:903
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128
+msgid "Create {0}: {1}"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:51
 msgid "generic workers allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:914
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:516
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:890
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308
 msgid "The project has no scheduled elements"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:796
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806
 msgid "Hour start"
 msgstr ""
 
@@ -318,11 +327,11 @@ msgstr ""
 msgid "Delete Template element"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/order.zul:90
-#: libreplan-webapp/src/main/webapp/planner/order.zul:97
-msgid "Progress Consolidation"
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22
+msgid "LibrePlan: Calendars"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPUserDetailsService.java:65
 #: libreplan-webapp/src/main/java/org/libreplan/web/users/services/DBUserDetailsService.java:66
 msgid "User with login name '{0}': not found"
 msgstr ""
@@ -331,20 +340,12 @@ msgstr ""
 msgid "Resources capability"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:204
-msgid "The first stretch must be after the first day for doing interpolation"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
-msgid "Filter quality forms by :"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108
 msgid "changing perspective"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:32
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31
 msgid "Transfer Projects Between Scenarios"
 msgstr ""
 
@@ -354,28 +355,24 @@ msgid ""
 "present."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:55
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:63
 msgid "Default calendar"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:296
-msgid "Cannot delete user: it does not exist anymore"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/users/profiles.zul:23
-msgid "LibrePlan: Profiles"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36
 msgid "Project Name"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:931
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:938
 msgid "Indent"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:312
+msgid "Save passwords in database"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:255
 msgid "Reassignation"
 msgstr ""
@@ -388,40 +385,54 @@ msgstr ""
 msgid "Total estimated hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:130
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:144
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:22
+#: libreplan-webapp/src/main/webapp/common/error.zul:21
+msgid "LibrePlan: Runtime Error"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:151
 msgid "Base calendar \"{0}\" saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:174
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:177
 msgid "Exceptions list"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33
 msgid "Locations"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:76
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:78
 msgid "New quality form item"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:41
+#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21
+msgid "LibrePlan: Labels"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:242
+msgid "LDAP connection was successful"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:43
 msgid "Login name"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29
+msgid "LibrePlan user"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:84
+msgid "{0} List"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:43
 msgid "Current"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:632
-msgid "Machine deleted"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22
-msgid "LibrePlan: Progress Report"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:67
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:63
 msgid "Dependencies"
 msgstr ""
 
@@ -433,7 +444,7 @@ msgstr ""
 msgid "Current selection"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1134
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1130
 msgid ""
 "there exist criterion satisfactions referring to criterion types not "
 "applicable to this resource"
@@ -457,39 +468,43 @@ msgstr ""
 msgid "You can not remove a scenario with derived scenarios"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23
-msgid "Create new version"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:948
+msgid "Work Report Types"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55
+msgid "Maximum/minimum of estimated hours"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22
+msgid "LibrePlan: Quality Forms"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:63
 msgid "LIMITING"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:324
-msgid "Derived"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:414
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:415
 msgid "a disabled resource has enabled subresources"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:29
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:51
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:53
 msgid "Client"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:651
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153
 msgid ""
 "there are no resources for required criteria: {0}. So the generic allocation "
 "can't be added"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:446
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478
 msgid "Error on showing warning message removing calendar: "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:428
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:415
 msgid "work report has not any description value with this field name"
 msgstr ""
 
@@ -503,12 +518,12 @@ msgstr ""
 msgid "Imputed hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37
 msgid "Project Costs Per Resource"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143
 msgid "Confirm deleting this hour cost. Are you sure?"
 msgstr ""
@@ -517,15 +532,19 @@ msgstr ""
 msgid "Delete Milestone"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:152
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:155
 msgid "default password were not changed"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:112
+msgid "Type of hours"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:48
 msgid "Non-assigned locations"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:75
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:77
 msgid "Application URI"
 msgstr ""
 
@@ -535,21 +554,22 @@ msgid ""
 "criterionSatisfaction from the same criterionType"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332
 msgid "Work Report Lines"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1514
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1546
 msgid "Configure"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "October"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:58
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:57
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:50
 msgid "First name"
 msgstr ""
 
@@ -557,20 +577,16 @@ msgstr ""
 msgid "Could not execute print command"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:119
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
 msgid "Complementary text fields"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:208
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:418
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:137
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:141
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:181
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:851
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:827
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200
 msgid "Confirm deleting {0}. Are you sure?"
 msgstr ""
 
@@ -578,7 +594,7 @@ msgstr ""
 msgid "Work Reports List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313
 msgid "Accounts"
 msgstr ""
 
@@ -586,7 +602,7 @@ msgstr ""
 msgid "External code"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50
 msgid "Edit selected task"
 msgstr ""
 
@@ -596,32 +612,32 @@ msgstr ""
 
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:88
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:84
 msgid "Limiting"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:61
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:60
 msgid "Required materials"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:666
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677
 msgid "resources per day must be not empty and bigger than zero"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:341
 msgid "Backwards"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:78
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77
 msgid "Version"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52
 msgid "Apply filtering to resources satisfying required criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:104
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:106
 msgid "Up"
 msgstr ""
 
@@ -631,7 +647,7 @@ msgid ""
 "same criterionType"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:105
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:125
 msgid "Types of work hours"
 msgstr ""
 
@@ -639,22 +655,17 @@ msgstr ""
 msgid "EAC"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:43
-#: libreplan-webapp/src/main/webapp/common/error.zul:48
-msgid "Stacktrace:"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:143
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:144
 msgid ""
 "Its planning is not in the current scene.\n"
 "Should change to any of the following scenarios:\n"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:37
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:39
 msgid "Predecessor"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:189
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:172
 msgid "Some stretch has higher or equal values than the previous stretch"
 msgstr ""
 
@@ -662,78 +673,62 @@ msgstr ""
 msgid "Please select a task"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23
-msgid "LibrePlan: Cost Categories"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:58
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:75
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:62
-msgid "End date"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:255
-msgid "missing worker code in the work report"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:142
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101
 msgid ""
 "Value is not valid, the default max value must be greater than the precision "
 "value "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:146
-msgid ""
-"You can not remove the company \"{0}\" because is already in use in some "
-"project or in some subcontrated task."
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:58
+msgid "End date"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:88
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245
+msgid "missing worker code in the work report"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:89
 msgid "profile name is already being used by another profile"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:63
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:68
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76
 msgid "E-mail"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:209
-msgid "Prefix:"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:107
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:112
 msgid "This project has already been added."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:381
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:386
 msgid "The task code cannot be null"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:593
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32
 msgid "Criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134
 msgid "Resource / Criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:26
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:27
 msgid "User data"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97
-msgid "Error setting up creation form."
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44
 msgid "Lines"
 msgstr ""
@@ -742,11 +737,15 @@ msgstr ""
 msgid "Add new progress assignment"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:193
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:32
+msgid "Set Filter Options"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:977
 msgid "Error on showing warning message removing workReportType: "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:624
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:633
 msgid "Edit Work Report"
 msgstr ""
 
@@ -758,36 +757,35 @@ msgstr ""
 msgid "Project version is the same in source and destination scenarios"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:30
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
 msgid "Personal data"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:732
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:733
 msgid "Calculated progress can not be removed"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:299
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:162
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:158
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:199
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:202
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202
 msgid "please, select a Criterion"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationModel.java:127
-msgid "Project does not exist"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:112
+msgid "Work reports"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143
 msgid "{0} annotation required on {1}"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:66
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "June"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1031
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1038
 msgid "Modified"
 msgstr ""
 
@@ -799,12 +797,12 @@ msgstr ""
 msgid "You can not remove the current scenario"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:648
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:653
 msgid "format prefix invalid. It cannot be empty or contain whitespaces."
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:89
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:334
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:338
 msgid "MessagesContainer is needed"
 msgstr ""
 
@@ -816,10 +814,14 @@ msgstr ""
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56
 msgid "Ending date"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21
+msgid "LibrePlan: Page not found"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:21
 msgid "Templates List"
 msgstr ""
@@ -828,7 +830,7 @@ msgstr ""
 msgid "Export options"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:229
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:227
 msgid "Last value"
 msgstr ""
 
@@ -836,7 +838,11 @@ msgstr ""
 msgid "Subcontracted Tasks List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:705
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51
+msgid "Average of worked hours in finished applications"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:706
 msgid "Calculated progress can not be modified"
 msgstr ""
 
@@ -844,45 +850,60 @@ msgstr ""
 msgid "Statistics log"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:51
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:58
+msgid "Work done from starting date"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40
 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47
 msgid "Edit Calendar"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:112
+msgid "Profile"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37
 msgid "Materials Needs At Date"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:277
+msgid "UserDn"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:41
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:52
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:59
 msgid "Cannot be empty or null"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:275
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300
 msgid "filtering"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233
+msgid "{0} \"{1}\" saved"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:33
 msgid "Total Budget"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:53
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:55
 msgid "Hierarchy"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23
-msgid "LibrePlan: Work Hours"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:830
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:833
 msgid ""
 "This worker cannot be deleted because it has assignments to projects or "
 "imputed hours"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62
+msgid "Work done until ending date"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:22
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:26
 msgid "Print configuration"
@@ -892,25 +913,29 @@ msgstr ""
 msgid "Overload due to other assignments"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:117
+msgid "Types of hours"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:149
 msgid "Time period saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:305
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:168
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:206
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:164
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:205
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208
 msgid "This Criterion has already been added."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252
 msgid ""
 "Are you sure of changing the resource type? You will lose the criteria with "
 "different resource type."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:215
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:209
 msgid "add"
 msgstr ""
 
@@ -918,16 +943,11 @@ msgstr ""
 msgid "Unsaved changes will be lost. Would you like to continue?"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:35
-msgid "Filter work report by :"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java:38
 msgid "NON_LIMITING"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:290
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291
 msgid "Workers"
 msgstr ""
 
@@ -935,8 +955,7 @@ msgstr ""
 msgid "Cannot remove {0}, since it is being used by some Exception Day"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:68
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "August"
 msgstr ""
 
@@ -944,11 +963,23 @@ msgstr ""
 msgid "Resources matching selected criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:52
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27
+msgid "with"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:297
+msgid "Label Type"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:48
 msgid "Year"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:67
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:327
+msgid "{0} \"{1}\" could not be deleted, it was already removed"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/users/entities/Profile.java:68
 msgid "profile name not specified"
 msgstr ""
 
@@ -956,49 +987,41 @@ msgstr ""
 msgid "Date Start"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1281
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1275
 msgid "Value is not valid, the current value must be less than max value"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
-msgid "From Chosen"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56
-#: libreplan-webapp/src/main/webapp/planner/order.zul:109
+#: libreplan-webapp/src/main/webapp/planner/order.zul:108
 msgid "Value"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:64
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66
 msgid "Hour costs"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:718
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:773
 msgid "there are no valid periods for this calendar"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:52
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:76
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:54
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:93
 msgid "Add role"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:41
-msgid "Edit Scenario"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:642
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1112
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:634
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271
 msgid "Exception end date should be greater or equals than start date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:601
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:611
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:443
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:453
 msgid "Repeated Project code {0} in Project {1}"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java:277
 msgid "Project from client"
 msgstr ""
 
@@ -1012,39 +1035,36 @@ msgid ""
 "other criterion"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:66
-msgid "Work done until ending date:"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:132
 msgid "Schedule Performance Index"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:138
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135
 msgid "Earlier starting date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:27
 msgid "Type data"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314
 msgid "Profiles"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:800
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:256
+msgid "Host"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810
 msgid "Hour finish"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:173
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:165
 msgid "Perspectives"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:40
-msgid "Edit Work Report Type"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:104
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:107
 msgid "Workable time"
 msgstr ""
 
@@ -1052,20 +1072,11 @@ msgstr ""
 msgid "missing code in a subcategory"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544
-msgid "Confirm deleting this cost category. Are you sure?"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:66
 msgid "Non limiting resource allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:191
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:297
-msgid "Error removing element: "
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:39
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:40
 msgid "Company name"
 msgstr ""
 
@@ -1078,16 +1089,15 @@ msgid "Split new assignment"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:53
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57
 msgid "Pagination"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:265
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:286
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263
 msgid "Expiry date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342
 msgid ""
 "The operation does not perform because the task has progress reports that is "
 "spread associated with this quality form"
@@ -1102,39 +1112,30 @@ msgstr ""
 msgid "Critical path"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:260
 msgid ""
 "Deleting this item, it will disable the report progress option. Are you sure?"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:38
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:42
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:83
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:41
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:80
 msgid "Categories"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:39
-#: libreplan-webapp/src/main/webapp/common/error.zul:44
-msgid "Status code:"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:46
 msgid "Project Details"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:94
-msgid "Create Criterion Type"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162
 msgid " to go to output directly"
 msgstr ""
 
@@ -1142,16 +1143,20 @@ msgstr ""
 msgid "Add new hours group"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:219
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221
 msgid "Criteria: {0} "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:385
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:63
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:44
+msgid "Cancel changes and back to scheduling"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
-#: libreplan-webapp/src/main/webapp/planner/order.zul:110
+#: libreplan-webapp/src/main/webapp/planner/order.zul:109
 msgid "Percentage"
 msgstr ""
 
@@ -1159,7 +1164,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:71
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:81
 msgid "Company logo URL"
 msgstr ""
 
@@ -1167,11 +1172,12 @@ msgstr ""
 msgid "No worker selected"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:227
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:207
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:225
 msgid "Number of digits"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1651
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1639
 msgid "Task not found"
 msgstr ""
 
@@ -1180,24 +1186,12 @@ msgstr ""
 msgid "Total capability"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:732
-msgid "It not could remove the task "
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:217
 msgid "Problems connecting with client web service"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21
-msgid "LibrePlan: User access"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:21
-msgid "LibrePlan: Materials"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:154
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:183
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186
 msgid "Exception Type"
 msgstr ""
 
@@ -1205,11 +1199,11 @@ msgstr ""
 msgid "Profiles List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:567
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:944
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:580
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:869
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:919
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:51
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:64
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50
@@ -1221,7 +1215,7 @@ msgstr ""
 msgid "both {0} of category {1} and {2} of category {3} have the same code"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319
 msgid "Data Types"
 msgstr ""
 
@@ -1230,25 +1224,25 @@ msgstr ""
 msgid "Total hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:342
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:38
+msgid "Data"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:343
 msgid "Reassigning {0} projects"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:84
-msgid "Create Work Hours Type"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:59
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:55
 msgid "Filter by task status"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:528
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:430
-msgid "Select date:"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:420
+msgid "Select date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:635
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1105
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264
 msgid "You should select a end date for the exception"
 msgstr ""
 
@@ -1256,7 +1250,7 @@ msgstr ""
 msgid "Please try it again."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:49
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:56
 msgid "Company code"
 msgstr ""
 
@@ -1264,57 +1258,54 @@ msgstr ""
 msgid "Unknown attribute '{0}' in class {1}"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:714
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:717
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:33
 msgid "NON LIMITING RESOURCE"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22
-msgid "LibrePlan: Workers"
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:90
+msgid "passwords can not be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:117
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:120
 msgid "Activation periods"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:389
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:390
 msgid "Passed"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:175
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176
 msgid "already assigned"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:68
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:509
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:131
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:119
-#: libreplan-webapp/src/main/webapp/planner/order.zul:155
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:139
+#: libreplan-webapp/src/main/webapp/planner/order.zul:154
 msgid "Calendar"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:301
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:119
+msgid "Resources"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:31
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:56
 msgid "Read"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:99
-msgid "Resources"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java:153
 msgid "Source and destination scenarios should be different"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:230
-msgid "CriterionType and its criteria saved"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:137
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:141
 msgid "The browser you are using"
 msgstr ""
 
@@ -1323,33 +1314,24 @@ msgid "scenario"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:51
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:50
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:248
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:41
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:49
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:42
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:42
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:29
 msgid "to"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:197
-msgid "Error on removing typeOfWorkHours: "
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:112
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:115
 msgid "worker's first name not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:276
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:281
 msgid "date not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:95
-msgid "Select type :"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:259
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:269
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:264
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206
 msgid "Projects Planning"
 msgstr ""
 
@@ -1357,12 +1339,18 @@ msgstr ""
 msgid "Shrink to fit page width"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:67
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:773
+msgid "The max value must be greater than 0"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:63
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:55
 msgid "Last name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:551
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:380
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556
 msgid "Remove"
 msgstr ""
 
@@ -1370,18 +1358,26 @@ msgstr ""
 msgid "cost category name not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22
-msgid "LibrePlan: Virtual Workers Groups"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41
+msgid "Planned workable days"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:131
 msgid "SPI"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1334
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:232
+msgid "Progress Type"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1295
 msgid "Task contains consolidated progress. Cannot apply sigmoid function."
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:305
+msgid "UserId"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:218
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:245
 msgid ""
@@ -1389,19 +1385,23 @@ msgid ""
 "start date"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:516
+msgid "This date can not include the whole previous work week"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390
 msgid "the code must be not null or not empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:35
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:119
 msgid "Create New Project"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1420
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1430
 msgid "Stretches list"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:187
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:180
 msgid "Enable scenarios module"
 msgstr ""
 
@@ -1409,52 +1409,50 @@ msgstr ""
 msgid "Zoom"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:608
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:41
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:829
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:52
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:95
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:124
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:88
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45
 #: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40
 #: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:100
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:106
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:117
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:115
 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:130
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:41
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:38
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:42
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:81
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:92
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:80
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:135
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:130
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:241
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:132
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:151
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:135
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:376
 msgid "Save"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:62
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
 msgid "Standard Effort"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:109
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
 msgid "Material categories"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:240
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:570
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:669
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:576
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:674
 msgid "number of digits must be between {0} and {1}"
 msgstr ""
 
@@ -1466,10 +1464,6 @@ msgstr ""
 msgid "Pending update"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:59
-msgid "End date:"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:160
 msgid "Criterion previously selected"
 msgstr ""
@@ -1482,194 +1476,12 @@ msgstr ""
 msgid "Problems connecting with subcontractor web service"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44
-msgid "Assigned load"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:219
+msgid "Entity type"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139
-msgid "End Date"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:68
-msgid "Filter by workers"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:374
-msgid "Some allocations needed"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
-msgid "Resources Per Day"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:216
-msgid "ResourceType must be not-null"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:95
-msgid ""
-"Estimated end date for the task (press enter in textbox to open calendar "
-"popup or type in date directly)"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:281
-msgid "Expand/Collapse all"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:32
-msgid "Overload due to current project"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:857
-msgid "Name: {0}"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:867
-msgid "Move down"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:116
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:112
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:137
-msgid "Please, select a project"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:69
-msgid "September"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27
-msgid "Report structure"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:88
-msgid "password not specified"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:118
-#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:59
-msgid "General data"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126
-msgid "BAC"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:399
-msgid "Calculate Number of Hours"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
-#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
-msgid "Assign"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/criterion/impl/CriterionConverter.java:130
-msgid "missing code in a criterion"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1296
-msgid "Create Template"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23
-msgid "LibrePlan: Work Reports"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:115
-msgid "Edit Company"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:67
-msgid "Advanced search"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:99
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:116
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:78
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:78
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:86
-msgid "Filter by labels"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:574
-msgid ""
-"IMPORTANT: Don't forget to communicate to subcontractor that his contract "
-"has been cancelled"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:38
-msgid "MonteCarlo chart"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
-msgid "LibrePlan: Hours Worked Per Resource"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126
-msgid "Schedule Variance"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:410
-msgid "Service does not manage resource of type: {0}"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:191
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:442
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:185
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:210
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:506
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:544
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:575
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1365
-msgid "Warning"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:30
-#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:35
-msgid "Select parent calendar"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:96
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:168
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:463
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:526
-msgid "There is no task with this code"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:433
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:214
-msgid "The type of hours cannot be null"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:297
-msgid "criterion satisfaction with end date less than start date"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170
-msgid "Show"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58
-msgid "Duration (days)"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71
-msgid "Assignment Type"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:263
+msgid "Unsaved changes will be lost. Are you sure?"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:22
@@ -1684,6 +1496,190 @@ msgstr ""
 msgid "LibrePlan: Scheduling"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:44
+msgid "Assigned load"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:142
+msgid "End Date"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:64
+msgid "Filter by workers"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
+msgid "Some allocations needed"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83
+msgid "Resources Per Day"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:216
+msgid "ResourceType must be not-null"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:95
+msgid ""
+"Estimated end date for the task (press enter in textbox to open calendar "
+"popup or type in date directly)"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:292
+msgid "Expand/Collapse all"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:32
+msgid "Overload due to current project"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:907
+msgid "Name: {0}"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:874
+msgid "Move down"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139
+msgid "Please, select a project"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:29
+msgid "Inherits from date"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
+msgid "September"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:28
+msgid "Report structure"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:119
+#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:59
+msgid "General data"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126
+msgid "BAC"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:379
+msgid "Calculate Number of Hours"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:105
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81
+#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38
+msgid "Assign"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/criterion/impl/CriterionConverter.java:130
+msgid "missing code in a criterion"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1273
+msgid "Create Template"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:60
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68
+msgid "Advanced search"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:82
+msgid "Filter by labels"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:577
+msgid ""
+"IMPORTANT: Don't forget to communicate to subcontractor that his contract "
+"has been cancelled"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:36
+msgid "MonteCarlo chart"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:126
+msgid "Schedule Variance"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:496
+msgid "Error on showing warning message removing qualityForm: "
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:410
+msgid "Service does not manage resource of type: {0}"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:39
+#: libreplan-webapp/src/main/webapp/common/error.zul:44
+msgid "Status code"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:974
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:474
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:492
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73
+msgid "Warning"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:30
+#: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:35
+msgid "Select parent calendar"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:513
+msgid "There is no task with this code"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:146
+msgid "The type of hours cannot be null"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:297
+msgid "criterion satisfaction with end date less than start date"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
+msgid "Show"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58
+msgid "Duration (days)"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71
+msgid "Assignment Type"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29
 msgid "Back to log in"
 msgstr ""
@@ -1693,35 +1689,28 @@ msgstr ""
 msgid "Error on splitting"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31
-msgid "Planned start :"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
-msgid "Company"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:66
 msgid "Node without children"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:152
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:47
+msgid "Company"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118
 msgid "There is no label with this code "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212
 msgid "Task: {0} "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:138
-msgid "Profile saved"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:65
 msgid "Task properties"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:75
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:84
 msgid "There is no type of work report with this code"
 msgstr ""
 
@@ -1734,10 +1723,6 @@ msgstr ""
 msgid "Surname"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1364
-msgid "You need to select some function to configure"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:22
 msgid "Exception Day Types List"
 msgstr ""
@@ -1746,66 +1731,57 @@ msgstr ""
 msgid "the name must be not null or not empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:741
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:393
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:157
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:750
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:394
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:68
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:131
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:67
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
-#: libreplan-webapp/src/main/webapp/planner/order.zul:111
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:45
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:45
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:45
+#: libreplan-webapp/src/main/webapp/planner/order.zul:110
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41
 msgid "Date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:363
-msgid "there must be {0} effort instead of {1}"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42
 msgid "Add From Template"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:505
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:543
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:508
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:546
 msgid "Assigned resources for this task will be deleted. Are you sure?"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22
-msgid "LibrePlan: Exception Days"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:646
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:651
 msgid ""
 "format prefix invalid. It cannot be empty or contain '_' or whitespaces."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:45
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41
 msgid "Filter by month"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322
 msgid "The criterion and its type cannot be null"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:526
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:421
 msgid "The quality form must have an item with 100% value to report progress"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:67
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "July"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:220
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156
 msgid "The code is not valid. There is another unit type with the same code"
 msgstr ""
 
@@ -1813,16 +1789,15 @@ msgstr ""
 msgid "( max: {0} )"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:218
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:222
 msgid "Error on removing element: "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:42
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:61
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
 msgid "January"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:64
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60
 msgid "Cannot calculate charts for current data"
 msgstr ""
 
@@ -1830,8 +1805,8 @@ msgstr ""
 msgid "Select queue"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:582
-msgid "The cost category had already been removed."
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173
+msgid "project name already being used"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:48
@@ -1851,43 +1826,41 @@ msgstr ""
 msgid "You can not remove the default scenario called \"{0}\""
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161
 msgid "direct link"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:110
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:112
 msgid "Down"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:934
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:842
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:48
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:89
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:109
 msgid "Label"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:37
-msgid "Create Scenario"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:834
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:841
 msgid "Value is not valid, taking into account the current list of HoursGroup"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:48
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:51
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90
 msgid "Association with roles"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:371
 msgid "missing type of work hours in a work report line"
 msgstr ""
 
@@ -1895,8 +1868,8 @@ msgstr ""
 msgid "Quality forms"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:624
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:634
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:466
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:476
 msgid "Repeated Hours Group code {0} in Project {1}"
 msgstr ""
 
@@ -1904,6 +1877,10 @@ msgstr ""
 msgid "Hours group"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/users/users.zul:23
+msgid "LibrePlan: Accounts"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:96
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:30
 msgid "Days from Beginning to Deadline"
@@ -1913,61 +1890,41 @@ msgstr ""
 msgid "Estimate At Completion"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194
-msgid "Delete item. Are you sure?"
-msgstr ""
-
 #: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/ResourcesCostCategoryAssignment.java:102
 msgid "cost assignment's start date not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178
-msgid "Output format:"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1029
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1192
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45
 msgid "Direct"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:818
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:268
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:289
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:828
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:245
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:266
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:52
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:83
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86
 msgid "Op."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:55
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:55
-msgid "Reference date:"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:44
 msgid "Pessimistic"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:373
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:376
 msgid "Limiting resource assignation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238
 msgid ""
 "This progress can not be removed, because it is spread. It is necessary to "
 "select another progress as spread."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:116
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:119
 msgid "Work week"
 msgstr ""
 
@@ -1976,15 +1933,15 @@ msgid "You will lose the changes. Are you sure?"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:28
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:45
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:47
 msgid "Company ID"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:192
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:129
 msgid "Unit type name cannot be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:38
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:42
 msgid "Entity sequences"
 msgstr ""
 
@@ -1993,15 +1950,19 @@ msgstr ""
 msgid "Delay from beginning (days)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:319
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:324
 msgid "Resource cannot be null"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:505
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:453
 msgid "Total Hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:366
+msgid "LibrePlan Role"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:36
 msgid "Create Progress Type"
 msgstr ""
 
@@ -2009,12 +1970,8 @@ msgstr ""
 msgid "Confirm cancel"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:62
-msgid "Label list"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37
 msgid "Work And Progress Per Task"
 msgstr ""
 
@@ -2022,68 +1979,67 @@ msgstr ""
 msgid "WBS (tasks)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1250
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:423
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:133
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:538
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:552
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:300
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:227
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:310
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:859
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:894
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:262
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:207
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208
 msgid "Error on showing removing element: "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:698
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701
 msgid "Deleting sequence"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:87
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:88
 msgid "Select scenario"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:218
-msgid "Create Label Type"
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:51
+msgid "Login"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:233
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:225
 msgid "missing work report code in a work report"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36
-msgid "Create Work Report Type"
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:299
+msgid "Edit Virtual Workers Group: {0}"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:51
 msgid "Criterion requirement"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1245
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1404
 msgid "Only the last activation period allows to delete end date."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63
+msgid "Maximum/minimum of worked hours in finished applications"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333
 msgid "Scheduling saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:197
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:192
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:171
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:27
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70
 msgid "Add new row"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:782
-msgid "incorrect initialization of the progress assignment controller."
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:492
+msgid "Move"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:488
-msgid "Move"
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:67
+msgid "Password saved"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:224
@@ -2104,7 +2060,7 @@ msgstr ""
 msgid "CutycaptTimeout thread exception"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22
 msgid "Work Report Models"
 msgstr ""
@@ -2117,25 +2073,29 @@ msgstr ""
 msgid "Deadline (days since beggining project)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:422
-msgid "number of hours is not properly calculated based on clock"
+#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23
+msgid "LibrePlan: Companies"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:385
+#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:22
+msgid "LibrePlan: Progress Report"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:417
 msgid ""
 "Calendar cannot be removed because it still has children. Some other "
 "calendar is derived from this one."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:918
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921
 msgid "Value is not valid, the type must be not empty"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:444
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:445
 msgid "criterion type name is already being used"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:326
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:331
 msgid "Task code cannot be null"
 msgstr ""
 
@@ -2143,16 +2103,12 @@ msgstr ""
 msgid "It is not allowed to consolidate progress."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:31
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32
 msgid "Create Task"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:98
-msgid "Error setting up creation form for Criterion Type"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:151
-msgid "Edit Cost Category"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:242
+msgid "LDAP Authentication enabled"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:27
@@ -2163,66 +2119,70 @@ msgstr ""
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:58
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:82
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:112
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:99
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:129
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68
 msgid "Actions"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:115
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:118
 msgid "Exceptions"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:32
+msgid "User settings"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:80
 msgid "Start hour"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:139
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:140
 msgid "Assign materials"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:33
 msgid "Over assignable"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:226
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:231
 msgid "format filters are not valid"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:72
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76
 msgid "ID"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:419
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343
+msgid "Settings"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:346
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:181
 msgid "The init date cannot be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28
-msgid "Is administrator"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:88
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:90
 msgid "Our company password"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:275
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:134
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:172
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:130
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:171
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174
 msgid "This label has already been added."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:79
-#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:179
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80
+#: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:181
 msgid "Could not get code, please try again later"
 msgstr ""
 
@@ -2232,19 +2192,15 @@ msgid ""
 " Code cannot contain chars like '_'."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625
-msgid "Confirm deleting this machine. Are you sure?"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:161
 msgid "Hours Group"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:915
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:823
 msgid "Unallocated name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:888
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:895
 msgid "Move up"
 msgstr ""
 
@@ -2257,10 +2213,10 @@ msgid "Subcontract communication date"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:262
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:354
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:129
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:263
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:359
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134
 msgid "Scheduling"
 msgstr ""
 
@@ -2268,7 +2224,13 @@ msgstr ""
 msgid "Dependencies have priority"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:206
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:516
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:901
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126
+msgid "Create {0}"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:218
 msgid "Unlimited"
 msgstr ""
 
@@ -2280,20 +2242,17 @@ msgstr ""
 msgid "Assign Label"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23
+msgid "Create new project"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73
 msgid "Page up"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:228
-msgid "Create new project"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:62
-msgid "Work done from starting date:"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:865
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:915
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:159
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
@@ -2305,36 +2264,28 @@ msgstr ""
 msgid "Must start after"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1345
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1306
 msgid "Confirm change"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:864
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840
 msgid "You don't have permissions to edit this project"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:104
-msgid "Edit Profile"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192
 msgid "missing date in a calendar exception"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:432
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:213
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:440
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:145
 msgid ""
 "Type of hours is empty. Please, create some type of hours before proceeding"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:598
-msgid "Exception"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:108
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:180
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:450
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:515
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:172
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:437
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:502
 msgid "There is no resource with this ID"
 msgstr ""
 
@@ -2343,15 +2294,20 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:103
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104
 msgid "user"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:21
+msgid "LibrePlan: Materials"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeModel.java:53
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:33
 msgid "New task"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:192
 msgid "The password for a new user cannot be empty"
 msgstr ""
 
@@ -2363,23 +2319,19 @@ msgstr ""
 msgid "Type name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69
-msgid "Progress assignment"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:182
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:440
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:687
 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27
 msgid "All"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:40
-msgid "Edit Progress Type"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69
+msgid "Progress assignment"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:459
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77
 msgid "Manual"
 msgstr ""
 
@@ -2391,11 +2343,11 @@ msgstr ""
 msgid "Receipt date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:210
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:209
 msgid "Cannot be higher than Ending date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:292
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269
 msgid "Create activation period"
 msgstr ""
 
@@ -2407,9 +2359,9 @@ msgstr ""
 msgid "Personal details"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1027
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1190
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:214
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:217
 msgid "Inherited"
 msgstr ""
 
@@ -2417,30 +2369,35 @@ msgstr ""
 msgid "Delete project template. Are you sure?"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:255
-msgid "Worker"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:517
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:595
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599
 msgid ""
 "Cannot allocate selected element. There is not any queue that matches "
 "resource allocation criteria at any interval of time"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287
+msgid "Worker"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:217
 msgid "Criterion must be not-null"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:161
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:299
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:300
 msgid "criterion name not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:136
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:95
 msgid "Value is not valid, the default max value must not be empty "
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:343
+msgid "Role property"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:25
 msgid "Manual allocation"
 msgstr ""
@@ -2458,29 +2415,42 @@ msgstr ""
 msgid "Recommended allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:303
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:241
+msgid "Activation"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304
 msgid "Scenarios"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:375
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:376
 msgid "Materials saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1252
 msgid ""
 "This progress measurement can not be in current date, because it is "
 "consolidated. it is necessary to select other date."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:705
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37
+msgid "Total Worked Hours By Resource In A Month"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:672
 msgid "Other projects"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:159
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:111
+msgid "Tasks input buffer"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:168
 msgid "At least one {0} sequence must be active"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:111
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:128
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66
@@ -2499,15 +2469,19 @@ msgstr ""
 msgid "You should select a source scenario"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:154
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:163
 msgid "At least one {0} sequence is needed"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:336
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37
 msgid "Estimated/Planned Hours Per Task"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/costcategories/costCategory.zul:23
+msgid "LibrePlan: Cost Categories"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/TwoWaySelector.java:68
 msgid "Assigned"
 msgstr ""
@@ -2516,11 +2490,15 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21
+msgid "LibrePlan: Units"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45
 msgid "Communication"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:35
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36
 msgid "More options"
 msgstr ""
 
@@ -2529,15 +2507,11 @@ msgstr ""
 msgid "Error: {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:185
-msgid "Company saved"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:240
 msgid "Confirm create template"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:261
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:238
 msgid "Parent"
 msgstr ""
 
@@ -2545,18 +2519,20 @@ msgstr ""
 msgid "Earliest date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:126
-msgid "Type of work hours saved"
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21
+msgid "LibrePlan: Work And Progress Per Task"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:46
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344
+msgid "Change Password"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48
 msgid "Projects"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:150
-msgid "Create Quality Form"
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:264
+msgid "Confirm exit dialog"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64
@@ -2567,40 +2543,44 @@ msgstr ""
 msgid "Material assignments"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:72
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:46
 msgid "December"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:922
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:35
+msgid "Change password"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:830
 msgid "Text field"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:122
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81
 msgid ""
 "Value is not valid, the Precision value must be less than the defalt max "
 "value."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:181
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97
 msgid "Question"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1249
 msgid ""
 "This progress measurement can not be changed or removed, because it is "
 "consolidated. It is needed to remove its consolidation."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:222
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225
 msgid "Create new work week"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:134
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:137
 msgid "The admin's account password remains the default one. This is unsecure"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:713
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:716
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:34
 msgid "LIMITING RESOURCE"
 msgstr ""
@@ -2609,30 +2589,32 @@ msgstr ""
 msgid "Subcontratation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:198
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:135
 msgid ""
 "The meausure name is not valid. There is another unit type with the same "
 "measure name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:535
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:590
 msgid "{0} cannot be fulfilled"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:68
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:69
 msgid "Extended view"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:33
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:34
 msgid "Work record"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:116
-msgid "Error setting up edition form."
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:149
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:151
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:204
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:147
 msgid "Output format"
 msgstr ""
 
@@ -2640,14 +2622,6 @@ msgstr ""
 msgid "Print"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:22
-msgid "LibrePlan: Calendars"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:412
-msgid "Hours cannot be null"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java:179
 msgid "{0} not found type for criterion "
 msgstr ""
@@ -2656,56 +2630,53 @@ msgstr ""
 msgid "Page down"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:485
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:486
 msgid "resource type does not allow enabled criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:22
-#: libreplan-webapp/src/main/webapp/common/error.zul:21
-msgid "LibrePlan: Runtime Error"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:416
+msgid "Effort cannot be null"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:39
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:43
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:217
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1015
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:191
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:49
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:55
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:101
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:46
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116
 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:136
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:40
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:44
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:87
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:77
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:84
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:81
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:134
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:99
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:243
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:138
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:155
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:142
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:139
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:100
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:379
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:50
-#: libreplan-webapp/src/main/webapp/planner/order.zul:72
-#: libreplan-webapp/src/main/webapp/planner/order.zul:135
-#: libreplan-webapp/src/main/webapp/planner/order.zul:170
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:85
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41
+#: libreplan-webapp/src/main/webapp/planner/order.zul:73
+#: libreplan-webapp/src/main/webapp/planner/order.zul:134
+#: libreplan-webapp/src/main/webapp/planner/order.zul:169
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:81
 msgid "Cancel"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:32
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:35
 msgid "General user data"
 msgstr ""
 
@@ -2717,7 +2688,7 @@ msgstr ""
 msgid "Subcontracted task sent successfully"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:73
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:77
 msgid "Accumulated hours chart"
 msgstr ""
 
@@ -2729,13 +2700,13 @@ msgstr ""
 msgid "CPI"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:660
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:923
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:526
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:687
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318
 msgid "You don't have read access to this project"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:180
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:96
 msgid ""
 "Disable hierarchy will cause criteria tree to be flattened. Are you sure?"
 msgstr ""
@@ -2746,17 +2717,13 @@ msgstr ""
 msgid "Units"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:45
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:52
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:47
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:48
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:43
 msgid "Dates"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:45
-msgid "Create Calendar"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:185
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168
 msgid "At least one stretch is needed"
 msgstr ""
 
@@ -2764,10 +2731,26 @@ msgstr ""
 msgid "a day is not valid"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:87
+msgid "Autocomplete login form"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21
+msgid "LibrePlan: Project Costs Per Resource"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61
 msgid "Task Properties"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:51
+msgid "hours type"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
+msgid "LibrePlan: Task Scheduling Status In Project"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:229
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214
@@ -2775,20 +2758,11 @@ msgid ""
 "End date is not valid, the new end date must be greater than the start date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:192
-msgid "Cost category saved"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:27
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:33
 msgid "name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:170
-msgid "Progress type saved"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:73
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:75
 msgid "Delete selected task"
 msgstr ""
 
@@ -2796,10 +2770,18 @@ msgstr ""
 msgid "{0} (max: {1})"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:459
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:470
 msgid "end"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:529
+msgid "Cost Category"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:350
+msgid "Role search query"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:63
 msgid "Log"
 msgstr ""
@@ -2822,7 +2804,7 @@ msgstr ""
 msgid "Start date cannot be null"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:297
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298
 msgid "Subcontracting"
 msgstr ""
 
@@ -2830,7 +2812,7 @@ msgstr ""
 msgid "references"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1284
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1278
 msgid "Value is not valid, the Precision value must be exact "
 msgstr ""
 
@@ -2838,11 +2820,11 @@ msgstr ""
 msgid "Generic"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41
-msgid "Planned workable days :"
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:51
+msgid "Template"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:47
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49
 msgid "Default max value"
 msgstr ""
 
@@ -2850,7 +2832,7 @@ msgstr ""
 msgid "Add criterion requirement"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:879
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:855
 msgid ""
 "You can not remove the project \"{0}\" because of any of its tasks are "
 "already in use in some work reports and the project just exists in the "
@@ -2865,35 +2847,40 @@ msgstr ""
 msgid "Criterion Name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:498
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502
 msgid "Automatic"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:91
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48
 msgid "Task"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35
-msgid "Planned end :"
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:21
+msgid "LibrePlan: Change password"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:270
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:128
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:167
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:124
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:169
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168
 msgid "please, select a label"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:106
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:123
 msgid "Add profile"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:215
+#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23
+msgid "LibrePlan: Scenarios Management"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220
 msgid "filter already exists"
 msgstr ""
 
@@ -2911,6 +2898,10 @@ msgstr ""
 msgid "values are not valid, the values must not be null"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:41
+msgid "Apply changes and go back to scheduling"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50
@@ -2923,9 +2914,9 @@ msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:127
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:135
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:68
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:49
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45
 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:73
 msgid "Project"
 msgstr ""
@@ -2934,11 +2925,7 @@ msgstr ""
 msgid "Unassigned"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:25
-msgid "Select the date from which the new version will be valid"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:101
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:102
 msgid "Add new criterion requirement"
 msgstr ""
 
@@ -2946,11 +2933,11 @@ msgstr ""
 msgid "Budgeted Cost Work Performed"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:135
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:138
 msgid "Change the password"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:95
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:115
 msgid "Work report"
 msgstr ""
 
@@ -2958,24 +2945,29 @@ msgstr ""
 msgid "the name must be not empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:86
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:58
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:85
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:71
 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27
 msgid "Disabled"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:731
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:347
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:701
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:326
 msgid "Earned value"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:216
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35
+msgid "Overtime Effort"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:219
 msgid "Inherited from parent calendar"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:146
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:184
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:210
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:187
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:213
 msgid "Normal Effort"
 msgstr ""
 
@@ -2990,51 +2982,48 @@ msgid ""
 "Please save your project before proceeding."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:92
-msgid "Edit Work Hours Type"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43
-msgid "From Today"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1060
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1075
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1114
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1129
 msgid "{0} not supported yet"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:143
+msgid "is not supported for its use with LibrePlan."
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53
 msgid "New entry"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220
 msgid "Some sequences to remove not existed"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:105
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:114
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:212
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:100
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:109
 msgid "Resources Load"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:214
 msgid "Changes have been canceled"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:266
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:281
-msgid "Machine saved"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
+msgid "LibrePlan: Hours Worked Per Worker In A Month"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:143
-msgid "Create Cost Category"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:297
+msgid "Authentication"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:63
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "March"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:85
+msgid "Select language"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:104
 msgid "Appropriative allocation"
 msgstr ""
@@ -3043,11 +3032,11 @@ msgstr ""
 msgid "Assigned criterion requirements"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:115
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:123
 msgid "Filter by criteria"
 msgstr ""
 
@@ -3060,11 +3049,11 @@ msgstr ""
 msgid "Scenarios List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:156
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:115
 msgid "The name is not valid, the name must not be null "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:139
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:136
 msgid "Hours to allocate"
 msgstr ""
 
@@ -3072,7 +3061,7 @@ msgstr ""
 msgid "A category must be selected"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:134
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:137
 msgid "Period"
 msgstr ""
 
@@ -3085,90 +3074,79 @@ msgstr ""
 msgid "Select start date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:188
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:214
-msgid "Error on showing warning message removing typeOfWorkHours: "
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:153
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:151
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:189
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:901
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:877
 msgid "Removed {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152
+msgid "Error on showing warning message removing typeOfWorkHours: "
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821
 msgid "Confirm deleting this worker. Are you sure?"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:62
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:64
 msgid "Group name"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55
-msgid "Start date:"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:57
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:81
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:59
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:98
 msgid "Role name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:837
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:840
 msgid "This worker was already removed by other user"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:611
-msgid "Create Work Report"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:116
-msgid "Value is not valid, the precision value must not be empty"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:821
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:484
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:791
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:474
 msgid "h"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:359
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:620
+msgid "Create Work Report"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:75
+msgid "Value is not valid, the precision value must not be empty"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363
 msgid "Workable capacity for this period "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:218
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:150
 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:159
 msgid "Cannot be null or empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:190
-msgid "Cannot delete profile: it does not exist anymore"
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:440
+msgid "Quality Form"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:225
-msgid "Edit Machine"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:77
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:67
 msgid "Add Milestone"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:119
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:116
 msgid "Assign selected items"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:438
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:449
 msgid "init"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1212
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1215
 msgid "Add new progress measurement"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:528
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:532
 msgid "Select for automatic queuing"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:304
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305
 msgid "Scenarios Management"
 msgstr ""
 
@@ -3180,86 +3158,96 @@ msgstr ""
 msgid "Create & Assign"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:148
-msgid "Edit User"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1549
+msgid "Not configurable"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:55
-msgid "Maximum/minimum of the estimated hours"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationCommand.java:47
+msgid "Advanced allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:753
-msgid "D"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/planner/order.zul:112
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:90
+#: libreplan-webapp/src/main/webapp/planner/order.zul:111
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96
 msgid "Consolidated"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:125
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:145
 msgid "Work report types"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:182
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:174
 msgid "MonteCarlo method"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1057
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1220
 msgid "derived exception can not be removed"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:307
+msgid "Edit Worker: {0}"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/materials/impl/MaterialConverter.java:217
 msgid "missing code in a material"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:21
+msgid "LibrePlan: User access"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:61
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:32
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:109
 msgid "Customer"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:810
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:820
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:86
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
 msgid "Hours type"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:156
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:210
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:211
 msgid "criterion type name not specified"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:246
+msgid "Cannot connect to LDAP server"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:220
 msgid "Add Exception"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:405
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:427
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:451
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:301
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:322
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:346
 msgid "cannot be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1468
-msgid "Sigmoid function"
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:421
+msgid "Effort must be greater than zero"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:49
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:48
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:27
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:47
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:27
 msgid "from"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:147
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:146
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:121
 msgid "Heading Fields"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:74
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:70
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:80
 msgid "Progress type"
 msgstr ""
 
@@ -3277,7 +3265,7 @@ msgid ""
 "date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:43
+#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33
 msgid "Save Project"
 msgstr ""
 
@@ -3286,8 +3274,8 @@ msgstr ""
 msgid "Day is not valid"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1097
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:619
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1256
 msgid "You should select a start date for the exception"
 msgstr ""
 
@@ -3303,89 +3291,93 @@ msgstr ""
 msgid "Exportation options"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:92
+msgid "Settings saved"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160
 msgid ""
 "Could not save time period. Time period overlaps with another non-compatible "
 "time period"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:375
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:376
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/BaseCalendarBandboxFinder.java:46
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:493
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:978
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:88
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:921
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:42
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:27
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:55
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:38
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34
-#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:91
+#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:41
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:74
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:58
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:41
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:82
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:84
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76
 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:31
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:50
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:49
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:30
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:51
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:50
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:39
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:28
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:72
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:80
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:27
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:80
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32
 #: libreplan-webapp/src/main/webapp/planner/main.zul:49
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:98
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:100
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:141
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:90
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:134
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:175
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:104
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115
 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45
 msgid "Name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:162
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168
 msgid "Delete task"
 msgstr ""
 
@@ -3397,11 +3389,11 @@ msgstr ""
 msgid "please, select an item"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:392
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:397
 msgid "Time Start cannot be null"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:208
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212
 msgid "Day of week"
 msgstr ""
 
@@ -3409,12 +3401,12 @@ msgstr ""
 msgid "Companies List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1443
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1453
 msgid "Stretches with Interpolation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37
 msgid "Hours Worked Per Resource"
 msgstr ""
 
@@ -3426,29 +3418,28 @@ msgstr ""
 msgid "cost assignment with end date less than start date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:63
-msgid "Maximum/minimum of the worked hours"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:91
+msgid ""
+"Enable/Disable autocomplete property in login form, if the admin password is "
+"still in default"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:35
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26
 msgid "Category name"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21
-msgid "LibrePlan: Work And Progress Per Task"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:766
 msgid "Not the same material, impossible to update"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:65
-msgid "Main menu"
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:41
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34
+msgid "Filter work report by"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22
-msgid "LibrePlan: Progress"
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:65
+msgid "Main menu"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:31
@@ -3459,22 +3450,25 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:39
-msgid "Create From Template"
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:585
+msgid "Exception: {0}"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:46
+msgid "Password settings"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:381
 msgid "There exists other workReportType with the same name."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:150
-#: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29
-msgid "Schedule"
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:22
+msgid "LibrePlan: Progress"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/event_error.zul:35
-#: libreplan-webapp/src/main/webapp/common/error.zul:40
-msgid "Exception type:"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:149
+#: libreplan-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:29
+msgid "Schedule"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:164
@@ -3486,45 +3480,43 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:224
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178
 msgid "Connect"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:21
-msgid "LibrePlan: Units"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23
-msgid "LibrePlan: Transfer Projects Between Scenarios"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:221
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223
 msgid "Allocation: [{0},{1}]"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:194
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:892
+msgid "Virtual Workers Group"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:198
 msgid "Changes saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1258
 msgid "See scheduling"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:338
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:344
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
 msgid "Progress measurements"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1211
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1214
 msgid "Add measure"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:253
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:258
 msgid "Work report saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:52
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:374
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractCommand.java:53
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:377
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:68
 msgid "Subcontract"
 msgstr ""
@@ -3544,7 +3536,7 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1366
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1360
 msgid "The date is not valid, the date must be not empty"
 msgstr ""
 
@@ -3552,11 +3544,12 @@ msgstr ""
 msgid "User login name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318
 msgid "Cost Categories"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:312
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:313
 msgid "criterion type not specified"
 msgstr ""
 
@@ -3564,13 +3557,12 @@ msgstr ""
 msgid "must be not empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "April"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul:23
-msgid "LibrePlan: Companies"
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:301
+msgid "Derived of Calendar "
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:22
@@ -3583,16 +3575,20 @@ msgstr ""
 msgid "Task quality forms"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:600
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593
 msgid "Not working day"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:237
+msgid "Progress Types"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:135
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:155
 msgid "Cost category"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:697
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:700
 msgid "It can not be deleted. At least one sequence is necessary."
 msgstr ""
 
@@ -3600,23 +3596,29 @@ msgstr ""
 msgid "Resource allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
 msgid "Amount work"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:171
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:172
 msgid "please, select a quality form"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:201
-msgid "Select entity:"
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:522
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:907
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:132
+msgid "Edit {0}: {1}"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:400
 msgid "Exist other workReportType with the same code."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:65
+#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:26
+msgid "Filter quality forms by"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:67
 msgid "Unindent selected task"
 msgstr ""
 
@@ -3628,20 +3630,11 @@ msgstr ""
 msgid "Constraint"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:155
-msgid "Create Exception Day Type"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41
-msgid "Hours Worked Per Resource In A Month"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150
 msgid "Add New Label Type Field"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:402
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:407
 msgid "Time finish cannot be null"
 msgstr ""
 
@@ -3649,23 +3642,22 @@ msgstr ""
 msgid "Customer reference"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:329
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:661
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:865
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:915
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:924
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947
-#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:145
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:189
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:461
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:517
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:527
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:688
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:841
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:891
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:900
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:927
+#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319
 msgid "Information"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:946
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:926
 msgid "Sorry, you do not have permissions to access this project"
 msgstr ""
 
@@ -3673,11 +3665,11 @@ msgstr ""
 msgid "END"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:223
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:226
 msgid "Worker saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:261
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:266
 msgid "can not pass until the previous item is passed."
 msgstr ""
 
@@ -3685,11 +3677,7 @@ msgstr ""
 msgid "New hours group "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/qualityforms/qualityForms.zul:22
-msgid "LibrePlan: Quality Forms"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:460
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464
 msgid "Assign element to queue manually"
 msgstr ""
 
@@ -3697,15 +3685,15 @@ msgstr ""
 msgid "Edit Template"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:216
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:218
 msgid "Resource: {0} "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:463
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:358
 msgid "percentage cannot be duplicated"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325
 msgid "Work Hours"
 msgstr ""
 
@@ -3713,7 +3701,7 @@ msgstr ""
 msgid "Heading"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:164
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:165
 msgid "Company ID already used. It has to be be unique"
 msgstr ""
 
@@ -3725,23 +3713,20 @@ msgstr ""
 msgid "Percentages should sum 100"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:284
-msgid "Could not save machine"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:339
 msgid "The calendar exception type not found"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81
+#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:106
 msgid "Unable to convert value to {0} type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:220
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:223
 msgid "Worker must be not-null"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1067
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1063
 msgid "Some criterion satisfactions overlap in time"
 msgstr ""
 
@@ -3749,47 +3734,57 @@ msgstr ""
 msgid "Value last progress measurement"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:43
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
+msgid "LibrePlan: Materials Needs At Date"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44
 msgid "Worker assignments"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:541
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:402
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:147
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:174
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:610
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:270
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182
 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:409
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:431
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:305
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:326
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221
 msgid "{0} already exists"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:314
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:318
 msgid "Create Worker"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587
+msgid "Exception: {0} (Inh)"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38
 msgid "Code "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:52
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:65
 msgid "Password confirmation"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:69
-msgid "Indent selected task"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:88
 msgid "Work Report"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:115
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:71
+msgid "Indent selected task"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:135
 msgid "Unit Measures"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:63
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:72
 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39
 msgid "Show progress"
 msgstr ""
@@ -3798,16 +3793,27 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:459
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:297
+msgid ""
+"Error saving the project\n"
+"{0}"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:358
 msgid ""
 "The task has got progress consolidations. It must delete all consolidations "
 "to change the resource allocation type "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:626
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22
+msgid "LibrePlan: Machines"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1335
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1296
 msgid "Error"
 msgstr ""
 
@@ -3825,15 +3831,15 @@ msgstr ""
 msgid "ETC"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:104
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:105
 msgid "Log out"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:24
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:25
 msgid "Add new configuration unit"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:37
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:41
 msgid "Main preferences"
 msgstr ""
 
@@ -3844,24 +3850,20 @@ msgid ""
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67
-#: libreplan-webapp/src/main/webapp/planner/order.zul:82
+#: libreplan-webapp/src/main/webapp/planner/order.zul:83
 msgid "Progress consolidation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:246
-msgid "Label type saved"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:419
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:568
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:406
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:556
 msgid "missing field name in a description value"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:46
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47
 msgid "Add new worker assignment"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:688
 msgid "Show all elements"
 msgstr ""
 
@@ -3869,11 +3871,7 @@ msgstr ""
 msgid "It couldn't complete all the reassignations"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:77
-msgid "Show dependencies:"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:66
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:68
 msgid "Limited resource"
 msgstr ""
 
@@ -3889,8 +3887,8 @@ msgstr ""
 msgid "Your session has expired after inactivity period. Please log in again."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:166
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:191
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:190
 msgid "SPREAD"
 msgstr ""
 
@@ -3902,27 +3900,26 @@ msgstr ""
 msgid "Budgeted Cost Work Scheduled"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:57
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:703
+msgid "Changes applied"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58
 msgid "Name cannot be null or empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:341
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110
-msgid "Progress measurements: "
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:43
+msgid "LDAP configuration"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:32
 msgid "Queue Element Information"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:136
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139
 msgid "Start Date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:31
-msgid "Create Order"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:22
 msgid "Virtual Workers Groups List"
 msgstr ""
@@ -3931,13 +3928,13 @@ msgstr ""
 msgid "Cost Variance"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:470
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:471
 msgid "criterion type does not allow resource hierarchy"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:150
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:89
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95
 msgid "Total"
 msgstr ""
 
@@ -3950,25 +3947,26 @@ msgstr ""
 msgid "Budget hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:165
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:150
 msgid "Edit task: {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:53
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:52
 msgid "Select destination"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:269
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:529
+#: libreplan-webapp/src/main/webapp/planner/order.zul:92
+#: libreplan-webapp/src/main/webapp/planner/order.zul:98
+msgid "Check consolidated progresses"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530
 msgid "must be greater than the previous date."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:22
-msgid "LibrePlan: Advanced allocation"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1481
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:583
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585
 msgid "Show all"
 msgstr ""
 
@@ -3977,19 +3975,20 @@ msgid "Estimated hours"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:59
 msgid "Default price"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:116
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121
 msgid "Apply tab changes"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:274
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:93
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:171
 msgid "passwords don't match"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:85
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:88
 msgid "Day properties"
 msgstr ""
 
@@ -4005,7 +4004,7 @@ msgstr ""
 msgid "Work Hours Types List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:62
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/milestone/AddMilestoneCommand.java:54
 msgid "new milestone"
 msgstr ""
 
@@ -4013,19 +4012,15 @@ msgstr ""
 msgid "Value last progress reported"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:300
 msgid "Report Progress"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:154
-msgid "Unit {0} cannot be  removed because it is used in materials"
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:73
+msgid "Show dependencies"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:133
-msgid "Create User"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339
 msgid "Schedule from start to deadline"
 msgstr ""
 
@@ -4035,31 +4030,41 @@ msgstr ""
 msgid "Estimated days"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:65
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:51
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:61
 msgid "Reference date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:46
-msgid "Selected node:"
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21
+msgid "LibrePlan: Estimated/Planned Hours Per Task"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:21
-msgid "LibrePlan: Task Scheduling Status In Project"
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55
+msgid "From chosen date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:249
-msgid "Create new project from template"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81
 msgid "Progress Evolution"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:112
+#: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22
+msgid "LibrePlan: Exception Days"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul:23
+msgid "LibrePlan: Work Hours"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311
+msgid "LibrePlan Configuration"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118
 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:88
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
 msgid "Original"
 msgstr ""
 
@@ -4080,20 +4085,25 @@ msgstr ""
 msgid "Resource allocation type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:491
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:493
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:71
 msgid "List of materials for all categories (select one to filter)"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:99
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:103
 msgid "User disabled"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:733
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:35
+#: libreplan-webapp/src/main/webapp/common/error.zul:40
+msgid "Exception type"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:788
 msgid "In the available periods {0} only {1} hours are available."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:100
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:118
 msgid "Association with profiles"
 msgstr ""
 
@@ -4106,12 +4116,12 @@ msgstr ""
 msgid "Message - {0}"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:121
-msgid "worker's surname not specified"
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:21
+msgid "LibrePlan: Settings"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:211
-msgid "Error on removing workReportType: "
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:124
+msgid "worker's surname not specified"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41
@@ -4119,65 +4129,78 @@ msgstr ""
 msgid "Save changes"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:77
+msgid "Application settings"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
+msgid "Average of estimated hours"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:270
+msgid "Base"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:682
 msgid ""
 "You can not remove the task \"{0}\" because of this or any of its children "
 "are already in use in some work reports"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:192
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203
 msgid "Total dedication"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:45
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44
 msgid "Select source"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:825
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:828
 msgid "Worker deleted"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:735
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:733
 msgid "Select entity, please"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:293
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:291
 msgid "Stretch date must not be greater than the task's end date: "
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/users/profiles.zul:23
+msgid "LibrePlan: Profiles"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:38
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:44
 msgid "Subcontratation date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:212
-msgid "Number of digits:"
+#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22
+msgid "LibrePlan: Subcontracted Tasks"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:93
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:182
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:96
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185
 msgid "Day"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:233
-msgid "Edit Label Type"
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:54
+msgid "Current password"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:911
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1197
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:349
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:921
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1181
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:276
 msgid "Please, select an item"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:180
-msgid "Work report type saved"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1122
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1096
 msgid "Cannot be higher than finish hour"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:225
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:204
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:223
 msgid "Prefix"
 msgstr ""
 
@@ -4190,44 +4213,48 @@ msgstr ""
 msgid "New Template element"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:21
-msgid "LibrePlan: Hours Worked Per Worker In A Month"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:251
 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:325
 msgid "The base calendar parent not found"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:94
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:97
 msgid "Non Consolidated"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:43
+msgid "From date"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:34
 msgid "Reassigning type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:295
-msgid "Edit Virtual Workers Group"
+#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:22
+msgid "LibrePlan: Virtual Workers Groups"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:441
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:190
+msgid "{0} \"{1}\" can not be deleted because of it is being used"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445
 msgid "Edit limiting resource element"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:770
 msgid "The field name must be unique, not null and not empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:381
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:382
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:136
 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:157
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:85
 msgid "Position"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:104
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:108
 msgid "Incorrect authentication"
 msgstr ""
 
@@ -4241,15 +4268,15 @@ msgstr ""
 msgid "Edit work report"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:45
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:44
 msgid "Limiting resources (project)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:764
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:672
 msgid "A description field of the same name already exists."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1174
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1177
 msgid ""
 "Progress measurements that are reported by quality forms can not be removed"
 msgstr ""
@@ -4258,26 +4285,21 @@ msgstr ""
 msgid "Current value"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:165
-msgid "Edit Quality Form"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:823
 msgid "Duplicate progress assignment for task "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:48
-#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:54
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:84
+#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94
 msgid "Save and Continue"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:46
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:50
 msgid "Zoom level"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:28
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:166
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:29
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:168
 msgid "Quality form"
 msgstr ""
 
@@ -4285,46 +4307,64 @@ msgstr ""
 msgid "Go!"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:271
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:30
+msgid "Inherits up to date"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:280
 msgid "The name of the label is empty."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:26
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:27
 msgid "Profile data"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:31
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:35
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:248
 msgid "Configuration"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java:99
-msgid "It was not possible load entity. Not found. Id: "
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:496
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:528
+msgid "This date can not be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:569
+#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22
+msgid "LibrePlan: Workers"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:572
 msgid "Create Virtual Workers Group"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:933
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:861
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:95
+msgid "Select type"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:911
 msgid "Hours invested"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:160
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:324
+msgid "Authorization"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:119
 msgid ""
 "The name is not valid, there is another progress type with the same name. "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:740
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:318
 msgid "Project saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:45
-msgid "task :"
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44
+msgid "task"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:712
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:715
 msgid "ALL"
 msgstr ""
 
@@ -4332,11 +4372,11 @@ msgstr ""
 msgid "criterion satisfaction's resource not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:68
 msgid "Derived exception"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:291
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292
 msgid "Machines"
 msgstr ""
 
@@ -4344,10 +4384,6 @@ msgstr ""
 msgid "Unit Measures List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:222
-msgid "Confirm deleting this profile. Are you sure?"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:153
 msgid "Couldn't find element: {0}"
 msgstr ""
@@ -4361,27 +4397,23 @@ msgstr ""
 msgid "unit type code not found"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:180
-msgid "Calendar Exception Type saved"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342
+msgid "My account"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:42
-msgid "Resource :"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:40
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39
 msgid "Destination scenario"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:153
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:105
 msgid "Company view"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:18
-msgid "LibrePlan: Configuration"
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:114
+msgid "Both"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:751
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:758
 msgid "Not editable for containing more that an hours group."
 msgstr ""
 
@@ -4389,41 +4421,41 @@ msgstr ""
 msgid "Filter by"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:45
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:80
 msgid "Limiting resource"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/calendar/CalendarAllocationCommand.java:58
-#: libreplan-webapp/src/main/webapp/planner/order.zul:147
+#: libreplan-webapp/src/main/webapp/planner/order.zul:146
 msgid "Calendar allocation"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:48
+msgid "Up to date"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:819
 msgid "Duplicate value true report global progress for task"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:85
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:84
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:120
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33
 msgid "Category"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:154
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:156
 msgid "must be greater than finish date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21
-msgid "LibrePlan: Materials Needs At Date"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:79
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:202
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:203
 msgid "[generic all workers]"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:27
 msgid "Category data"
 msgstr ""
 
@@ -4431,18 +4463,30 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:126
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:242
+msgid "Valid until"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:128
 msgid "Add New Complementary Field"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:229
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232
 msgid "Work weeks list"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:39
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:38
 msgid "Source scenario"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
+msgid "LibrePlan: Criteria"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:23
+msgid "LibrePlan: Transfer Projects Between Scenarios"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:118
 msgid "%"
 msgstr ""
@@ -4452,25 +4496,28 @@ msgstr ""
 msgid "Remove calendar"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1548
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1712
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:512
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:648
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1346
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:656
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:228
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:312
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:256
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:139
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1323
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:669
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:259
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141
 msgid "must be lower than finish date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:757
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:161
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:766
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:41
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:70
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:135
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:79
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33
 msgid "Resource"
 msgstr ""
@@ -4483,16 +4530,16 @@ msgstr ""
 msgid "Date last progress reported"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:123
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125
 msgid "Could not load any resource"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:335
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37
 msgid "Work And Progress Per Project"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:383
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:386
 msgid ""
 "You must allow multiple active criteria for this type to use this assignment "
 "strategy"
@@ -4506,79 +4553,63 @@ msgstr ""
 msgid "Default Label"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:188
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:187
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:85
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:108
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:113
 msgid "Close"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:471
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java:945
 msgid "Specific Allocations"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:271
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:119
 msgid "error doing reassignation: {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:349
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:423
 msgid "Time filter"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:61
-msgid "Move selected task up"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27
 msgid "Select criteria set or specific resources for allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:316
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63
+msgid "Move selected task up"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348
 msgid "Create copy"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:34
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33
 msgid "Work Report Lines List"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:27
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28
 msgid "Company data"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:215
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151
 msgid "Unit type code cannot be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:47
-msgid "Average of the estimated hours"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:178
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:240
-msgid "Quality form saved"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:167
-msgid "Create Unit Type"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:184
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312
 msgid "Users"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:143
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145
 msgid "Label Type fields"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:103
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:105
 msgid "Hours Management"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:33
-msgid "New task:"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:140
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:144
 msgid ""
 "Please use some of the compatible browsers: Chrome, Firefox, Safari or "
 "Epiphany."
@@ -4588,7 +4619,7 @@ msgstr ""
 msgid "specific allocation"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:147
+#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:148
 msgid "company name has to be unique. It is already used"
 msgstr ""
 
@@ -4603,26 +4634,22 @@ msgstr ""
 msgid "Template saved"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:305
-msgid "Confirm deleting this User. Are you sure?"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:577
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:565
 msgid "work report have not any description value with this field name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179
-msgid "User saved"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:23
+msgid "LibrePlan: Configuration"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:47
 msgid "Task quality form name"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1097
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:156
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:161
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:181
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1093
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:158
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:163
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:183
 msgid "Some cost category assignments overlap in time"
 msgstr ""
 
@@ -4646,49 +4673,49 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111
+msgid "Apply filter to"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:30
 msgid "Statistics list "
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116
+msgid "Please, enter a valid effort"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:59
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:62
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:56
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58
 msgid "Enabled"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:143
-msgid "Edit Exception Day Type"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222
 msgid "All resources must be limiting. "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:327
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:525
 msgid "Filter by worker"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/machines.zul:22
-msgid "LibrePlan: Machines"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:47
 msgid "Load due to current project"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1344
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305
 msgid "You are going to change the assignment function. Are you sure?"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322
 msgid "Exception Days"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:200
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:183
 msgid "There must be at least 2 stretches for doing interpolation"
 msgstr ""
 
@@ -4696,59 +4723,58 @@ msgstr ""
 msgid "Incompatible update: stored resource is not of type: {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38
-#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:42
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:213
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:98
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:114
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:109
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114
 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:133
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:39
-#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:42
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:75
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:82
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137
-#: libreplan-webapp/src/main/webapp/templates/templates.zul:132
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:135
+#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:153
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:137
 msgid "Save & Continue"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
+msgid "LibrePlan: Work And Progress Per Project"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:90
 msgid "Scheduling mode"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:53
-#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:55
-#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:50
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54
+#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23
 msgid "Filter"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:943
+msgid "Work Report Type"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:26
 msgid "Assigned locations"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:247
-msgid "Unit type saved"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:267
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:129
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:138
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:270
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:131
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:140
 msgid "Two hour costs with the same type overlap in time"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:201
-msgid "Create Machine"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:64
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:66
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:49
 msgid "Report progress"
 msgstr ""
@@ -4757,7 +4783,7 @@ msgstr ""
 msgid "ACWP"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:736
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:791
 msgid "The periods available depend on the resource's calendar."
 msgstr ""
 
@@ -4765,7 +4791,7 @@ msgstr ""
 msgid "START"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:313
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:342
 msgid "Schedule from the deadline to start"
 msgstr ""
 
@@ -4773,18 +4799,18 @@ msgstr ""
 msgid "generic machines allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:372
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:375
 msgid "Non limiting resource assignation"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:87
 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:82
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68
 msgid "Back"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:30
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:56
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:58
 msgid "Subcontractor"
 msgstr ""
 
@@ -4793,22 +4819,18 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1531
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1694
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:495
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:631
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1329
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:638
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:211
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:293
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:239
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1306
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:651
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:242
 msgid "must be greater than start date"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:93
-msgid "Create Company"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:47
 msgid "Cancel and return"
 msgstr ""
@@ -4818,7 +4840,6 @@ msgstr ""
 msgid "Assign quality form"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:222
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:387
 msgid "Delete item {0}. Are you sure?"
 msgstr ""
@@ -4827,16 +4848,15 @@ msgstr ""
 msgid "worked hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:50
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:51
 msgid "Unit measure name"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:772
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:144
 msgid "cannot include a progress of the same progress type twice"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:489
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:476
 msgid "a work report line has not this label type assigned"
 msgstr ""
 
@@ -4845,35 +4865,34 @@ msgstr ""
 msgid "Allocations"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:32
-#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:32
-msgid "Choosing Template"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52
 msgid "Task code"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:133
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:50
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:135
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:49
 msgid "Length"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:85
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89
 msgid "Capacity"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:299
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:178
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:331
+#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133
 msgid "Create derived"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:627
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:302
+msgid "Label Types"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:638
 msgid "it must be greater than zero"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:130
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
 msgid "must be a real positive number"
 msgstr ""
 
@@ -4886,34 +4905,33 @@ msgstr ""
 msgid "Total hours task"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:409
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:441
 msgid "Removed calendar \"{0}\""
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1083
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1063
 msgid "Create project"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:49
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:542
+msgid "This date can not include the whole next work week"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:51
 msgid ""
 "Allow multiple values of this type of criterion in the same period of time"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1294
 msgid ""
 "The date is not valid, the date must be unique for this progress assignment"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:113
-msgid "Edit Criterion Type"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:445
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:453
 msgid "The code cannot be empty."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:36
 msgid "Human hours per machine working hour within configuration unit"
 msgstr ""
 
@@ -4928,12 +4946,20 @@ msgstr ""
 msgid "New work report"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865
 msgid "yes"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:886
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:304
+msgid "Root calendar"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:263
+msgid "Port"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:862
 msgid ""
 "Deleting this subcontracted project, you are going to lose the relation to "
 "report progress. Are you sure?"
@@ -4952,17 +4978,17 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:143
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:175
 msgid "This resource has already been added."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:149
 msgid "Calendar exception types"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:24
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36
 msgid "Cost category assignment"
 msgstr ""
 
@@ -4970,14 +4996,10 @@ msgstr ""
 msgid "missing code in a hour cost"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:822
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:870
 msgid "All workers"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:304
-msgid "Label saved"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector_combo.zul:25
 msgid "Select criteria or resources"
 msgstr ""
@@ -4988,44 +5010,47 @@ msgstr ""
 msgid "Select required criteria set and press filter button"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1018
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1279
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:990
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1181
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1438
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:229
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:231
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:233
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:280
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:380
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123
+#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:147
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:740
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:135
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:738
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:63
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:128
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:47
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:72
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:49
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:42
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:48
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:44
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:50
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:84
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:88
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:93
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:33
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:42
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:53
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:54
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:43
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:42
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:44
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:94
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:92
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:94
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:44
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:55
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:44
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:39
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96
@@ -5036,10 +5061,6 @@ msgstr ""
 msgid "Hours Group {0} : Duplicate code in DB"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21
-msgid "LibrePlan: Work And Progress Per Project"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:52
 msgid "New code"
@@ -5049,25 +5070,21 @@ msgstr ""
 msgid "The progress type cannot be modified"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:412
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:392
 msgid "Calculate Resources per Day"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:996
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:904
 msgid "The index fields and labels must be uniques and consecutives"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:21
-msgid "LibrePlan: Estimated/Planned Hours Per Task"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130
 msgid "Estimate To Complete"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:84
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:83
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30
 msgid "Unit type"
 msgstr ""
@@ -5080,20 +5097,16 @@ msgstr ""
 msgid "Sum of all task leafs imputed hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:644
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:554
 msgid "This machine was already removed by other user"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293
-msgid "Work Reports"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:26
 msgid "Calendar data"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/users/entities/User.java:173
-msgid "login name is already being used by another user"
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:294
+msgid "Work Reports"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:22
@@ -5104,31 +5117,33 @@ msgstr ""
 msgid "code is already used"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:67
+msgid "Labels list"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:152
 msgid "Criterion Requirements"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:148
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:215
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76
 msgid "Extra Effort"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:57
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59
 msgid "Move selected task down"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:260
+#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269
 msgid "Already exists other label with the same name"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:32
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32
 msgid "Customer Reference"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:777
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:134
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:147
 msgid "spread values are not valid, at least one value should be true"
@@ -5146,24 +5161,24 @@ msgstr ""
 msgid "SV"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:85
 msgid "Our company login"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1483
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1471
 msgid "Filter work reports"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:395
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:427
 msgid ""
 "Default calendar cannot be removed. Please, change the default calendar in "
 "the Configuration window before."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:587
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:932
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:600
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:908
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:49
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:63
@@ -5171,42 +5186,42 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:128
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:257
 msgid ""
 "This criterion type cannot be deleted because it has assignments to projects "
 "or resources"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1221
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224
 msgid "All progress types have already been assigned."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
 msgid "Price per hour"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:209
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211
 msgid "Project: {0} "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:314
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:315
 msgid "Calendars"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/page_not_found.zul:21
-msgid "LibrePlan: Page not found"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:355
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:360
 msgid "The date cannot be null"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:316
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:317
 msgid ""
 "Another task in the same branch is already reporting progress for this "
 "quality form"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:30
+msgid "options"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92
 msgid "Latest date"
 msgstr ""
@@ -5215,13 +5230,18 @@ msgstr ""
 msgid "Show only current satisfied criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:231
+#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23
+#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23
+msgid "LibrePlan: Work Reports"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373
 msgid "Error on showing delete confirm"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:671
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:623
 msgid "Sum of all rows"
 msgstr ""
 
@@ -5237,26 +5257,22 @@ msgstr ""
 msgid "Done {0} of {1}"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/users.zul:23
-msgid "LibrePlan: Accounts"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:31
+msgid "Planned start"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/scenarios/scenarios.zul:23
-msgid "LibrePlan: Scenarios Management"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:194
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:177
 msgid ""
 "Last stretch should have one hundred percent for length and amount of work "
 "percentage"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:75
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:79
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:100
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:60
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:96
 msgid "Filter by projects"
 msgstr ""
 
@@ -5264,17 +5280,17 @@ msgstr ""
 msgid "Criteria of selected type "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33
 msgid "Each worker configuration unit name"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:42
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:224
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:221
 msgid "Active"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1258
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261
 msgid "This progress measurement can not be in "
 msgstr ""
 
@@ -5282,19 +5298,19 @@ msgstr ""
 msgid "Inherited labels"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1243
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246
 msgid ""
 "This progress can not be changed or removed, because it has got consolidated "
 "progress. It is needed to remove the consolidation on all its progress."
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:910
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:917
 msgid "Unindent"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:932
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1390
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:935
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1384
 msgid "Value is not valid, the current value must be not empty"
 msgstr ""
 
@@ -5302,7 +5318,11 @@ msgstr ""
 msgid "Direct labels"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:92
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:43
+msgid "From today"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:96
 msgid "Log in"
 msgstr ""
 
@@ -5310,15 +5330,15 @@ msgstr ""
 msgid "Project name"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:53
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:55
 msgid "Precision"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:372
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:359
 msgid "missing code in a work report line"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:985
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:928
 msgid "Efforts"
 msgstr ""
 
@@ -5326,32 +5346,30 @@ msgstr ""
 msgid "Show all reported hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22
-msgid "LibrePlan: Subcontracted Tasks"
-msgstr ""
-
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113
 msgid "Projects List"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:137
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:58
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:65
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:49
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:51
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:52
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:136
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:60
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:44
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:45
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:80
 msgid "Generate code"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:110
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:116
 msgid "Scheduling state"
 msgstr ""
 
@@ -5363,19 +5381,27 @@ msgstr ""
 msgid "The code sequence is already in use and it can not be updated."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21
-msgid "LibrePlan: Project Costs Per Resource"
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:332
+msgid "Import LDAP roles"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:43
+msgid "Personal Data"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:206
 msgid "criterion satisfaction's criterion not specified"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:21
+msgid "LibrePlan: Hours Worked Per Resource"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java:163
 msgid "Number of iterations should be between 1 and "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:126
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:142
 msgid "Scenarios must be enabled as more elements than master exist"
 msgstr ""
 
@@ -5393,11 +5419,11 @@ msgstr ""
 msgid "Profiles authorization"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:292
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:293
 msgid "Virtual Workers Groups"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:144
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:95
 msgid "Planning charts expanded"
 msgstr ""
 
@@ -5405,14 +5431,26 @@ msgstr ""
 msgid "Assignation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:431
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:694
+msgid "Inh"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:339
 msgid "Not deletable"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28
+msgid "Administrator"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java:189
 msgid "Doing {0} reassignations"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:195
+msgid "Select entity"
+msgstr ""
+
 #: libreplan-business/src/main/java/org/libreplan/business/common/IntegrationEntity.java:48
 msgid "code not specified"
 msgstr ""
@@ -5421,7 +5459,7 @@ msgstr ""
 msgid "Projects list"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:190
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:973
 msgid ""
 "Cannot delete work report type. There are some work reports bound to it."
 msgstr ""
@@ -5430,41 +5468,41 @@ msgstr ""
 msgid "Criterion Type List"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:732
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:702
 msgid "Overall progress"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:52
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:54
 msgid "Create template from selected task"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:119
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:129
 msgid "All projects"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:47
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:79
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:60
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:83
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:284
 msgid "Password"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:93
 msgid "Observations"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:962
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:942
 msgid "Edit project"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:24
+#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:27
 msgid "Progress assignments"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:27
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:285
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:262
 msgid "Valid from"
 msgstr ""
 
@@ -5476,24 +5514,24 @@ msgstr ""
 msgid "There exists other template with the same name."
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:59
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53
 msgid "Month"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:900
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:911
 msgid "{0} could not be allocated. Cannot allocate more than one resource"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:56
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32
 msgid "Color"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:759
-msgid "Advanced assignment saved"
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java:105
+msgid "Current password is incorrect"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:367
 msgid "Cannot insert material in general view. Please, select a category"
 msgstr ""
 
@@ -5501,42 +5539,46 @@ msgstr ""
 msgid "criterion satisfaction's start date not specified"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:371
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405
 msgid "Only {0} resources per day were achieved for current allocation"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311
+msgid "Delete {0} \"{1}\". Are you sure?"
+msgstr ""
+
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:79
-#: libreplan-webapp/src/main/webapp/common/layout/template.zul:97
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86
+#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98
 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48
-#: libreplan-webapp/src/main/webapp/planner/order.zul:69
-#: libreplan-webapp/src/main/webapp/planner/order.zul:132
-#: libreplan-webapp/src/main/webapp/planner/order.zul:167
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:83
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39
-#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:43
+#: libreplan-webapp/src/main/webapp/planner/order.zul:70
+#: libreplan-webapp/src/main/webapp/planner/order.zul:131
+#: libreplan-webapp/src/main/webapp/planner/order.zul:166
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89
 #: libreplan-webapp/src/main/webapp/planner/editTask.zul:79
 #: libreplan-webapp/src/main/webapp/planner/main.zul:66
 msgid "Accept"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:79
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:259
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:266
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:273
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:280
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:308
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:339
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:346
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:353
 msgid "Example: {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:283
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:303
-#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:40
-msgid "Edit Worker"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:458
 msgid ""
 "Create new material assignment out of material assignment {0}. Are you sure?"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:193
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:190
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:167
 msgid "Work report lines"
 msgstr ""
@@ -5545,15 +5587,11 @@ msgstr ""
 msgid "Calculated"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:213
 msgid "Completed: {0}% "
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:118
-msgid "Error setting up edition form for Criterion Type with id: {0}"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1178
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1181
 msgid "Calculated progress measurement can not be removed"
 msgstr ""
 
@@ -5562,22 +5600,22 @@ msgstr ""
 msgid " The "
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:51
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:55
 msgid "Access to the system"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:48
 msgid "Probability"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159
 msgid "Click on "
 msgstr ""
 
@@ -5602,67 +5640,72 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:207
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:70
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:219
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80
 msgid "Infinitely Over Assignable"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:425
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47
+msgid "Apply changes and continue edition"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426
 msgid "criterion names must be unique inside a criterion type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:735
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:790
 msgid ""
 "The periods available depend on the satisfaction of the criteria by the "
 "resources and their calendars."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:814
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:79
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:132
-#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:52
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:59
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:287
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:44
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:131
+#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:264
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:69
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:46
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:47
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:76
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:59
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:81
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:36
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66
-#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:49
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:37
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:80
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65
+#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:51
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26
-#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:39
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:76
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:114
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:29
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:76
 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:90
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:95
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:99
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:120
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116
 msgid "Code"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:41
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:40
 msgid "Add stretch"
 msgstr ""
 
@@ -5674,7 +5717,7 @@ msgstr ""
 msgid "Assignation type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:387
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:367
 msgid "Calculate Workable Days"
 msgstr ""
 
@@ -5684,16 +5727,17 @@ msgid ""
 "Start date is not valid, the new start date must be lower than the end date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
-#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:55
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:96
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:57
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:100
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:121
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
+#: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:53
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117
 msgid "Start date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:171
 msgid "Update exception"
 msgstr ""
 
@@ -5706,8 +5750,7 @@ msgstr ""
 msgid "Budget"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:43
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:65
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
 msgid "May"
 msgstr ""
 
@@ -5715,7 +5758,7 @@ msgstr ""
 msgid "Already exists other criterion with the same name"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:37
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:38
 msgid "Unit name"
 msgstr ""
 
@@ -5724,10 +5767,6 @@ msgstr ""
 msgid "Write"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/labels/labelTypes.zul:21
-msgid "LibrePlan: Labels"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51
 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35
@@ -5736,7 +5775,7 @@ msgstr ""
 msgid "Project code"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:499
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503
 msgid "Assign element to queue automatically"
 msgstr ""
 
@@ -5750,32 +5789,27 @@ msgid ""
 "calendar popup or type in date directly)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:326
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:603
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596
 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43
 msgid "Normal"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:312
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:317
 msgid "Date cannot be null"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:765
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:169
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:108
+msgid "Project view"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:774
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:166
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:76
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:142
 msgid "Task Code"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:157
-msgid "Project view"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:96
-msgid "Create Profile"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:747
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:655
 msgid "This label type already is assigned to the work report type."
 msgstr ""
 
@@ -5790,50 +5824,52 @@ msgstr ""
 msgid "New criterion"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:730
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:346
-#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:542
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:700
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325
+#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:813
 #: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49
 msgid "Load"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:937
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:60
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:682
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:65
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:82
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:47
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:81
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37
-#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:41
+#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:120
+#: libreplan-webapp/src/main/webapp/templates/templates.zul:101
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32
 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51
 msgid "Description"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:24
-msgid "LibrePlan: Criteria"
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:39
+#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:45
+msgid "Apply"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:117
-msgid "Go to advanced Allocation"
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:48
+msgid "Selected node"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:660
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:671
 msgid "already exists an allocation for criteria {0}"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:283
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:287
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288
 msgid "Project Templates"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:310
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:339
 msgid "Forward"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:465
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469
 msgid "Invalid queue element"
 msgstr ""
 
@@ -5847,21 +5883,22 @@ msgstr ""
 msgid "Unnasigned"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:61
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:70
-#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:163
+#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:179
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:74
+#: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:165
 msgid "User"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:403
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405
 msgid "At least one HoursGroup is needed"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:69
+#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71
 msgid "Interacts with applications"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:257
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:289
 msgid "Virtual worker"
 msgstr ""
 
@@ -5869,26 +5906,22 @@ msgstr ""
 msgid "Length percentage should be between 0 and 100"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:48
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:50
 msgid "Multiple values per resource"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
-msgid "Hours:"
-msgstr ""
-
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:62
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58
 msgid "Split"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:101
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100
 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:105
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:107
 msgid "please, select a project"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:118
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:122
 msgid "Supported Chrome, Firefox, Safari and Epiphany browsers"
 msgstr ""
 
@@ -5898,14 +5931,14 @@ msgstr ""
 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:50
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:30
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:94
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51
 msgid "Starting date"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:64
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:63
 msgid "Add materials"
 msgstr ""
 
@@ -5913,66 +5946,61 @@ msgstr ""
 msgid "Load 100%"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:991
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:934
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:84
 msgid "Function"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:775
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:394
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:745
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:364
 msgid "date in future"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:654
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:630
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:851
 msgid "New project version"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:156
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:137
 msgid "Format"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:174
-msgid "Edit Unit Type"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:332
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:474
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1249
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:472
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1226
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:483
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:532
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104
 #: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:27
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37
-#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:24
+#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:25
-#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:25
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:49
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26
+#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:39
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:41
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:48
 msgid "Edit"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79
+#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81
 msgid "Init date"
 msgstr ""
 
@@ -5980,7 +6008,11 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:457
+#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:60
+msgid "New password"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:352
 msgid "percentage must be in range (0,100]"
 msgstr ""
 
@@ -5989,7 +6021,7 @@ msgstr ""
 msgid "New Description"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1154
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1150
 msgid ""
 "resources cost category assignment codes must be unique inside a resource"
 msgstr ""
@@ -6006,22 +6038,23 @@ msgid ""
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61
+#: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:85
 msgid "Unable to convert {0} value to {1} type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:198
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:114
 msgid "Tree {0} sucessfully flattened"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:83
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:82
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31
 msgid "Unit price"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:68
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64
 msgid "Project Code"
 msgstr ""
 
@@ -6033,15 +6066,11 @@ msgstr ""
 msgid "Reassigning"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:588
-msgid ""
-"Cannot delete that cost category because there are resources assigned to it."
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:633
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:644
 msgid "{0} already assigned to resource allocation list"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:184
 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:27
 msgid "Unit Measure"
 msgstr ""
@@ -6057,14 +6086,13 @@ msgstr ""
 #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:128
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:46
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:98
-#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:127
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47
+#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:101
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27
-#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:42
-#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:59
-#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:77
+#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44
+#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61
+#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
@@ -6074,37 +6102,40 @@ msgstr ""
 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49
 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:36
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:140
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:83
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:123
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:103
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:144
 msgid "Type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:346
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:347
 msgid "{0} projects reassignation remaining"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:637
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:542
 msgid ""
 "This machine cannot be deleted because it has assignments to projects or "
 "imputed hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:71
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45
 msgid "November"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1310
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:89
+msgid "Enable/Disable"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1282
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1304
 msgid ""
 "Value is not valid, the value must be greater than the value of the previous "
 "progress."
@@ -6118,68 +6149,62 @@ msgstr ""
 msgid " in the specified directory."
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1148
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java:1144
 msgid "criterion satisfaction codes must be unique inside a resource"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:668
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:862
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865
 msgid "no"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:360
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:347
 msgid "missing code in a work report."
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:29
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:85
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:105
 msgid "Criterion"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:94
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:103
 msgid "unl"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:76
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:290
+msgid "Test LDAP connection"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:96
 msgid "Generate code for"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:397
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:481
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:468
 #: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103
 msgid "missing code in a label"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:139
-msgid "is not supported for its use with LibrePlan."
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:123
 msgid "Actual Cost Work Performed"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:185
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:172
 msgid "Create project from Template"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310
-msgid "LibrePlan Configuration"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:406
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:417
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
 " and should not be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51
-msgid "Average of the worked hours"
-msgstr ""
-
 #: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorization.java:43
 msgid "an authorization type must be set"
 msgstr ""
@@ -6188,65 +6213,73 @@ msgstr ""
 msgid "Must start after (days since beginning project)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:653
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommand.java:629
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:850
 msgid ""
 "Confirm creating a new project version for this scenario and derived. Are "
 "you sure?"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:150
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29
 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:68
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:44
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:74
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:45
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:73
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:88
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:88
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:129
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:80
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:163
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:92
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:133
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105
 msgid "Add"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/materials/materials.zul:47
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:44
-#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:85
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:124
+#: libreplan-webapp/src/main/webapp/common/event_error.zul:43
+#: libreplan-webapp/src/main/webapp/common/error.zul:48
+msgid "Stacktrace"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/materials/materials.zul:48
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43
+#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:82
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120
 msgid "Unselect"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:617
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:609
 msgid "You should select the type of exception"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93
 #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52
-#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56
+#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:31
 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:99
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46
 msgid "Deadline"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:298
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:113
+msgid "Tasks"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299
 msgid "Subcontracted Tasks"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:122
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:118
 msgid "Filter by categories or materials"
 msgstr ""
 
@@ -6254,7 +6287,7 @@ msgstr ""
 msgid "Amount work percentage should be between 0 and 100"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:29
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
 msgid "Machine data"
 msgstr ""
 
@@ -6262,19 +6295,18 @@ msgstr ""
 msgid "VAC"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:28
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:29
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:34
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:55
 msgid "Label type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:246
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:319
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:243
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236
 msgid "Advanced Allocation"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:309
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:310
 msgid "Administration / Management"
 msgstr ""
 
@@ -6286,8 +6318,8 @@ msgstr ""
 msgid "Template Tree"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:499
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:447
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
 msgid "Alpha"
 msgstr ""
 
@@ -6300,54 +6332,63 @@ msgstr ""
 msgid "inconsistent parent code."
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:430
+msgid "effort is not properly calculated based on clock"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:67
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:63
 msgid "Status"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/configuration.zul:163
+#: libreplan-webapp/src/main/webapp/settings/settings.zul:111
 msgid "Resource load view"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:763
-msgid "the date must be inside the visualization area"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:806
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82
 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:84
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154
+#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35
 #: libreplan-webapp/src/main/webapp/orders/_list.zul:34
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:69
-#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:76
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72
+#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72
-#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34
 msgid "Hours"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:54
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:733
+msgid "the date must be inside the visualization area"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56
 msgid "Quality form type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:405
+#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:392
 msgid "work report has not this label type assigned"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1230
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1192
 msgid "Limiting assignment"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:522
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523
 msgid "date not specified."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:360
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318
+msgid "{0} \"{1}\" deleted"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364
 msgid " hours"
 msgstr ""
 
@@ -6355,43 +6396,40 @@ msgstr ""
 msgid "The name of the criterion is empty."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:281
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:134
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:147
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145
 msgid "Limiting Resources Planning"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:770
-msgid "The max value must be not empty"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:66
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69
 msgid "New label"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:134
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java:137
 msgid "Worker ID cannot be empty"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:177
-msgid "All project tasks"
-msgstr ""
-
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352
 msgid "The start date cannot be null"
 msgstr ""
 
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:188
+msgid "All project tasks"
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:367
+msgid "LDAP Roles (separated by ;)"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78
 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27
 msgid "Allocation configuration"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:125
-msgid "Scenario \"{0}\" saved"
-msgstr ""
-
-#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:215
+#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:209
 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:189
 msgid "Save & New work report"
 msgstr ""
@@ -6400,37 +6438,41 @@ msgstr ""
 msgid "Subcontract price"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:744
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:799
 msgid "Resources per day are zero"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
-#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:31
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
+#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32
 msgid "Assigned criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/common/layout/login.zul:53
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:57
 msgid "Help on authentication (opens a new window)"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:870
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:778
 msgid "The length must be greater than 0, and not null."
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:39
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:54
 msgid "Not a valid effort duration"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:544
+#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:199
+msgid "Cannot remove the predefined Exception Day Type \"{0}\""
+msgstr ""
+
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:34
+msgid "Base calendar type"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:613
 msgid "Could not save new calendar"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1467
-msgid "Sigmoid function applied to current resource"
-msgstr ""
-
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:160
-msgid "Deleted unit type {0}"
+#: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:35
+msgid "Planned end"
 msgstr ""
 
 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:224
@@ -6441,43 +6483,40 @@ msgstr ""
 msgid "Couldn't find criterion {0}"
 msgstr ""
 
-#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:37
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:36
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:33
 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:35
 msgid "Apply filtering to tasks satisfying required criteria"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37
 msgid "Task Scheduling Status In Project"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:421
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:345
-#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:373
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:194
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:887
+#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:261
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863
 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356
+#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313
 msgid "Confirm"
 msgstr ""
 
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56
-#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:32
-#: libreplan-webapp/src/main/webapp/calendars/_list.zul:32
+#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55
+#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35
 #: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43
-#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:51
+#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52
 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48
 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58
 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:61
+#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:52
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:54
 msgid "Create"
 msgstr ""
 
@@ -6486,76 +6525,76 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1728
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1734
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1716
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1722
 msgid "please, select a work report type"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:486
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:487
 msgid "List of materials for category: {0}"
 msgstr ""
 
+#: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:36
+msgid "Cancel edition"
+msgstr ""
+
 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32
 msgid "Total price"
 msgstr ""
 
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:436
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1230
-#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1242
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:786
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1044
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1295
-#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:625
+#: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46
+msgid "Labels without inheritance"
+msgstr ""
+
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:344
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214
+#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:886
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1207
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1454
+#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451
 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:138
-#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:818
-#: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:126
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271
-#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292
-#: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:223
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:362
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:530
-#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:544
+#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:272
+#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:293
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289
+#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143
 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:223
-#: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:306
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1265
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1242
 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1204
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:332
-#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:405
-#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:694
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1207
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333
+#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406
+#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:646
 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:948
-#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:954
-#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:232
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:955
+#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:961
+#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264
 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84
 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:69
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:117
-#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:132
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118
+#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133
 #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88
 #: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45
 #: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52
 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46
 #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49
 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42
-#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:92
+#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99
 #: libreplan-webapp/src/main/webapp/materials/materials.zul:104
-#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:115
+#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:117
 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52
-#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:54
 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47
 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42
-#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:66
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:90
-#: libreplan-webapp/src/main/webapp/users/_editUser.zul:120
+#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:107
+#: libreplan-webapp/src/main/webapp/users/_editUser.zul:137
 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40
-#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:44
+#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91
 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:213
@@ -6564,19 +6603,19 @@ msgstr ""
 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67
 #: libreplan-webapp/src/main/webapp/templates/_list.zul:53
 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129
-#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147
-#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109
-#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150
-#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:110
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:109
-#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:150
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117
-#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158
-#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133
+#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143
+#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105
+#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146
+#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105
+#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113
+#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154
+#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127
 msgid "Delete"
 msgstr ""
 
@@ -6600,43 +6639,99 @@ msgstr ""
 msgid "line"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:150
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34
+msgid "Use browser language configuration"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:35
+msgid "Galician"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:36
+msgid "Spanish"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:37
+msgid "English"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:38
+msgid "Russian"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172
 msgid "unlimited"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99
 msgid "Monday"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99
 msgid "Tuesday"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:83
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99
 msgid "Wednesday"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100
 msgid "Thursday"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100
 msgid "Friday"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:84
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100
 msgid "Saturday"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:85
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101
 msgid "Sunday"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31
+msgid "red (default)"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:32
+msgid "green"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:33
+msgid "blue"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:34
+msgid "cyan"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:35
+msgid "magenta"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:36
+msgid "yellow"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:37
+msgid "black"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:38
+msgid "orange"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:39
+msgid "purple"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139
 msgid "Yes"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:135
+#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139
 msgid "No"
 msgstr ""
 
@@ -6644,35 +6739,19 @@ msgstr ""
 msgid "STRATEGIC RESOURCE"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:37
-msgid "WORK_RELATIONSHIP"
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:39
+msgid "LOCATION"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:43
-msgid "LOCATION_GROUP"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:50
-msgid "MACHINE LOCATION_GROUP"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:58
-msgid "LEAVE"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:64
-msgid "TRAINING"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:70
-msgid "JOB"
-msgstr ""
-
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:76
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:46
 msgid "CATEGORY"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:206
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/PredefinedCriterionTypes.java:53
+msgid "SKILL"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207
 msgid "[generic all machines]"
 msgstr ""
 
@@ -6712,15 +6791,15 @@ msgstr ""
 msgid "by items"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:107
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109
 msgid "Hours cost type cannot be empty or null"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:116
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118
 msgid "Init date cannot be empty or null"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:121
+#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123
 msgid "End date cannot be empty or null"
 msgstr ""
 
@@ -6762,23 +6841,23 @@ msgid ""
 "HoursGroup"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:577
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618
 msgid ""
 "Some ancestor has the same label assigned, so this element is already "
 "inheriting this label"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:676
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717
 #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963
 msgid "Cannot spread two progress in the same task"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:700
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:726
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767
 msgid "Duplicate Progress Assignment For Task"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1053
+#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094
 msgid "Quality form already exists"
 msgstr ""
 
@@ -6876,14 +6955,18 @@ msgid "You can not modifiy this entity sequence, it is already in use"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36
-msgid "Progress with all tasks by hours"
+msgid "Spreading progress"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:37
-msgid "Progress with critical path tasks by hours"
+msgid "Progress with all tasks by hours"
 msgstr ""
 
 #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:38
+msgid "Progress with critical path tasks by hours"
+msgstr ""
+
+#: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:39
 msgid "Progress with critical path tasks by duration"
 msgstr ""
 
@@ -6904,19 +6987,19 @@ msgstr ""
 msgid "Success sent"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:58
-msgid "None"
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76
+msgid "Flat"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:59
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78
 msgid "Stretches"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:60
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79
 msgid "Interporlation"
 msgstr ""
 
-#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:61
+#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80
 msgid "Sigmoid"
 msgstr ""
 
diff --git a/libreplan-webapp/src/main/webapp/advance/advanceTypes.zul b/libreplan-webapp/src/main/webapp/advance/advanceTypes.zul
index f4aeab095..20dd6d1b9 100644
--- a/libreplan-webapp/src/main/webapp/advance/advanceTypes.zul
+++ b/libreplan-webapp/src/main/webapp/advance/advanceTypes.zul
@@ -25,7 +25,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?component name="list" inline="true" macroURI="_listAdvanceTypes.zul"?>
 <?component name="edition" inline="true" macroURI="_editAdvanceTypes.zul"?>
diff --git a/libreplan-webapp/src/main/webapp/calendars/_edition.zul b/libreplan-webapp/src/main/webapp/calendars/_edition.zul
index 800f1dc4f..082bd7d91 100644
--- a/libreplan-webapp/src/main/webapp/calendars/_edition.zul
+++ b/libreplan-webapp/src/main/webapp/calendars/_edition.zul
@@ -148,7 +148,7 @@
                         <hbox align="middle">
                           <label value="${i18n:_('Normal Effort')}:" />
                           <hbox id="exceptionDayNormalEffortRow" />
-                          <label value="${i18n:_('Extra Effort')}:" />
+                          <label value="${i18n:_('Overtime Effort')}:" />
                           <hbox id="exceptionDayExtraEffortBox"
                             sclass="exceptionDayExtraEffortBox" />
                         </hbox>
diff --git a/libreplan-webapp/src/main/webapp/calendars/calendars.zul b/libreplan-webapp/src/main/webapp/calendars/calendars.zul
index 0cf0a9c18..4e78b3fa1 100644
--- a/libreplan-webapp/src/main/webapp/calendars/calendars.zul
+++ b/libreplan-webapp/src/main/webapp/calendars/calendars.zul
@@ -25,7 +25,6 @@
 
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 
diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul
index cf8081e33..af69eb6e6 100644
--- a/libreplan-webapp/src/main/webapp/common/configuration.zul
+++ b/libreplan-webapp/src/main/webapp/common/configuration.zul
@@ -27,7 +27,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <zk>
 
@@ -193,7 +192,7 @@
                         <panelchildren id="panelEntitySequence">
                             <vbox>
                                 <hbox pack="center">
-                                    <label value="${i18n:_('Select entity:')}" />
+                                    <label value="${i18n:_('Select entity')}" />
                                     <combobox id="entityCombo"
                                         model="@{configurationController.entityNames}">
                                         <comboitem
@@ -202,10 +201,10 @@
                                             value="@{entityName}" />
                                     </combobox>
 
-                                    <label value="${i18n:_('Prefix:')}" />
+                                    <label value="${i18n:_('Prefix')}" />
                                     <textbox id="prefixBox" />
                                     <label
-                                        value="${i18n:_('Number of digits:')}" />
+                                        value="${i18n:_('Number of digits')}" />
                                     <intbox id="numDigitBox" value="5" />
                                     <button label="${i18n:_('add')}"
                                         onClick="configurationController.addNewEntitySequence()" />
@@ -254,35 +253,35 @@
                             </columns>
                             <rows>
                                 <row>
-                                    <label value="${i18n:_('Host:')}" />
+                                    <label value="${i18n:_('Host')}" />
                                     <hbox>
                                         <textbox id="ldapHost" value="@{configurationController.ldapConfiguration.ldapHost}"  width="300px"/>
                                         <label value="${i18n:__('Example: {0}', 'ldap://localhost')}" />
                                     </hbox>
                                 </row>
                                 <row>
-                                    <label value="${i18n:_('Port:')}" />
+                                    <label value="${i18n:_('Port')}" />
                                     <hbox>
                                         <textbox id="ldapPort" value="@{configurationController.ldapConfiguration.ldapPort}"  width="300px"/>
                                         <label value="${i18n:__('Example: {0}', '389')}" />
                                     </hbox>
                                 </row>
                                 <row>
-                                    <label value="${i18n:_('Base:')}" />
+                                    <label value="${i18n:_('Base')}" />
                                     <hbox>
                                         <textbox id="ldapBase" value="@{configurationController.ldapConfiguration.ldapBase}"  width="300px"/>
                                         <label value="${i18n:__('Example: {0}', 'dc=example,dc=org')}" />
                                     </hbox>
                                 </row>
                                 <row>
-                                    <label value="${i18n:_('UserDn:')}" />
+                                    <label value="${i18n:_('UserDn')}" />
                                     <hbox>
                                         <textbox id="ldapUserDn" value="@{configurationController.ldapConfiguration.ldapUserDn}"  width="300px"/>
                                         <label value="${i18n:__('Example: {0}', 'cn=admin,dc=example,dc=org')}" />
                                     </hbox>
                                 </row>
                                 <row>
-                                    <label value="${i18n:_('Password:')}" />
+                                    <label value="${i18n:_('Password')}" />
                                     <textbox id="ldapPassword" value="@{configurationController.ldapConfiguration.ldapPassword}" type="password"  width="300px"/>
                                 </row>
                             </rows>
@@ -303,7 +302,7 @@
                             </columns>
                             <rows>
                                 <row>
-                                    <label value="${i18n:_('UserId:')}" />
+                                    <label value="${i18n:_('UserId')}" />
                                     <hbox>
                                         <textbox id="ldapUserId" value="@{configurationController.ldapConfiguration.ldapUserId}"  width="300px"/>
                                         <label value="${i18n:__('Example: {0}', 'uid')}" />
@@ -334,21 +333,21 @@
                                     <checkbox id="ldapSaveRolesDB" checked="@{configurationController.ldapConfiguration.ldapSaveRolesDB}" onCheck="configurationController.showLdapRoles()"/>
                                 </row>
                                 <row>
-                                    <label value="${i18n:_('Group path:')}" />
+                                    <label value="${i18n:_('Group path')}" />
                                     <hbox>
                                         <textbox id="ldapGroupPath" value="@{configurationController.ldapConfiguration.ldapGroupPath}"  width="300px"/>
-                                        <label value="${i18n:__('Example: {0}', 'ou=groups (If it is empty, a node strategy is used.)')}" />
+                                        <label value="${i18n:__('Example: {0}', 'ou=groups')}" /><label value="${i18n:_('(If it is empty, a node strategy is used)')}" />
                                     </hbox>
                                 </row>
                                 <row>
-                                    <label value="${i18n:_('Role property:')}" />
+                                    <label value="${i18n:_('Role property')}" />
                                     <hbox>
                                         <textbox id="ldapRoleProperty" value="@{configurationController.ldapConfiguration.ldapRoleProperty}"  width="300px"/>
                                         <label value="${i18n:__('Example: {0}', 'member')}" />
                                     </hbox>
                                 </row>
                                 <row>
-                                    <label value="${i18n:_('Role search query:')}" />
+                                    <label value="${i18n:_('Role search query')}" />
                                     <hbox>
                                         <textbox id="ldapSearchQuery" value="@{configurationController.ldapConfiguration.ldapSearchQuery}"  width="300px"/>
                                         <label value="${i18n:__('Example: {0}', 'uid=[USER_ID],ou=people,dc=example,dc=org')}" />
diff --git a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css
index ef7ef6fe6..e82d33338 100644
--- a/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css
+++ b/libreplan-webapp/src/main/webapp/common/css/libreplan_zk.css
@@ -565,8 +565,8 @@ div.z-grid {
 
 .orderTree .z-textbox,.orderTree .z-decimalbox,
 .orderTree .z-intbox,.orderTree .z-longbox,
-.orderTree .z-doublebox {
-    height: 23px;
+.orderTree .z-doublebox, .orderTree .z-datebox {
+    height: 21px;
     width: 100%;
 }
 
@@ -583,19 +583,20 @@ div.z-grid {
     height:25px;
 }
 .orderTree .operations {
-    width:80px;
+    width: 50px;
 }
 .orderTree .name {
-    min-width:120px;
+    min-width: 120px;
 }
 .orderTree .hours {
-    width:40px;
+    width: 50px;
 }
 .orderTree .code {
-    min-width:100px;
+    min-width: 100px;
 }
+
 .orderTree .scheduling_state {
-    min-width:160px;
+    min-width:140px;
 }
 .orderTree .estimated_init,
 .orderTree .estimated_end {
@@ -614,6 +615,10 @@ div.z-grid {
     border-bottom: 1px dotted #7EAAC6;
 }
 
+.orderTree td td {
+    border-bottom: 0;
+}
+
 .orderTree .icono td {
     border:none;
 }
@@ -823,6 +828,12 @@ div.z-listbox-pgi-b {
     float:left;
 }
 
+.orderTree .not-scheduled span.z-button,
+.orderTree .partially-scheduled span.z-button,
+.orderTree .completely-scheduled span.z-button {
+    margin: 4px 1px 0 0;
+}
+
 .orderTree .not-scheduled span.scheduling-state,
 .orderTree .partially-scheduled span.scheduling-state,
 .orderTree .completely-scheduled span.scheduling-state {
@@ -859,7 +870,7 @@ span.completely-scheduled {
 span.z-dottree-tee-open,
 span.z-dottree-tee-close,
 span.z-dottree-line {
-    min-height: 28px;
+    min-height: 25px;
 }
 
 
@@ -1119,10 +1130,15 @@ span.perspective, span.perspective-active {
 tr.z-tree-row-seld, tr.z-list-item-seld,
 .z-combobox-pp .z-combo-item-seld,
 tr.z-treerow-seld {
-    background-color: #fdd772;
+    background-color: #fdd772; /* Dark orange */
     color: #000000;
 }
 
+tr.z-treerow-seld input {
+    background-color: #fdf3da; /* Soft orange */
+    background-image: none;
+}
+
 .timeplot-canvas {
     position:relative;
     overflow:hidden;
diff --git a/libreplan-webapp/src/main/webapp/common/error.zul b/libreplan-webapp/src/main/webapp/common/error.zul
index dcd149cf1..ff6171aa2 100644
--- a/libreplan-webapp/src/main/webapp/common/error.zul
+++ b/libreplan-webapp/src/main/webapp/common/error.zul
@@ -37,15 +37,15 @@
                         </columns>
                         <rows>
                             <row>
-                                <label value="${i18n:_('Exception type:')}" />
+                                <label value="${i18n:_('Exception type')}" />
                                 <label value="${requestScope['javax.servlet.error.exception_type']}" />
                             </row>
                             <row>
-                                <label value="${i18n:_('Status code:')}" />
+                                <label value="${i18n:_('Status code')}" />
                                 <label value="${requestScope['javax.servlet.error.status_code']}" />
                             </row>
                             <row>
-                                <label value="${i18n:_('Stacktrace:')}" />
+                                <label value="${i18n:_('Stacktrace')}" />
                                 <textbox id="stacktrace" rows="20" width="600px" readonly="true" />
                             </row>
                         </rows>
diff --git a/libreplan-webapp/src/main/webapp/common/event_error.zul b/libreplan-webapp/src/main/webapp/common/event_error.zul
index 0c576ee10..fc3e436b5 100644
--- a/libreplan-webapp/src/main/webapp/common/event_error.zul
+++ b/libreplan-webapp/src/main/webapp/common/event_error.zul
@@ -32,15 +32,15 @@
                 </columns>
                 <rows>
                     <row>
-                        <label value="${i18n:_('Exception type:')}" />
+                        <label value="${i18n:_('Exception type')}" />
                         <label value="${requestScope['javax.servlet.error.exception_type']}" />
                     </row>
                     <row>
-                        <label value="${i18n:_('Status code:')}" />
+                        <label value="${i18n:_('Status code')}" />
                         <label value="${requestScope['javax.servlet.error.status_code']}" />
                     </row>
                     <row>
-                        <label value="${i18n:_('Stacktrace:')}" />
+                        <label value="${i18n:_('Stacktrace')}" />
                         <textbox id="stacktrace" rows="20" width="600px" readonly="true" />
                     </row>
                 </rows>
diff --git a/libreplan-webapp/src/main/webapp/common/layout/template.zul b/libreplan-webapp/src/main/webapp/common/layout/template.zul
index 0913fefb0..e737e91c2 100644
--- a/libreplan-webapp/src/main/webapp/common/layout/template.zul
+++ b/libreplan-webapp/src/main/webapp/common/layout/template.zul
@@ -114,7 +114,10 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
     <!-- borderlayout class="main-layout" height="2000px" width="2000px"-->
     <west class="perspectives-column" width="90px">
         <vbox>
-            <hbox id="perspectiveButtonsInsertionPoint" sclass="toolbar-box global-commands" height="30px" width="100%" />
+            <hbox id="perspectiveButtonsInsertionPoint" sclass="toolbar-box global-commands" height="30px" width="100%">
+                <button id="createOrderButton" image="/common/img/ico_add.png" sclass="planner-icon"
+                     tooltiptext="${i18n:_('Create New Project')}" />
+            </hbox>
             <vbox id="registeredItemsInsertionPoint" width="90px"/>
         </vbox>
     </west>
diff --git a/libreplan-webapp/src/main/webapp/costcategories/costCategory.zul b/libreplan-webapp/src/main/webapp/costcategories/costCategory.zul
index 32273f022..915cfe14e 100644
--- a/libreplan-webapp/src/main/webapp/costcategories/costCategory.zul
+++ b/libreplan-webapp/src/main/webapp/costcategories/costCategory.zul
@@ -24,7 +24,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?component name="list" inline="true" macroURI="_listCostCategories.zul"?>
 <?component name="edition" inline="true" macroURI="_editCostCategory.zul"?>
diff --git a/libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul b/libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul
index a2c27c39f..2b3da6d20 100644
--- a/libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul
+++ b/libreplan-webapp/src/main/webapp/costcategories/typeOfWorkHours.zul
@@ -24,7 +24,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?component name="list" inline="true" macroURI="_listTypesOfWorkHours.zul"?>
 <?component name="edition" inline="true" macroURI="_editTypeOfWorkHours.zul"?>
diff --git a/libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul b/libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul
index 63be69491..217eb63f1 100644
--- a/libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul
+++ b/libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul
@@ -32,7 +32,7 @@
             <newdatasortablecolumn label="${i18n:_('Color')}"/>
             <newdatasortablecolumn label="${i18n:_('Over assignable')}" />
             <newdatasortablecolumn label="${i18n:_('Standard Effort')}" />
-            <newdatasortablecolumn label="${i18n:_('Extra Effort')}" />
+            <newdatasortablecolumn label="${i18n:_('Overtime Effort')}" />
             <newdatasortablecolumn label="${i18n:_('Operations')}" />
         </columns>
     </newdatasortablegrid>
@@ -40,4 +40,4 @@
     <button label="${i18n:_('Create')}" onClick="controller.goToCreateForm()"
         sclass="create-button global-action"/>
 
- </window>
\ No newline at end of file
+ </window>
diff --git a/libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul b/libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul
index c08bce856..928a6376b 100644
--- a/libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul
+++ b/libreplan-webapp/src/main/webapp/externalcompanies/externalcompanies.zul
@@ -24,7 +24,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?component name="list" inline="true" macroURI="_listExternalCompanies.zul"?>
 <?component name="edition" inline="true" macroURI="_editExternalCompany.zul"?>
diff --git a/libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul b/libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul
index ab2d71195..2e3a2c937 100644
--- a/libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -40,7 +40,7 @@
     closable="true"
     onClose="orderElementController.close(event)" >
 
-    <tabbox height="620px" id="tabboxOrderElement">
+    <tabbox height="560px" id="tabboxOrderElement">
         <tabs>
             <tab id="tabDetails" label="${i18n:_('Details')}" selected="true"
                 onSelect="orderElementController.clearAll();"/>
diff --git a/libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul b/libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
index a2bae081b..9f6207f97 100644
--- a/libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
@@ -20,6 +20,7 @@
 -->
 <vbox id="${arg.id}"
     apply="org.libreplan.web.orders.ManageOrderElementAdvancesController" width="100%">
+
     <groupbox sclass="progress-assignments" closable="false">
     <caption label="${i18n:_('Progress assignments')}" />
             <vbox id="messagesContainerAdvances" />
@@ -32,7 +33,7 @@
             </vbox>
             <vbox>
             <radiogroup>
-            <listbox id="editAdvances" height="170px"
+            <listbox id="editAdvances"
                      model="@{manageOrderElementAdvancesController.advanceAssignments}"
                      itemRenderer="@{manageOrderElementAdvancesController.advancesRenderer}" mold="paging"
                      onSelect="manageOrderElementAdvancesController.selectAdvanceLine(self.selectedItem);"
@@ -52,14 +53,15 @@
             </radiogroup>
     </vbox>
     </groupbox>
+
     <groupbox sclass="advance-measurement" width="100%" closable="false">
     <caption label="@{manageOrderElementAdvancesController.getInfoAdvance}" />
             <hbox>
-                <vbox>
-                    <listbox id="editAdvancesMeasurement" width="390px" height="200px"
+                <hbox>
+                    <listbox id="editAdvancesMeasurement" width="390px" style="min-height:200px;background-color: #FFFFFF"
                              model="@{manageOrderElementAdvancesController.advanceMeasurements}"
                              itemRenderer="@{manageOrderElementAdvancesController.advanceMeasurementRenderer}"
-                             mold="paging" pageSize="5" sclass="advance-measurement"
+                             mold="paging" pageSize="10" sclass="advance-measurement"
                              onPaging="manageOrderElementAdvancesController.onPagingMeasurement();">
                             <listhead>
                                 <listheader label="${i18n:_('Value')}" width="100px" align="center"/>
@@ -68,8 +70,8 @@
                                 <listheader label="${i18n:_('Operations')}" width="90px" align="center"/>
                             </listhead>
                     </listbox>
-                </vbox>
-                <vbox width="20px" />
+                </hbox>
+                <hbox width="20px"/>
                 <zscript>
                     import java.awt.Font;
                     String fontname = "Verdana";
diff --git a/libreplan-webapp/src/main/webapp/orders/_ordersTab.zul b/libreplan-webapp/src/main/webapp/orders/_ordersTab.zul
index 9e96ae9a1..1fbcf057a 100644
--- a/libreplan-webapp/src/main/webapp/orders/_ordersTab.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_ordersTab.zul
@@ -28,14 +28,6 @@
     <borderlayout sclass="orderslayout" width="auto" apply="${orderController}">
        <north height="30px" border="0" sclass="toolbar-box">
        <hbox align="center" id="toolbar">
-            <templateFinderPopup id="templateFinderPopup" acceptButtonLabel="${i18n:_('Create Project')}"
-                caption="${i18n:_('Choosing Template')}" />
-
-            <button id="createOrderButton" image="/common/img/ico_add.png" sclass="planner-icon"
-             tooltiptext="${i18n:_('Create New Project')}" visible="false" />
-
-            <button id="createOrderFromTemplateButton" image="/common/img/ico_copy.png" sclass="planner-icon"
-            tooltiptext="${i18n:_('Create From Template')}" visible="false" />
 
             <button id="saveOrderAndContinueButton"  image="/common/img/ico_save.png" sclass="planner-icon"
                 tooltiptext="${i18n:_('Save Project')}" />
diff --git a/libreplan-webapp/src/main/webapp/orders/_projectDetails.zul b/libreplan-webapp/src/main/webapp/orders/_projectDetails.zul
index 8cf69c6d2..bd53ebffb 100644
--- a/libreplan-webapp/src/main/webapp/orders/_projectDetails.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_projectDetails.zul
@@ -20,7 +20,7 @@
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
 <window id="projectCreationWindow"
-        title="${i18n:_('Create project')}"
+        title="${i18n:_('Create new project')}"
         width="650px"
         closable="true"
         onClose="self.visible = false; event.stopPropagation();">
@@ -34,7 +34,8 @@
             <row>
                 <label value="${i18n:_('Name')}" />
                 <textbox id="txtName" value="@{projectController.order.name}" width="500px"
-                    constraint="no empty:${i18n:_('cannot be null or empty')}"/>
+                    constraint="no empty:${i18n:_('cannot be null or empty')}"
+                    onOK="projectController.accept();"/>
             </row>
             <row>
                 <label value="${i18n:_('Code')}" />
@@ -46,6 +47,11 @@
                         checked="@{projectController.codeAutogenerated}"/>
                 </hbox>
             </row>
+            <row>
+                <label value="${i18n:_('Template')}" />
+                <bandboxSearch id="bdProjectTemplate" finder="templatesEligibleForOrder"
+                    widthBandbox="400px" widthListbox="500px" />
+            </row>
             <row>
                 <label value="${i18n:_('Starting date')}" />
                 <datebox id="initDate"
@@ -71,6 +77,7 @@
                     itemRenderer="@{projectController.baseCalendarsComboitemRenderer}"
                     onSelect="projectController.setBaseCalendar(self.selectedItem.value);" />
             </row>
+
         </rows>
     </grid>
 
diff --git a/libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul b/libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul
index eb7415888..3c7bbf2e6 100644
--- a/libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul
+++ b/libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul
@@ -30,10 +30,10 @@
 
         <hbox pack="center">
             <templateFinderPopup id="templateFinderPopupAtTree" acceptButtonLabel="${i18n:_('Create Task')}" caption="${i18n:_('Choosing Template')}" />
-            <label value="${i18n:_('New task:')}" />
+            <label value="${i18n:_('New task')}" />
             <textbox value="" id="newOrderElementName" width="150px"
                 onOK="treeController.addElement(self.parent);" disabled="true" />
-            <label value="${i18n:_('Hours:')}" />
+            <label value="${i18n:_('Hours')}" />
             <intbox value="0" id="newOrderElementHours" width="40px"
                 onOK="treeController.addElement(self.parent);"
                 constraint="no negative" disabled="true" />
@@ -45,7 +45,7 @@
         </hbox>
 
         <hbox width="100%" style="float:right" hflex="1" align="right" pack="right">
-            <label value="${i18n:_('Selected node:')}" />
+            <label value="${i18n:_('Selected node')}:" />
             <button id="editOrderElementButton" sclass="icono" image="/common/img/ico_editar1.png"
                 tooltiptext="${i18n:_('Edit selected task')}"
                 onClick="treeController.editSelectedElement();" />
@@ -87,7 +87,7 @@
             zclass="z-dottree">
             <treecols sizable="true">
                 <treecol label="${each.label}" class="${each.cssClass}" tooltiptext="${each.tooltip}"
-                    forEach="${treeComponent.columns}"/>
+                    forEach="${treeComponent.columns}" hflex="${each.hflex}" />
             </treecols>
         </tree>
     </vbox>
diff --git a/libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul b/libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul
index 84c5b0140..8dcaeba1e 100644
--- a/libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul
+++ b/libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul
@@ -28,17 +28,17 @@
 
         <hbox>
             <!-- Planned Task Start -->
-            <label style="font-weight: bold" value="${i18n:_('Planned start :')}" />
+            <label style="font-weight: bold" value="${i18n:_('Planned start')}:" />
             <label id="lbTaskStart" />
 
             <!-- Planned Task End -->
-            <label style="font-weight: bold" value="${i18n:_('Planned end :')}" />
+            <label style="font-weight: bold" value="${i18n:_('Planned end')}:" />
             <label id="lbTaskEnd" />
         </hbox>
 
         <hbox>
             <!-- Planned Workable Days -->
-            <label style="font-weight: bold" value="${i18n:_('Planned workable days :')}" />
+            <label style="font-weight: bold" value="${i18n:_('Planned workable days')}:" />
             <intbox id="taskWorkableDays" width="90px" />
         </hbox>
 
diff --git a/libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul b/libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
index 4fdcb6593..38c0bee00 100644
--- a/libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
+++ b/libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
@@ -23,7 +23,7 @@
     <div align="right">
         <hbox align="end">
           <!-- Filter by name -->
-          <label value="${i18n:_('Filter quality forms by :')}"/>
+          <label value="${i18n:_('Filter quality forms by')}:"/>
           <label value="${i18n:_('name')}"/>
           <textbox value="" id="txtFilter"/>
           <button label="${i18n:_('Filter')}" onClick="controller.onApplyFilter(event)"/>
diff --git a/libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul b/libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
index d16ea76ca..0de112ddc 100644
--- a/libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
+++ b/libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
@@ -48,7 +48,7 @@
                      </columns>
                      <rows>
                          <row>
-                             <label value="${i18n:_('Reference date:')}" />
+                             <label value="${i18n:_('Reference date')}" />
                              <datebox id="referenceDate" />
                          </row>
                      </rows>
@@ -164,7 +164,7 @@
                     </columns>
                     <rows>
                         <row>
-                            <label value="${i18n:_('Output format:')}" />
+                            <label value="${i18n:_('Output format')}" />
                             <combobox_output_format id="outputFormat" />
                         </row>
                     </rows>
diff --git a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul
index a0508b010..8df77f296 100644
--- a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul
+++ b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul
@@ -71,7 +71,7 @@
                     </columns>
                     <rows>
                         <row>
-                            <label value="${i18n:_('Output format:')}" />
+                            <label value="${i18n:_('Output format')}" />
                             <combobox_output_format id="outputFormat" />
                         </row>
                     </rows>
diff --git a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
index 24a7c5576..c71877661 100644
--- a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
+++ b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
@@ -48,11 +48,11 @@
                      </columns>
                      <rows>
                          <row>
-                             <label value="${i18n:_('Start date:')}" />
+                             <label value="${i18n:_('Start date')}" />
                              <datebox id="startingDate" />
                          </row>
                          <row>
-                             <label value="${i18n:_('End date:')}" />
+                             <label value="${i18n:_('End date')}" />
                              <datebox id="endingDate" />
                          </row>
                      </rows>
@@ -108,9 +108,9 @@
                     </hbox>
                     <hbox>
                         <radiogroup>
-                            <label value="${i18n:_('Apply filter to: ') }"/>
+                            <label value="${i18n:_('Apply filter to')}:"/>
                             <radio id="filterByWorkReports" label="${i18n:_('Work reports')}" />
-                            <radio id="filterByOrderElements" label="${i18n:_('Order elements')}" />
+                            <radio id="filterByOrderElements" label="${i18n:_('Tasks')}" />
                             <radio id="filterByBoth" label="${i18n:_('Both')}" checked="true" />
                         </radiogroup>
                     </hbox>
@@ -194,7 +194,7 @@
                     </columns>
                     <rows>
                         <row>
-                            <label value="${i18n:_('Output format:')}" />
+                            <label value="${i18n:_('Output format')}" />
                             <combobox_output_format id="outputFormat" />
                         </row>
                     </rows>
diff --git a/libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul b/libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul
index 8b4b6d3d9..b9850e996 100644
--- a/libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul
+++ b/libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul
@@ -55,11 +55,11 @@
                      </columns>
                      <rows>
                          <row>
-                             <label value="${i18n:_('Work done from starting date:')}" />
+                             <label value="${i18n:_('Work done from starting date')}" />
                              <datebox id="startingDate" width="200px" constraint = "@{controller.checkConstraintStartingDate}"/>
                          </row>
                          <row>
-                             <label value="${i18n:_('Work done until ending date:')}" />
+                             <label value="${i18n:_('Work done until ending date')}" />
                              <datebox id="endingDate" width="200px" constraint = "@{controller.checkConstraintEndingDate}"/>
                          </row>
                      </rows>
@@ -201,7 +201,7 @@
                     </columns>
                     <rows>
                         <row>
-                            <label value="${i18n:_('Output format:')}" />
+                            <label value="${i18n:_('Output format')}" />
                             <combobox_output_format id="outputFormat" />
                         </row>
                     </rows>
diff --git a/libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul b/libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
index abcefc4ab..b5c8b1d9c 100644
--- a/libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
+++ b/libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
@@ -70,7 +70,7 @@
                     </columns>
                     <rows>
                         <row>
-                            <label value="${i18n:_('Show dependencies:')}" />
+                            <label value="${i18n:_('Show dependencies')}" />
                             <checkbox id="cbShowDependencies" />
                         </row>
                     </rows>
@@ -171,7 +171,7 @@
                     </columns>
                     <rows>
                         <row>
-                            <label value="${i18n:_('Output format:')}" />
+                            <label value="${i18n:_('Output format')}" />
                             <combobox_output_format id="outputFormat" />
                         </row>
                     </rows>
diff --git a/libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul b/libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
index 1d7440868..2c43e0983 100644
--- a/libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
+++ b/libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
@@ -48,7 +48,7 @@
                      </columns>
                      <rows>
                          <row>
-                             <label value="${i18n:_('Reference date:')}" />
+                             <label value="${i18n:_('Reference date')}" />
                              <datebox id="referenceDate" onCreate="self.value = new Date()"/>
                          </row>
                      </rows>
@@ -163,7 +163,7 @@
                     </columns>
                     <rows>
                         <row>
-                            <label value="${i18n:_('Output format:')}" />
+                            <label value="${i18n:_('Output format')}" />
                             <combobox_output_format id="outputFormat" />
                         </row>
                     </rows>
diff --git a/libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul b/libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul
index 546e30605..7e59c6922 100644
--- a/libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul
+++ b/libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul
@@ -26,7 +26,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 
diff --git a/libreplan-webapp/src/main/webapp/scenarios/scenarios.zul b/libreplan-webapp/src/main/webapp/scenarios/scenarios.zul
index aa7654aec..62aabb426 100644
--- a/libreplan-webapp/src/main/webapp/scenarios/scenarios.zul
+++ b/libreplan-webapp/src/main/webapp/scenarios/scenarios.zul
@@ -24,7 +24,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?component name="list" inline="true" macroURI="_list.zul"?>
 <?component name="edition" inline="true" macroURI="_edition.zul"?>
diff --git a/libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul b/libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul
index dcc402651..0bb48816d 100644
--- a/libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul
+++ b/libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul
@@ -24,7 +24,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <zk>
 
diff --git a/libreplan-webapp/src/main/webapp/settings/changePassword.zul b/libreplan-webapp/src/main/webapp/settings/changePassword.zul
index 35a67bf2c..c004c73ac 100644
--- a/libreplan-webapp/src/main/webapp/settings/changePassword.zul
+++ b/libreplan-webapp/src/main/webapp/settings/changePassword.zul
@@ -25,7 +25,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <zk xmlns:n="http://www.zkoss.org/2005/zk/native">
 
@@ -52,19 +51,19 @@
                             </columns>
                             <rows>
                                 <row>
-                                    <label value="${i18n:_('Current password')}:" />
+                                    <label value="${i18n:_('Current password')}" />
                                     <textbox id="currentPassword" type="password"
                                         constraint="@{passwordController.validateCurrentPassword}"
                                         width="300px"/>
                                 </row>
                                 <row>
-                                    <label value="${i18n:_('New password')}:" />
+                                    <label value="${i18n:_('New password')}" />
                                     <textbox id="password" type="password"
                                         onChange="passwordController.setPassword(self.value);"
                                         width="300px"/>
                                 </row>
                                 <row>
-                                    <label value="${i18n:_('Password confirmation')}:" />
+                                    <label value="${i18n:_('Password confirmation')}" />
                                     <textbox id="passwordConfirmation" type="password"
                                         constraint="@{passwordController.validatePasswordConfirmation}"
                                         width="300px"/>
diff --git a/libreplan-webapp/src/main/webapp/settings/settings.zul b/libreplan-webapp/src/main/webapp/settings/settings.zul
index 658a54ab9..00e92e00d 100644
--- a/libreplan-webapp/src/main/webapp/settings/settings.zul
+++ b/libreplan-webapp/src/main/webapp/settings/settings.zul
@@ -25,7 +25,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <zk>
     <window id="settingsWindow" self="@{define(content)}"
diff --git a/libreplan-webapp/src/main/webapp/users/_listUsers.zul b/libreplan-webapp/src/main/webapp/users/_listUsers.zul
index 70a747e11..78005611a 100644
--- a/libreplan-webapp/src/main/webapp/users/_listUsers.zul
+++ b/libreplan-webapp/src/main/webapp/users/_listUsers.zul
@@ -25,8 +25,8 @@
         <columns sizable="true">
             <newdatasortablecolumn label="${i18n:_('User login name')}" sort="auto(loginName)" />
             <newdatasortablecolumn label="${i18n:_('Disabled')}" />
-            <newdatasortablecolumn label="${i18n:_('Is administrator')}" />
-            <newdatasortablecolumn label="${i18n:_('Is a libreplan user')}" />
+            <newdatasortablecolumn label="${i18n:_('Administrator')}" />
+            <newdatasortablecolumn label="${i18n:_('LibrePlan user')}" />
             <newdatasortablecolumn label="${i18n:_('Actions')}" />
         </columns>
         <rows>
diff --git a/libreplan-webapp/src/main/webapp/users/profiles.zul b/libreplan-webapp/src/main/webapp/users/profiles.zul
index dacd339a5..1eba5b6c9 100644
--- a/libreplan-webapp/src/main/webapp/users/profiles.zul
+++ b/libreplan-webapp/src/main/webapp/users/profiles.zul
@@ -24,7 +24,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?component name="list" inline="true" macroURI="_listProfiles.zul"?>
 <?component name="edition" inline="true" macroURI="_editProfile.zul"?>
diff --git a/libreplan-webapp/src/main/webapp/users/users.zul b/libreplan-webapp/src/main/webapp/users/users.zul
index fb5399e99..2f1db33bd 100644
--- a/libreplan-webapp/src/main/webapp/users/users.zul
+++ b/libreplan-webapp/src/main/webapp/users/users.zul
@@ -24,7 +24,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?component name="list" inline="true" macroURI="_listUsers.zul"?>
 <?component name="edition" inline="true" macroURI="_editUser.zul"?>
diff --git a/libreplan-webapp/src/main/webapp/workreports/workReport.zul b/libreplan-webapp/src/main/webapp/workreports/workReport.zul
index f0d0def59..4c4db51b1 100644
--- a/libreplan-webapp/src/main/webapp/workreports/workReport.zul
+++ b/libreplan-webapp/src/main/webapp/workreports/workReport.zul
@@ -38,7 +38,7 @@
                 <vbox align="right">
                 <hbox id="hboxFilter" align="center">
                   <!-- Filter by type, start date and finish date -->
-                  <label value="${i18n:_('Filter work report by :')}"/>
+                  <label value="${i18n:_('Filter work report by')}:"/>
                   <label value="${i18n:_('Type')}"/>
                   <listbox id="listType" mold="select" rows="1"
                     model="@{controller.filterWorkReportTypes}" width="150px">
@@ -92,7 +92,7 @@
             <div align="left">
                 <hbox align="center">
                   <!-- Create new Work Report  -->
-                  <label value="${i18n:_('Select type :')}"/>
+                  <label value="${i18n:_('Select type')}:"/>
                   <listbox id="listTypeToAssign" mold="select" rows="1"
                     model="@{controller.workReportTypes}" width="150px"
                     selectedItem="@{controller.firstType}">
diff --git a/libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul b/libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul
index cd7b5774b..5e5b73f0f 100644
--- a/libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul
+++ b/libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul
@@ -24,7 +24,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <zk>
     <window self="@{define(content)}"
@@ -32,24 +31,24 @@
         <vbox id="messagesContainer"></vbox>
 
     <window id="listQueryWindow" title="${i18n:_('Work Report Lines List')}">
-       <panel title="${i18n:_('Filter work report by :')}" border="normal"
+       <panel title="${i18n:_('Filter work report by')}" border="normal"
                     style="overflow:auto">
         <panelchildren>
         <separator bar="false" spacing="5px" orient="horizontal"/>
         <div align="center">
         <hbox id="hboxFilter" align="end">
           <!-- Filter work report lines -->
-          <label value="${i18n:_('Resource :')}"/>
+          <label value="${i18n:_('Resource')}"/>
           <autocomplete id="filterResource" buttonVisible="true"
                finder="ResourceFinder"/>
-          <label value="${i18n:_('task :')}"/>
+          <label value="${i18n:_('task')}"/>
           <bandboxSearch id="bandboxFilterOrderElement" widthBandbox="285px" widthListbox="700px"
               finder="OrderElementBandboxFinder" model="@{controller.orderElements}"/>
           <label value="${i18n:_('from')}"/>
           <datebox id="filterStartDateLine" constraint = "@{controller.checkConstraintStartDateLine}"/>
           <label value="${i18n:_('to')}"/>
           <datebox id="filterFinishDateLine" constraint = "@{controller.checkConstraintFinishDateLine}"/>
-          <label value="${i18n:_('hours type :')}"/>
+          <label value="${i18n:_('hours type')}"/>
           <autocomplete id="filterHoursType" buttonVisible="true"
                finder="TypeOfWorkHoursFinder" width="100px"/>
           <button label="${i18n:_('Filter')}" style="margin-top: -4px"
diff --git a/libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul b/libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul
index 89e241fd9..69271b0aa 100644
--- a/libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul
+++ b/libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul
@@ -24,7 +24,6 @@
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/libreplan_zk.css"?>
-<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?component name="list" inline="true" macroURI="_listWorkReportTypes.zul"?>
 <?component name="edition" inline="true" macroURI="_editWorkReportType.zul"?>
diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java
index 5dce97ee9..b156dc236 100644
--- a/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java
+++ b/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderElementTreeModelTest.java
@@ -150,7 +150,7 @@ public class OrderElementTreeModelTest {
     }
 
     private void addCriterionRequirement(OrderElement orderElement) {
-        criterion = criterionDAO.findByNameAndType("medicalLeave", "LEAVE")
+        criterion = criterionDAO.findByNameAndType("Europe", "LOCATION")
                 .get(0);
         DirectCriterionRequirement directCriterionRequirement = DirectCriterionRequirement
                 .create(criterion);
@@ -158,8 +158,8 @@ public class OrderElementTreeModelTest {
     }
 
     private void addAnotherCriterionRequirement(OrderElement orderElement) {
-        criterion2 = criterionDAO.findByNameAndType(
-                "hiredResourceWorkingRelationship", "WORK_RELATIONSHIP").get(0);
+        criterion2 = criterionDAO.findByNameAndType("Manager", "CATEGORY").get(
+                0);
         DirectCriterionRequirement directCriterionRequirement = DirectCriterionRequirement
                 .create(criterion2);
         orderElement.addCriterionRequirement(directCriterionRequirement);
@@ -167,7 +167,7 @@ public class OrderElementTreeModelTest {
 
     private void addAnotherDifferentCriterionRequirement(
             OrderElement orderElement) {
-        criterion3 = criterionDAO.findByNameAndType("paternityLeave", "LEAVE")
+        criterion3 = criterionDAO.findByNameAndType("Asia", "LOCATION")
                 .get(0);
         DirectCriterionRequirement directCriterionRequirement = DirectCriterionRequirement
                 .create(criterion3);
diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/resources/CriterionModelTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/resources/CriterionModelTest.java
index afda8512a..6d49b9bfb 100644
--- a/libreplan-webapp/src/test/java/org/libreplan/web/resources/CriterionModelTest.java
+++ b/libreplan-webapp/src/test/java/org/libreplan/web/resources/CriterionModelTest.java
@@ -112,12 +112,11 @@ public class CriterionModelTest {
     @Test
     public void savingCriterionIncreasesTheNumberOfCriterions()
             {
-        givenValidCriterionFor(PredefinedCriterionTypes.WORK_RELATIONSHIP);
-        int initial = getCriterionsNumber(PredefinedCriterionTypes.WORK_RELATIONSHIP);
+        givenValidCriterionFor(PredefinedCriterionTypes.CATEGORY);
+        int initial = getCriterionsNumber(PredefinedCriterionTypes.CATEGORY);
         criterionDAO.save(criterion);
         criterionDAO.flush();
-        assertThat(
-                getCriterionsNumber(PredefinedCriterionTypes.WORK_RELATIONSHIP),
+        assertThat(getCriterionsNumber(PredefinedCriterionTypes.CATEGORY),
                 equalTo(initial + 1));
     }
 
@@ -175,13 +174,12 @@ public class CriterionModelTest {
 
     @Test
     public void modifyingDontAlterTheNumberOfCriterions() {
-        givenCreatedCriterionFor(PredefinedCriterionTypes.WORK_RELATIONSHIP);
-        int initial = getCriterionsNumber(PredefinedCriterionTypes.WORK_RELATIONSHIP);
+        givenCreatedCriterionFor(PredefinedCriterionTypes.CATEGORY);
+        int initial = getCriterionsNumber(PredefinedCriterionTypes.CATEGORY);
         String newName = UUID.randomUUID().toString() + "random";
         criterion.setName(newName);
         criterionDAO.save(criterion);
-        assertThat(
-                getCriterionsNumber(PredefinedCriterionTypes.WORK_RELATIONSHIP),
+        assertThat(getCriterionsNumber(PredefinedCriterionTypes.CATEGORY),
                 equalTo(initial));
     }
 
@@ -221,7 +219,7 @@ public class CriterionModelTest {
             @Override
             public Void execute() {
                 Criterion criterion = givenValidCriterionFor(
-                        PredefinedCriterionTypes.WORK_RELATIONSHIP, unique);
+                        PredefinedCriterionTypes.CATEGORY, unique);
                 try {
                     criterionDAO.save(criterion);
                 } catch (ValidationException e) {
@@ -236,7 +234,7 @@ public class CriterionModelTest {
             public Void execute() {
                 try {
                     Criterion criterion2 = givenValidCriterionFor(
-                            PredefinedCriterionTypes.WORK_RELATIONSHIP, unique);
+                            PredefinedCriterionTypes.CATEGORY, unique);
                     criterionDAO.save(criterion2);
                     fail("must send "
                             + ValidationException.class.getSimpleName());
diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/resources/WorkerModelTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/resources/WorkerModelTest.java
index dccaf7f56..dfdf5601a 100644
--- a/libreplan-webapp/src/test/java/org/libreplan/web/resources/WorkerModelTest.java
+++ b/libreplan-webapp/src/test/java/org/libreplan/web/resources/WorkerModelTest.java
@@ -82,7 +82,7 @@ public class WorkerModelTest {
         List<Criterion> criterions = new ArrayList<Criterion>();
         expect(
                 criterionServiceMock
-                        .findByType(PredefinedCriterionTypes.LOCATION_GROUP))
+                        .findByType(PredefinedCriterionTypes.LOCATION))
                 .andReturn(criterions).anyTimes();
         expect(resourceDAOMock.find(workerToReturn.getId()))
                 .andReturn(workerToReturn);
@@ -109,7 +109,7 @@ public class WorkerModelTest {
         List<Criterion> criterions = new ArrayList<Criterion>();
         expect(
                 criterionServiceMock
-                        .findByType(PredefinedCriterionTypes.LOCATION_GROUP))
+                        .findByType(PredefinedCriterionTypes.LOCATION))
                 .andReturn(criterions).anyTimes();
         expect(resourceDAOMock.find(workerToReturn.getId())).andReturn(
                 workerToReturn);
diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java
index b3d27364f..b5e3c2c60 100644
--- a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java
+++ b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java
@@ -64,7 +64,6 @@ import org.libreplan.business.materials.entities.MaterialAssignment;
 import org.libreplan.business.orders.daos.IOrderDAO;
 import org.libreplan.business.orders.daos.IOrderElementDAO;
 import org.libreplan.business.orders.entities.HoursGroup;
-import org.libreplan.business.orders.entities.Order;
 import org.libreplan.business.orders.entities.OrderElement;
 import org.libreplan.business.orders.entities.OrderLine;
 import org.libreplan.business.requirements.entities.CriterionRequirement;
@@ -1311,8 +1310,8 @@ public class OrderElementServiceTest {
         orderDTO.code = code;
         orderDTO.initDate = DateConverter.toXMLGregorianCalendar(new Date());
 
-        String name = PredefinedCriterionTypes.LEAVE.getPredefined().get(0);
-        String type = PredefinedCriterionTypes.LEAVE.getName();
+        String name = PredefinedCriterionTypes.LOCATION.getPredefined().get(0);
+        String type = PredefinedCriterionTypes.LOCATION.getName();
 
         CriterionRequirementDTO criterionRequirementDTO = new DirectCriterionRequirementDTO(
                 name, type);
@@ -1364,8 +1363,8 @@ public class OrderElementServiceTest {
         orderDTO.code = code;
         orderDTO.initDate = DateConverter.toXMLGregorianCalendar(new Date());
 
-        String name = PredefinedCriterionTypes.LEAVE.getPredefined().get(0);
-        String type = PredefinedCriterionTypes.LEAVE.getName();
+        String name = PredefinedCriterionTypes.LOCATION.getPredefined().get(0);
+        String type = PredefinedCriterionTypes.LOCATION.getName();
 
         CriterionRequirementDTO criterionRequirementDTO = new DirectCriterionRequirementDTO(
                 name, type);
@@ -1451,8 +1450,8 @@ public class OrderElementServiceTest {
         orderDTO.code = code;
         orderDTO.initDate = DateConverter.toXMLGregorianCalendar(new Date());
 
-        String name = PredefinedCriterionTypes.LEAVE.getPredefined().get(0);
-        String type = PredefinedCriterionTypes.LEAVE.getName();
+        String name = PredefinedCriterionTypes.LOCATION.getPredefined().get(0);
+        String type = PredefinedCriterionTypes.LOCATION.getName();
 
         CriterionRequirementDTO criterionRequirementDTO = new DirectCriterionRequirementDTO(
                 name, type);
@@ -1480,7 +1479,7 @@ public class OrderElementServiceTest {
         assertNotNull(orderElement);
         assertThat(orderElement.getCriterionRequirements().size(), equalTo(1));
 
-        String name2 = PredefinedCriterionTypes.LEAVE.getPredefined().get(1);
+        String name2 = PredefinedCriterionTypes.LOCATION.getPredefined().get(1);
 
         transactionService.runOnTransaction(new IOnTransaction<Void>() {
             @Override
@@ -1554,8 +1553,8 @@ public class OrderElementServiceTest {
         orderDTO.code = code;
         orderDTO.initDate = DateConverter.toXMLGregorianCalendar(new Date());
 
-        String name = PredefinedCriterionTypes.LEAVE.getPredefined().get(0);
-        String type = PredefinedCriterionTypes.LEAVE.getName();
+        String name = PredefinedCriterionTypes.LOCATION.getPredefined().get(0);
+        String type = PredefinedCriterionTypes.LOCATION.getName();
 
         CriterionRequirementDTO criterionRequirementDTO = new DirectCriterionRequirementDTO(
                 name, type);
@@ -1705,8 +1704,8 @@ public class OrderElementServiceTest {
         orderDTO.code = code;
         orderDTO.initDate = DateConverter.toXMLGregorianCalendar(new Date());
 
-        String name = PredefinedCriterionTypes.LEAVE.getPredefined().get(0);
-        String type = PredefinedCriterionTypes.LEAVE.getName();
+        String name = PredefinedCriterionTypes.LOCATION.getPredefined().get(0);
+        String type = PredefinedCriterionTypes.LOCATION.getName();
 
         CriterionRequirementDTO criterionRequirementDTO = new DirectCriterionRequirementDTO(
                 name, type);
diff --git a/scripts/functional-tests/account/password_test.sah b/scripts/functional-tests/account/password_test.sah
index d29212029..828d5a477 100644
--- a/scripts/functional-tests/account/password_test.sah
+++ b/scripts/functional-tests/account/password_test.sah
@@ -46,9 +46,9 @@ function passwordChange($oldPassword, $newPassword){
 }
 
 function passwordForm($oldPassword, $newPassword){
-    _setValue(_password(0, _near(_span("Current password:"))), $oldPassword);
-    _setValue(_password(0, _near(_span("New password:"))), $newPassword);
-    _setValue(_password(0, _near(_span("Password confirmation:"))), $newPassword);
+    _setValue(_password(0, _near(_span("Current password"))), $oldPassword);
+    _setValue(_password(0, _near(_span("New password"))), $newPassword);
+    _setValue(_password(0, _near(_span("Password confirmation"))), $newPassword);
     _click(_cell("Save"));
 }
 
@@ -75,17 +75,17 @@ function commonUserCreate($name, $password) {
 }
 
 function commonUserForm($name, $password) {
-    _setValue(_textbox(0, _near(_span("Login name:"))), $name);
-    _setValue(_password(0, _near(_span("Password:"))), $password);
-    _setValue(_password(0, _near(_span("Password confirmation:"))), $password);
+    _setValue(_textbox(0, _near(_span("Login name"))), $name);
+    _setValue(_password(0, _near(_span("Password"))), $password);
+    _setValue(_password(0, _near(_span("Password confirmation"))), $password);
     _click(_cell("Save"));
 }
 
 function commonUserEdit($name, $password){
     _click(_link("Accounts"));
     commonEdit($name, 4);
-    _setValue(_password(0, _near(_span("Password:"))), $password);
-    _setValue(_password(0, _near(_span("Password confirmation:"))), $password);
+    _setValue(_password(0, _near(_span("Password"))), $password);
+    _setValue(_password(0, _near(_span("Password confirmation"))), $password);
     _click(_cell("Save"));
     commonSaveValidation("User", $name);
 }
diff --git a/scripts/functional-tests/administration-management/configuration_test.sah b/scripts/functional-tests/administration-management/configuration_test.sah
index f32a57e0c..4374e028f 100644
--- a/scripts/functional-tests/administration-management/configuration_test.sah
+++ b/scripts/functional-tests/administration-management/configuration_test.sah
@@ -142,7 +142,7 @@ function configCheckWorkReportCreate(){
     var $code;
     _click(_cell("New work report"));
     _click(_cell("Add new row"));
-    _setValue(_textbox(6, _near(_span("Work report lines"))), $code);
+    _set($code, _textbox(0, _near(_span("Code"))).value);
     if ($code == ""){
     _log("Work report code is empty", "custom1");
     }
diff --git a/scripts/functional-tests/common_functions.sah b/scripts/functional-tests/common_functions.sah
index f9455d3a4..26339ef1c 100644
--- a/scripts/functional-tests/common_functions.sah
+++ b/scripts/functional-tests/common_functions.sah
@@ -80,8 +80,8 @@ function commonDeleteProject($name){
 function commonCreateTask($projectName, $name, $hours){
     _click(_link("Projects List"));
     _click(_image("ico_editar1.png", _in(_cell(8,_near(_cell($projectName))))));
-    _setValue(_textbox(0, _near(_span("New task:"))), $name);
-    _setValue(_textbox("z-intbox", _near(_span("Hours:"))), $hours);
+    _setValue(_textbox(0, _near(_span("New task"))), $name);
+    _setValue(_textbox("z-intbox", _near(_span("Hours"))), $hours);
     _click(_cell("Add"));
     _click(_image("ico_save.png"));
     _click(_cell("OK"));
diff --git a/scripts/functional-tests/resources/machines_test.sah b/scripts/functional-tests/resources/machines_test.sah
index 24b9fe544..4a675c77d 100644
--- a/scripts/functional-tests/resources/machines_test.sah
+++ b/scripts/functional-tests/resources/machines_test.sah
@@ -133,7 +133,9 @@ function machineAssignProjectForm($machine){
     _click(_cell($machine));
     _click(_cell("Add"));
     _setValue(_textbox(0, _near(_span("Sum of all rows"))), "1");
-    _click(_cell("z-button-cm[39]"));
+    _click(_cell("z-button-cm[40]"));
+    _assertExists(_div("box standard-task assigned"));
+    _log("Task assigned", "custom1");
     _click(_image("ico_save.png"));
     _click(_cell("OK"));
 }
diff --git a/scripts/functional-tests/resources/subcontracting_test.sah b/scripts/functional-tests/resources/subcontracting_test.sah
index 6b37eb5fd..6efa33e09 100644
--- a/scripts/functional-tests/resources/subcontracting_test.sah
+++ b/scripts/functional-tests/resources/subcontracting_test.sah
@@ -52,7 +52,7 @@ function subcontractingTaskForSubcontractForm($company, $subProjectName){
     _setValue(_textbox(0, _near(_span("Subcontract price"))), "6000");
     _setValue(_textbox(0, _near(_span("Subcontracted code"))), $companyId);
     _click(_checkbox(0, _near(_span("Hours groups"))));
-    _click(_cell("z-button-cm[38]"));
+    _click(_cell("z-button-cm[39]"));
     _click(_image("ico_save.png"));
     _click(_cell("OK"));
 }
diff --git a/scripts/functional-tests/resources/virtual_worker_test.sah b/scripts/functional-tests/resources/virtual_worker_test.sah
index a1be619ee..7c0aa67e8 100644
--- a/scripts/functional-tests/resources/virtual_worker_test.sah
+++ b/scripts/functional-tests/resources/virtual_worker_test.sah
@@ -137,7 +137,9 @@ function virtualWorkerAssignProjectForm($workerName){
     _click(_div($workerName));
     _click(_cell($workerName));
     _click(_cell("Add"));
-    _click(_cell("z-button-cm[39]"));
+    _click(_cell("z-button-cm[40]"));
+    _assertExists(_div("box standard-task assigned"));
+    _log("Task assigned", "custom1");
     _click(_image("ico_save.png"));
     _click(_cell("OK"));
 }
diff --git a/scripts/functional-tests/resources/work_report_test.sah b/scripts/functional-tests/resources/work_report_test.sah
index d64bf76ff..d3ad67cea 100644
--- a/scripts/functional-tests/resources/work_report_test.sah
+++ b/scripts/functional-tests/resources/work_report_test.sah
@@ -38,15 +38,10 @@
 
 _include("../common_functions.sah");
 
-function workReportCreateWithoutElements(){
-    _click(_link("Work Reports"));
-    _click(_cell("New work report"));
-    workReportNoElementsValidation();
-}
-
 function workReportCreateLineModel($modelName){
     workReportModelLineCreate($modelName);
     _click(_link("Work Reports"));
+    _setSelected(_select(0, _near(_span("Select type :"))), $modelName);
     _click(_cell("New work report"));
     _click(_cell("Save"));
     workReportAcctionValidation("saved");
@@ -61,11 +56,11 @@ function workReportModelLineCreate($name){
 }
 
 function workReportModelLineForm($name){
-    _setValue(_textbox(0, _near(_span("Name:"))), $name);
-    _removeFocus(_textbox(0, _near(_div("Name:"))));
+    _setValue(_textbox(0, _near(_span("Name"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Name"))));
     _click(_cell("Add New Complementary Field"));
-    _setValue(_textbox(0, _near(_div("Complementary text fields"))), $name);
-    _setValue(_textbox(1, _near(_div("Complementary text fields"))), "12");
+    _setValue(_textbox(0, _near(_span("Complementary text fields"))), $name);
+    _setValue(_textbox(1, _near(_span("Complementary text fields"))), "12");
     _click(_cell("Save"));
 }
 
@@ -87,12 +82,12 @@ function workReportModelHeadingCreate($name){
 }
 
 function workReportModelHeadingForm($name){
-    _setValue(_textbox(0, _near(_span("Name:"))), $name);
-    _removeFocus(_textbox(0, _near(_div("Name:"))));
-    _setSelected(_select(0, _near(_span("Task:"))),"heading");
+    _setValue(_textbox(0, _near(_span("Name"))), $name);
+    _removeFocus(_textbox(0, _near(_div("Name"))));
+    _setSelected(_select(0, _near(_span("Task"))),"heading");
     _click(_cell("Add New Complementary Field"));
-    _setValue(_textbox(0, _near(_div("Complementary text fields"))), $name);
-    _setValue(_textbox(1, _near(_div("Complementary text fields"))), "12");
+    _setValue(_textbox(0, _near(_span("Complementary text fields"))), $name);
+    _setValue(_textbox(1, _near(_span("Complementary text fields"))), "12");
     _click(_cell("Save"));
 }
 
@@ -107,10 +102,10 @@ function workReportEditForm($name){
     _click(_cell("Add new row"));
     _click(_cell("Save"));
     workReportResourceValidation();
-    _setValue(_textbox(2, _near(_parentTable(_div("Date")))), $machineName);
+    _setValue(_textbox(2, _near(_span("Work report lines"))), $machineName);
     _click(_cell("Save"));
     workReportTaskValidation();
-    _click(_italic(0, _near(_textbox(3, _near(_parentTable(_div("Date")))))));
+    _click(_italic(0, _near(_textbox(3, _near(_span("Work report lines"))))));
     _click(_div($projectName+"[2]", _parentTable(_div("Project code[1]"))));
     _click(_cell("Save"));
     workReportHourValidation();
@@ -145,11 +140,6 @@ function workReportAcctionValidation($action){
     _assert(_isVisible(_span("Work report "+$action)));
 }
 
-function workReportNoElementsValidation(){
-    _assertExists(_div("please, select a work report type"));
-    _assert(_isVisible(_div("please, select a work report type")));
-}
-
 function workReportHeadingCodeValidation(){
     _assertExists(_div("Task code cannot be null"));
     _assert(_isVisible(_div("Task code cannot be null")));
@@ -183,7 +173,6 @@ var $projectName = "projectForWorkReport";
 
 commonLogin("admin", "admin");
 
-workReportCreateWithoutElements();
 workReportCreateLineModel($workReportModelName);
 workReportCreateHeadingModel($workReportModelName2);
 workReportEdit($workReportModelName);
diff --git a/scripts/functional-tests/resources/worker_test.sah b/scripts/functional-tests/resources/worker_test.sah
index e54b9baa3..9fa5ffc7b 100644
--- a/scripts/functional-tests/resources/worker_test.sah
+++ b/scripts/functional-tests/resources/worker_test.sah
@@ -149,7 +149,9 @@ function workerAssignProjectForm($workerName, $workerSurName){
     _click(_div($workerSurName+", "+$workerName));
     _click(_cell($workerSurName+", "+$workerName));
     _click(_cell("Add"));
-    _click(_cell("z-button-cm[39]"));
+    _click(_cell("z-button-cm[40]"));
+    _assertExists(_div("box standard-task assigned"));
+    _log("Task assigned", "custom1");
     _click(_image("ico_save.png"));
     _click(_cell("OK"));
 }
diff --git a/scripts/functional-tests/scheduling/planning_criteria_test.sah b/scripts/functional-tests/scheduling/planning_criteria_test.sah
index ffe8ea791..81ec6b6e1 100644
--- a/scripts/functional-tests/scheduling/planning_criteria_test.sah
+++ b/scripts/functional-tests/scheduling/planning_criteria_test.sah
@@ -73,7 +73,7 @@ function planningAssignWorker($workerName){
     _click(_div($workerName+", "+$workerName));
     _click(_cell($workerName+", "+$workerName));
     _click(_cell("Add"));
-    _click(_cell("z-button-cm[39]"));
+    _click(_cell("z-button-cm[40]"));
     planningCheckIncorrectWorkerValidation()
     _log("try to assign calendar", "custom1");
 }
@@ -86,7 +86,7 @@ function planningAssignCriterion($criterion){
     _click(_div($criterion+" ( "+$criterion+" )[1]"));
     _click(_cell($criterion+" ( "+$criterion+" )[1]"));
     _click(_cell("Add"));
-    _click(_cell("z-button-cm[39]"));
+    _click(_cell("z-button-cm[40]"));
     planningCheckIncorrectCriterionValidation()
     _log("Try to assign criterion", "custom1");
 }
diff --git a/scripts/functional-tests/scheduling/templates_test.sah b/scripts/functional-tests/scheduling/templates_test.sah
index 6b45f68ce..831503b55 100644
--- a/scripts/functional-tests/scheduling/templates_test.sah
+++ b/scripts/functional-tests/scheduling/templates_test.sah
@@ -48,7 +48,7 @@ function templateProjectAssignTemplate($template){
     _click(_image("ico_copy.png"));
     _click(_italic(0, _cell("z-caption-l")));
     _click(_div($template));
-    _click(_cell("Create Order"));
+    _click(_cell("Create Project"));
     _click(_image("ico_save.png"));
     _click(_cell("OK"));
     _log("Assign the project template", "custom1")
@@ -57,8 +57,8 @@ function templateProjectAssignTemplate($template){
 function templateTaskCreateTaskChild($name, $hours){
     commonEditProject($projectName);
     _click(_span("z-dottree-ico z-dottree-firstspacer"));
-    _setValue(_textbox(0, _near(_span("New task:"))), $name);
-    _setValue(_textbox("z-intbox", _near(_span("Hours:"))), $hours);
+    _setValue(_textbox(0, _near(_span("New task"))), $name);
+    _setValue(_textbox("z-intbox", _near(_span("Hours"))), $hours);
     _click(_cell("Add"));
     _click(_image("ico_save.png"));
     _click(_cell("OK"));