From de23a1ff4266507abf2a057bb8e5778eaae3d9bf Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 6 Jun 2011 22:49:04 +0200
Subject: [PATCH] [i18n] Fixed uppercase/lowercases incoherences.

FEA: ItEr74S04BugFixing
---
 ganttzk/src/main/resources/i18n/es.po         |  52 +++----
 ganttzk/src/main/resources/i18n/gl.po         |  52 +++----
 ganttzk/src/main/resources/i18n/keys.pot      |  40 ++---
 .../web/ganttz/zul/plannerLayout.zul          |   4 +-
 .../src/main/resources/i18n/es.po             | 144 +++++++++---------
 .../src/main/resources/i18n/gl.po             | 144 +++++++++---------
 .../src/main/resources/i18n/keys.pot          | 136 ++++++++---------
 7 files changed, 286 insertions(+), 286 deletions(-)

diff --git a/ganttzk/src/main/resources/i18n/es.po b/ganttzk/src/main/resources/i18n/es.po
index 0a94f1080..71926ea2f 100644
--- a/ganttzk/src/main/resources/i18n/es.po
+++ b/ganttzk/src/main/resources/i18n/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-03 12:50+0200\n"
-"PO-Revision-Date: 2011-06-03 11:04+0200\n"
+"POT-Creation-Date: 2011-06-06 22:45+0200\n"
+"PO-Revision-Date: 2011-06-06 22:51+0200\n"
 "Last-Translator: Manuel Rego Casasnovas <mrego@igalia.com>\n"
 "Language-Team: Spanish <>\n"
 "Language: es\n"
@@ -43,19 +43,15 @@ msgstr "Inicio"
 msgid "Show reported hours"
 msgstr "Mostrar horas reportadas"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:79
-msgid "Show/Hide Progress"
-msgstr "Mostrar/ocultar progreso"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92
 msgid "by criteria"
 msgstr "por criterios"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:72
 msgid "Show/Hide reported hours"
-msgstr "Mostrar/ocultar horas reportardas"
+msgstr "Mostrar/Ocultar horas reportardas"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:45
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
 msgid "Zoom"
 msgstr "Zoom"
@@ -72,6 +68,10 @@ 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
+msgid "Show/Hide progress"
+msgstr "Mostrar/Ocultar progreso"
+
 #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
 msgid "Task"
 msgstr "Tarea"
@@ -84,7 +84,7 @@ msgstr "por recursos"
 msgid "Criterion"
 msgstr "Criterio"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:40
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41
 msgid "Print"
 msgstr "Imprimir"
 
@@ -108,7 +108,7 @@ msgstr "filtrando por nombre"
 msgid "End"
 msgstr "Fin"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
 msgid "Choosing Template"
 msgstr "Selección de plantilla"
 
@@ -128,9 +128,9 @@ msgstr "Ninguno"
 msgid "Filter"
 msgstr "Filtro"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:68
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69
 msgid "Flatten/Unflatten tree"
-msgstr "Aplanar/expandir árbol"
+msgstr "Aplanar/Expandir árbol"
 
 #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
 msgid "Project"
@@ -149,11 +149,15 @@ msgstr "Nombre"
 msgid "Show progress"
 msgstr "Mostrar progreso"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:65
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:66
 msgid "Expand/Collapse all"
-msgstr "Expandir/plegar todo"
+msgstr "Expandir/Plegar todo"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:35
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:56
+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"
 
@@ -169,9 +173,9 @@ msgstr "mostrando criterios"
 msgid "Month"
 msgstr "Mes"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:62
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
 msgid "Show/Hide resources"
-msgstr "Mostrar/ocultar recursos"
+msgstr "Mostrar/Ocultar recursos"
 
 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:246
 msgid "Set End-Start"
@@ -193,10 +197,6 @@ msgstr "Ocultar horas reportadas"
 msgid "Day"
 msgstr "Día"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:55
-msgid "Show/Hide Critical path"
-msgstr "Mostrar/ocultar camino crítico"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142
 msgid "showing resources"
 msgstr "mostrando recursos"
@@ -205,15 +205,15 @@ msgstr "mostrando recursos"
 msgid "Load: {0}%"
 msgstr "Carga: {0}%"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:59
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60
 msgid "Show/Hide labels"
-msgstr "Mostrar/ocultar etiquetas"
+msgstr "Mostrar/Ocultar etiquetas"
 
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:97
 msgid "Hour"
 msgstr "Hora"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:115
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91
 msgid "Graphics"
 msgstr "Gráficas"
@@ -238,7 +238,7 @@ msgstr "Mostrar todos los elementos"
 msgid "All"
 msgstr "Todos"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39
 msgid "Refresh"
 msgstr "Actualizar"
 
diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po
index 6cba9a703..0868b2fa7 100644
--- a/ganttzk/src/main/resources/i18n/gl.po
+++ b/ganttzk/src/main/resources/i18n/gl.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-03 12:50+0200\n"
-"PO-Revision-Date: 2011-06-03 11:05+0200\n"
+"POT-Creation-Date: 2011-06-06 22:45+0200\n"
+"PO-Revision-Date: 2011-06-06 22:50+0200\n"
 "Last-Translator: Manuel Rego Casasnovas <mrego@igalia.com>\n"
 "Language-Team: Galician <>\n"
 "Language: gl\n"
@@ -43,19 +43,15 @@ msgstr "Inicio"
 msgid "Show reported hours"
 msgstr "Mostrar horas reportadas"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:79
-msgid "Show/Hide Progress"
-msgstr "Mostrar/ocultar progreso"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92
 msgid "by criteria"
 msgstr "por criterios"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:72
 msgid "Show/Hide reported hours"
-msgstr "Mostrar/ocultar horas reportadas"
+msgstr "Mostrar/Ocultar horas reportadas"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:45
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
 msgid "Zoom"
 msgstr "Zoom"
@@ -72,6 +68,10 @@ 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
+msgid "Show/Hide progress"
+msgstr "Mostrar/Ocultar progreso"
+
 #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
 msgid "Task"
 msgstr "Tarefa"
@@ -84,7 +84,7 @@ msgstr "por recursos"
 msgid "Criterion"
 msgstr "Criterio"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:40
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41
 msgid "Print"
 msgstr "Imprimir"
 
@@ -108,7 +108,7 @@ msgstr "filtrando por nome"
 msgid "End"
 msgstr "Fin"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
 msgid "Choosing Template"
 msgstr "Selección de modelo"
 
@@ -128,9 +128,9 @@ msgstr "Ningún"
 msgid "Filter"
 msgstr "Filtro"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:68
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69
 msgid "Flatten/Unflatten tree"
-msgstr "Aplanar/expandir árbore"
+msgstr "Aplanar/Expandir árbore"
 
 #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
 msgid "Project"
@@ -149,11 +149,15 @@ msgstr "Nome"
 msgid "Show progress"
 msgstr "Mostrar progreso"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:65
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:66
 msgid "Expand/Collapse all"
-msgstr "Expandir/pregar todo"
+msgstr "Expandir/Pregar todo"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:35
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:56
+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"
 
@@ -169,9 +173,9 @@ msgstr "mostrando criterios"
 msgid "Month"
 msgstr "Mes"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:62
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
 msgid "Show/Hide resources"
-msgstr "Mostrar/ocultar recursos"
+msgstr "Mostrar/Ocultar recursos"
 
 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:246
 msgid "Set End-Start"
@@ -193,10 +197,6 @@ msgstr "Ocultar horas reportadas"
 msgid "Day"
 msgstr "Día"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:55
-msgid "Show/Hide Critical path"
-msgstr "Ocultar/ocultar camiño crítico"
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142
 msgid "showing resources"
 msgstr "mostrando recursos"
@@ -205,15 +205,15 @@ msgstr "mostrando recursos"
 msgid "Load: {0}%"
 msgstr "Carga: {0}%"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:59
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60
 msgid "Show/Hide labels"
-msgstr "Mostrar/ocultar etiquetas"
+msgstr "Mostrar/Ocultar etiquetas"
 
 #: ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:97
 msgid "Hour"
 msgstr "Hora"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:115
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91
 msgid "Graphics"
 msgstr "Gráficas"
@@ -238,7 +238,7 @@ msgstr "Mostrar tódolos elementos"
 msgid "All"
 msgstr "Todos"
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39
 msgid "Refresh"
 msgstr "Actualizar"
 
diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot
index 16a918cd8..f04e9367c 100644
--- a/ganttzk/src/main/resources/i18n/keys.pot
+++ b/ganttzk/src/main/resources/i18n/keys.pot
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-03 12:50+0200\n"
+"POT-Creation-Date: 2011-06-06 22:45+0200\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"
@@ -42,19 +42,15 @@ msgstr ""
 msgid "Show reported hours"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:79
-msgid "Show/Hide Progress"
-msgstr ""
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:92
 msgid "by criteria"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:72
 msgid "Show/Hide reported hours"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:45
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:46
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:35
 msgid "Zoom"
 msgstr ""
@@ -71,6 +67,10 @@ msgstr ""
 msgid "Set End-End"
 msgstr ""
 
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:80
+msgid "Show/Hide progress"
+msgstr ""
+
 #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
 msgid "Task"
 msgstr ""
@@ -83,7 +83,7 @@ msgstr ""
 msgid "Criterion"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:40
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:41
 msgid "Print"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:37
 msgid "Choosing Template"
 msgstr ""
 
@@ -127,7 +127,7 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:68
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:69
 msgid "Flatten/Unflatten tree"
 msgstr ""
 
@@ -148,11 +148,15 @@ msgstr ""
 msgid "Show progress"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:65
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:66
 msgid "Expand/Collapse all"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:35
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:56
+msgid "Show/Hide critical path"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:36
 msgid "Create Project"
 msgstr ""
 
@@ -168,7 +172,7 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:62
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
 msgid "Show/Hide resources"
 msgstr ""
 
@@ -192,10 +196,6 @@ msgstr ""
 msgid "Day"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:55
-msgid "Show/Hide Critical path"
-msgstr ""
-
 #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:142
 msgid "showing resources"
 msgstr ""
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Load: {0}%"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:59
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:60
 msgid "Show/Hide labels"
 msgstr ""
 
@@ -212,7 +212,7 @@ msgstr ""
 msgid "Hour"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:115
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:116
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91
 msgid "Graphics"
 msgstr ""
@@ -237,7 +237,7 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:38
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:39
 msgid "Refresh"
 msgstr ""
 
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index ad1d2edb9..de59db543 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -53,7 +53,7 @@
             <hbox sclass="view-options">
                 <button id="showCriticalPath" onClick="planner.showCriticalPath();"
                     image="/common/img/ico_criticalpath.png"
-                    tooltiptext="${ganttzk_i18n:_('Show/Hide Critical path')}"
+                    tooltiptext="${ganttzk_i18n:_('Show/Hide critical path')}"
                     sclass="planner-command" />
                 <button id="showAllLabels" onClick="planner.showAllLabels();"
                     image="/common/img/ico_labels.png"
@@ -77,7 +77,7 @@
             <hbox class="show-advances" align="center">
                 <button id="showAdvances" onClick="planner.showAdvances();"
                     image="/common/img/ico_progress.png" style="width:46px"
-                    tooltiptext="${ganttzk_i18n:_('Show/Hide Progress')}"
+                    tooltiptext="${ganttzk_i18n:_('Show/Hide progress')}"
                     sclass="planner-command" />
                 <combobox id="cbProgressTypes" width="1px"
                     visible="false" sclass="progress-types" />
diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po
index 6b218f377..2e81c804d 100644
--- a/navalplanner-webapp/src/main/resources/i18n/es.po
+++ b/navalplanner-webapp/src/main/resources/i18n/es.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-03 12:50+0200\n"
+"POT-Creation-Date: 2011-06-06 22:45+0200\n"
 "PO-Revision-Date: 2011-06-03 11:56+0200\n"
 "Last-Translator: Manuel Rego Casasnovas <mrego@igalia.com>\n"
 "Language-Team: Spanish <>\n"
@@ -71,11 +71,11 @@ msgstr "Crear trabajador virtual"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:159
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180
@@ -379,14 +379,6 @@ msgstr "Indentar"
 msgid "Reassignation"
 msgstr "Reasignación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:730
-msgid ""
-"The periods available depend on the satisfaction of the criteria by the "
-"resources and their calendars."
-msgstr ""
-"Los períodos disponibles dependen de la satisfacción de criterios por los "
-"recursos y sus calendarios."
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:42
 msgid "New template"
 msgstr "Plantilla nueva"
@@ -926,6 +918,14 @@ msgstr "Sobrecarga debido a otras asignaciones"
 msgid "Time period saved"
 msgstr "Período de tiempo guardado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
+msgid ""
+"Are you sure of changing the resource type? You will lose the criteria with "
+"different resource type."
+msgstr ""
+"¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo "
+"de recurso se perderán."
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:305
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:168
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:164
@@ -1000,7 +1000,7 @@ msgstr "Valor"
 msgid "Hour costs"
 msgstr "Costes por hora"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:713
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:718
 msgid "there are no valid periods for this calendar"
 msgstr "no hay períodos válidos para este calendario"
 
@@ -1157,8 +1157,8 @@ msgstr "Crear tipo de criterio"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:202
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
@@ -1238,7 +1238,7 @@ msgstr ""
 "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:236
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:863
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:869
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:567
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:896
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:322
@@ -1478,6 +1478,10 @@ msgstr "Categorías de materiales"
 msgid "Standard Effort"
 msgstr "Esfuerzo estándar"
 
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22
+msgid "Criteria Requirement"
+msgstr "Criterios requeridos"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134
 msgid "Pending update"
 msgstr "Actualización pendiente"
@@ -1548,7 +1552,7 @@ msgstr "Mover abajo"
 msgid "Please, select a project"
 msgstr "Por favor, seleccione un proyecto"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:851
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:857
 msgid "Name: {0}"
 msgstr "Nombre: {0}"
 
@@ -1675,8 +1679,8 @@ msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189
@@ -1882,8 +1886,8 @@ msgstr "Abajo"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:201
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184
@@ -1946,8 +1950,8 @@ msgstr "fecha de inicio de la asignación de coste no especificada"
 
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:189
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170
 msgid "Output format:"
@@ -2317,7 +2321,7 @@ msgstr "Crear nuevo proyecto"
 msgid "Work done from starting date:"
 msgstr "Trabajo realizado desde la fecha de inicio:"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:859
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:865
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53
@@ -2647,7 +2651,7 @@ msgstr "RECURSO LIMITANTE"
 msgid "Subcontratation"
 msgstr "Subcontratación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:534
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:535
 msgid "{0} cannot be fulfilled"
 msgstr "No se puede cumplir {0}"
 
@@ -3046,8 +3050,8 @@ msgstr "Editar tipo de horas de trabajo"
 msgid "From Today"
 msgstr "A partir de hoy"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1054
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1069
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1060
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1075
 msgid "{0} not supported yet"
 msgstr "{0} aún no soportado"
 
@@ -3092,8 +3096,8 @@ msgid "Assigned criterion requirements"
 msgstr "Criterios requeridos asignados"
 
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:138
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119
 msgid "Filter by criteria"
@@ -3374,11 +3378,11 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:118
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:158
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179
@@ -4155,7 +4159,7 @@ msgstr ""
 msgid "User disabled"
 msgstr "Usuario deshabilitado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:728
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:733
 msgid "In the available periods {0} only {1} hours are available."
 msgstr "En los períodos disponibles {0} solo {1} horas están disponibles."
 
@@ -4377,7 +4381,7 @@ msgstr "No ha sido posible cargar la entidad. No encontrada. Id: "
 msgid "Create Virtual Workers Group"
 msgstr "Crear grupo de trabajadores virtuales"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:855
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:861
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:885
 msgid "Hours invested"
 msgstr "Horas invertidas"
@@ -4622,10 +4626,6 @@ msgstr "Crear copia"
 msgid "Company data"
 msgstr "Datos de la empresa"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22
-msgid "Criteria Requirement"
-msgstr "Criterios requeridos"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215
 msgid "Unit type code cannot be empty"
 msgstr "El código del tipo de unidad no puede ser vacío"
@@ -4840,7 +4840,7 @@ msgstr "Notificar progreso"
 msgid "ACWP"
 msgstr "ACWP"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:731
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:736
 msgid "The periods available depend on the resource's calendar."
 msgstr "Los períodos de disponibilidad dependen del calendario del recurso."
 
@@ -5061,7 +5061,7 @@ msgstr "Asignación de categoría de coste"
 msgid "missing code in a hour cost"
 msgstr "falta código en un coste por hora"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:816
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:822
 msgid "All workers"
 msgstr "Todos los trabajadores"
 
@@ -5148,14 +5148,6 @@ msgstr "Calcular recursos por día"
 msgid "The index fields and labels must be uniques and consecutives"
 msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
-msgid ""
-"Are you sure of changing the resource type? You will lose the criteria "
-"with different resource type."
-msgstr ""
-"¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo "
-"de recurso se perderán."
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130
 msgid "Estimate To Complete"
 msgstr "Estimación del coste pendiente"
@@ -5246,14 +5238,14 @@ msgstr "Optimista"
 msgid "SV"
 msgstr "SV"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
-msgid "Our company login"
-msgstr "Nombre de usuario de nuestra empresa"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483
 msgid "Filter work reports"
 msgstr "Filtrar partes de trabajo"
 
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
+msgid "Our company login"
+msgstr "Nombre de usuario de nuestra empresa"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:395
 msgid ""
 "Default calendar cannot be removed. Please, change the default calendar in "
@@ -5262,7 +5254,7 @@ msgstr ""
 "El calendario por defecto no se puede. Por favor, cambie antes el calendario "
 "por defecto en la ventana de configuración."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:852
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:858
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:587
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:884
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:319
@@ -5694,8 +5686,8 @@ msgstr "Probabilidad"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:199
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
@@ -5732,6 +5724,14 @@ msgstr "Sobreasignable infinitamente"
 msgid "criterion names must be unique inside a criterion type"
 msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:735
+msgid ""
+"The periods available depend on the satisfaction of the criteria by the "
+"resources and their calendars."
+msgstr ""
+"Los períodos disponibles dependen de la satisfacción de criterios por los "
+"recursos y sus calendarios."
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:79
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
@@ -6046,8 +6046,8 @@ msgstr "fecha en el futuro"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:179
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160
@@ -6186,11 +6186,11 @@ msgstr "quedan {0} proyectos por reasignar"
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:157
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99
@@ -6335,11 +6335,11 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167
@@ -6536,7 +6536,7 @@ msgstr "Guardar y nuevo parte de trabajo"
 msgid "Subcontract price"
 msgstr "Precio de subcontratación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:739
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:744
 msgid "Resources per day are zero"
 msgstr "Hay cero recursos por día"
 
@@ -6671,10 +6671,10 @@ msgstr "Precio total"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188
diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po
index 6d7e30904..738bf06bf 100644
--- a/navalplanner-webapp/src/main/resources/i18n/gl.po
+++ b/navalplanner-webapp/src/main/resources/i18n/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-03 12:50+0200\n"
+"POT-Creation-Date: 2011-06-06 22:45+0200\n"
 "PO-Revision-Date: 2011-06-03 13:08+0200\n"
 "Last-Translator: Manuel Rego Casasnovas <mrego@igalia.com>\n"
 "Language-Team: Galician <>\n"
@@ -70,11 +70,11 @@ msgstr "Crear traballador virtual"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:159
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180
@@ -375,14 +375,6 @@ msgstr "Indentar"
 msgid "Reassignation"
 msgstr "Reasignación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:730
-msgid ""
-"The periods available depend on the satisfaction of the criteria by the "
-"resources and their calendars."
-msgstr ""
-"Os períodos dispoñibles dependen da satisfacción dos criterios polos "
-"recursos e os seus calendarios."
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:42
 msgid "New template"
 msgstr "Novo modelo"
@@ -919,6 +911,14 @@ msgstr "Sobrecarga debido a outras asignacións"
 msgid "Time period saved"
 msgstr "Período de tiempo gardado"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
+msgid ""
+"Are you sure of changing the resource type? You will lose the criteria with "
+"different resource type."
+msgstr ""
+"¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente tipo "
+"de recurso perderanse."
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:305
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:168
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:164
@@ -993,7 +993,7 @@ msgstr "Valor"
 msgid "Hour costs"
 msgstr "Custos por hora"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:713
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:718
 msgid "there are no valid periods for this calendar"
 msgstr "non hai períodos válidos para este calendario"
 
@@ -1149,8 +1149,8 @@ msgstr "Crear tipo de criterio"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:202
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
@@ -1229,7 +1229,7 @@ msgid "both {0} of category {1} and {2} of category {3} have the same code"
 msgstr "{0} da categoría {1} e {2} da categoría {3} teñen o mesmo código"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:236
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:863
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:869
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:567
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:896
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:322
@@ -1469,6 +1469,10 @@ msgstr "Categorías de materiais"
 msgid "Standard Effort"
 msgstr "Esforzo estándar"
 
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22
+msgid "Criteria Requirement"
+msgstr "Criterios requiridos"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134
 msgid "Pending update"
 msgstr "Actualización pendente"
@@ -1539,7 +1543,7 @@ msgstr "Mover abaixo"
 msgid "Please, select a project"
 msgstr "Por favor, seleccione un proxecto"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:851
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:857
 msgid "Name: {0}"
 msgstr "Nome: {0}"
 
@@ -1666,8 +1670,8 @@ msgstr "o criterio satisfeito ten data de fin anterior á de inicio"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189
@@ -1873,8 +1877,8 @@ msgstr "Abaixo"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:201
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184
@@ -1936,8 +1940,8 @@ msgstr "data de inicio da asignación de custo non especificada"
 
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:189
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170
 msgid "Output format:"
@@ -2307,7 +2311,7 @@ msgstr "Crear novo proxecto"
 msgid "Work done from starting date:"
 msgstr "Traballo realizado desde a data de inicio:"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:859
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:865
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53
@@ -2637,7 +2641,7 @@ msgstr "RECURSO LIMITANTE"
 msgid "Subcontratation"
 msgstr "Subcontratación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:534
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:535
 msgid "{0} cannot be fulfilled"
 msgstr "Non se pode cumprir {0}"
 
@@ -3034,8 +3038,8 @@ msgstr "Editar tipo de horas de traballo"
 msgid "From Today"
 msgstr "A partir de hoxe"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1054
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1069
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1060
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1075
 msgid "{0} not supported yet"
 msgstr "{0} aínda non soportado"
 
@@ -3080,8 +3084,8 @@ msgid "Assigned criterion requirements"
 msgstr "Criterios requiridos asignados"
 
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:138
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119
 msgid "Filter by criteria"
@@ -3362,11 +3366,11 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:118
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:158
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179
@@ -4142,7 +4146,7 @@ msgstr ""
 msgid "User disabled"
 msgstr "Usuario deshabilitado"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:728
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:733
 msgid "In the available periods {0} only {1} hours are available."
 msgstr "Nos períodos dispoñibles {0} só hai dispoñibles {1} horas."
 
@@ -4363,7 +4367,7 @@ msgstr "Non foi posible cargar a entidade. Non atopada. Id: "
 msgid "Create Virtual Workers Group"
 msgstr "Crear grupo de traballadores virtuais"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:855
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:861
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:885
 msgid "Hours invested"
 msgstr "Horas invertidas"
@@ -4607,10 +4611,6 @@ msgstr "Crear copia"
 msgid "Company data"
 msgstr "Datos da empresa"
 
-#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22
-msgid "Criteria Requirement"
-msgstr "Criterios requiridos"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215
 msgid "Unit type code cannot be empty"
 msgstr "O código de tipo de unidade non pode ser baleiro"
@@ -4824,7 +4824,7 @@ msgstr "Notificar progreso"
 msgid "ACWP"
 msgstr "ACWP"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:731
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:736
 msgid "The periods available depend on the resource's calendar."
 msgstr "Os períodos dispoñibles dependen do calendario do recurso."
 
@@ -5044,7 +5044,7 @@ msgstr "Asignación de categoría de custo"
 msgid "missing code in a hour cost"
 msgstr "falta código nun custo por hora"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:816
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:822
 msgid "All workers"
 msgstr "Todos os traballadores"
 
@@ -5130,14 +5130,6 @@ msgstr "Calcular recursos por día"
 msgid "The index fields and labels must be uniques and consecutives"
 msgstr "Os campos de índice e as etiquetas deben ser únicas e consecutivas"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
-msgid ""
-"Are you sure of changing the resource type? You will lose the criteria "
-"with different resource type."
-msgstr ""
-"¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente tipo "
-"de recurso perderanse."
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130
 msgid "Estimate To Complete"
 msgstr "Estimación do custo pendente"
@@ -5228,14 +5220,14 @@ msgstr "Optimista"
 msgid "SV"
 msgstr "SV"
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
-msgid "Our company login"
-msgstr "Nome de usuario da nosa empresa"
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483
 msgid "Filter work reports"
 msgstr "Filtrar partes de traballo"
 
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
+msgid "Our company login"
+msgstr "Nome de usuario da nosa empresa"
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:395
 msgid ""
 "Default calendar cannot be removed. Please, change the default calendar in "
@@ -5244,7 +5236,7 @@ msgstr ""
 "O calendario por defecto non se pode borrar. Por favor, cambie antes o "
 "calendario por defecto na ventá de configuración."
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:852
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:858
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:587
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:884
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:319
@@ -5675,8 +5667,8 @@ msgstr "Probabilidade"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:199
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
@@ -5713,6 +5705,14 @@ msgstr "Sobreasignable infinitamente"
 msgid "criterion names must be unique inside a criterion type"
 msgstr "o nome do criterio debe ser único dentro dun tipo de criterio"
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:735
+msgid ""
+"The periods available depend on the satisfaction of the criteria by the "
+"resources and their calendars."
+msgstr ""
+"Os períodos dispoñibles dependen da satisfacción dos criterios polos "
+"recursos e os seus calendarios."
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:79
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
@@ -6027,8 +6027,8 @@ msgstr "data no futuro"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:179
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160
@@ -6166,11 +6166,11 @@ msgstr "quedan {0} proxectos por reasignar"
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:157
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99
@@ -6314,11 +6314,11 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167
@@ -6515,7 +6515,7 @@ msgstr "Gardar e novo parte de traballo"
 msgid "Subcontract price"
 msgstr "Prezo de subcontratación"
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:739
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:744
 msgid "Resources per day are zero"
 msgstr "Hai cero recursos por día"
 
@@ -6650,10 +6650,10 @@ msgstr "Prezo total"
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188
diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot
index bf1d7b601..bc9d9e8b0 100644
--- a/navalplanner-webapp/src/main/resources/i18n/keys.pot
+++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-03 12:50+0200\n"
+"POT-Creation-Date: 2011-06-06 22:45+0200\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"
@@ -70,11 +70,11 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:109
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:150
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:122
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:101
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:142
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:91
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:159
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:121
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:163
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:97
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:139
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:180
@@ -370,12 +370,6 @@ msgstr ""
 msgid "Reassignation"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:730
-msgid ""
-"The periods available depend on the satisfaction of the criteria by the "
-"resources and their calendars."
-msgstr ""
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java:42
 msgid "New template"
 msgstr ""
@@ -892,6 +886,12 @@ msgstr ""
 msgid "Time period saved"
 msgstr ""
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
+msgid ""
+"Are you sure of changing the resource type? You will lose the criteria with "
+"different resource type."
+msgstr ""
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java:305
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java:168
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java:164
@@ -965,7 +965,7 @@ msgstr ""
 msgid "Hour costs"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:713
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:718
 msgid "there are no valid periods for this calendar"
 msgstr ""
 
@@ -1114,8 +1114,8 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:107
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:202
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:225
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185
@@ -1194,7 +1194,7 @@ msgid "both {0} of category {1} and {2} of category {3} have the same code"
 msgstr ""
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTreeController.java:236
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:863
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:869
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:567
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:896
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:322
@@ -1432,6 +1432,10 @@ msgstr ""
 msgid "Standard Effort"
 msgstr ""
 
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22
+msgid "Criteria Requirement"
+msgstr ""
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/subcontract/ReportAdvancesController.java:134
 msgid "Pending update"
 msgstr ""
@@ -1500,7 +1504,7 @@ msgstr ""
 msgid "Please, select a project"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:851
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:857
 msgid "Name: {0}"
 msgstr ""
 
@@ -1625,8 +1629,8 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:197
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:170
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:112
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:206
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:190
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:230
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:167
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:189
@@ -1828,8 +1832,8 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:192
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:165
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:106
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:201
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:185
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:205
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:224
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:162
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:184
@@ -1891,8 +1895,8 @@ msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:178
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:92
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:189
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:171
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:193
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:208
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:170
 msgid "Output format:"
@@ -2256,7 +2260,7 @@ msgstr ""
 msgid "Work done from starting date:"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:859
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:865
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
 #: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:50
 #: navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53
@@ -2573,7 +2577,7 @@ msgstr ""
 msgid "Subcontratation"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:534
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:535
 msgid "{0} cannot be fulfilled"
 msgstr ""
 
@@ -2960,8 +2964,8 @@ msgstr ""
 msgid "From Today"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1054
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1069
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1060
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:1075
 msgid "{0} not supported yet"
 msgstr ""
 
@@ -3006,8 +3010,8 @@ msgid "Assigned criterion requirements"
 msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:127
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:117
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:138
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:119
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:140
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:157
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:119
 msgid "Filter by criteria"
@@ -3283,11 +3287,11 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:108
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:149
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:119
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:98
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:100
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:141
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:89
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:118
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:158
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:120
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:162
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:94
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:138
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:179
@@ -4052,7 +4056,7 @@ msgstr ""
 msgid "User disabled"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:728
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:733
 msgid "In the available periods {0} only {1} hours are available."
 msgstr ""
 
@@ -4269,7 +4273,7 @@ msgstr ""
 msgid "Create Virtual Workers Group"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:855
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:861
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:885
 msgid "Hours invested"
 msgstr ""
@@ -4508,10 +4512,6 @@ msgstr ""
 msgid "Company data"
 msgstr ""
 
-#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:22
-msgid "Criteria Requirement"
-msgstr ""
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java:215
 msgid "Unit type code cannot be empty"
 msgstr ""
@@ -4720,7 +4720,7 @@ msgstr ""
 msgid "ACWP"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:731
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:736
 msgid "The periods available depend on the resource's calendar."
 msgstr ""
 
@@ -4933,7 +4933,7 @@ msgstr ""
 msgid "missing code in a hour cost"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:816
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:822
 msgid "All workers"
 msgstr ""
 
@@ -5019,12 +5019,6 @@ msgstr ""
 msgid "The index fields and labels must be uniques and consecutives"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:250
-msgid ""
-"Are you sure of changing the resource type? You will lose the criteria "
-"with different resource type."
-msgstr ""
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:130
 msgid "Estimate To Complete"
 msgstr ""
@@ -5114,21 +5108,21 @@ msgstr ""
 msgid "SV"
 msgstr ""
 
-#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
-msgid "Our company login"
-msgstr ""
-
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483
 msgid "Filter work reports"
 msgstr ""
 
+#: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
+msgid "Our company login"
+msgstr ""
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:395
 msgid ""
 "Default calendar cannot be removed. Please, change the default calendar in "
 "the Configuration window before."
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:852
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:858
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:587
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:884
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:319
@@ -5541,8 +5535,8 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:190
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:163
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:104
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:199
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:183
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:203
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:222
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:160
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:182
@@ -5579,6 +5573,12 @@ msgstr ""
 msgid "criterion names must be unique inside a criterion type"
 msgstr ""
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:735
+msgid ""
+"The periods available depend on the satisfaction of the criteria by the "
+"resources and their calendars."
+msgstr ""
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:79
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:814
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
@@ -5889,8 +5889,8 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:168
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:141
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:82
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:179
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:161
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:183
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:198
 #: navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:139
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:160
@@ -6023,11 +6023,11 @@ msgstr ""
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java:51
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:107
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:148
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:99
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:140
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:117
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:157
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:119
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:161
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:137
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:178
 #: navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:99
@@ -6163,11 +6163,11 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:96
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:137
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:109
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:86
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:88
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:129
 #: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:77
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:107
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:146
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:109
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:150
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:167
@@ -6364,7 +6364,7 @@ msgstr ""
 msgid "Subcontract price"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:739
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java:744
 msgid "Resources per day are zero"
 msgstr ""
 
@@ -6499,10 +6499,10 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:117
 #: navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:158
 #: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:131
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:107
-#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:127
-#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:109
+#: navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:150
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:129
+#: navalplanner-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:171
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:106
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:147
 #: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:188