From 3e213cdaf604b42f00aabbc550117590bb720acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Wed, 9 Dec 2009 18:44:11 +0100
Subject: [PATCH]  ItEr38S18DocumentacionFormacionItEr36S06: Updated Galician
 translation files

---
 ganttzk/src/main/resources/i18n/gl.po         |   62 +-
 .../src/main/resources/i18n/gl.po             | 4024 ++++++++++-------
 2 files changed, 2455 insertions(+), 1631 deletions(-)

diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po
index 0ba874984..c579526cf 100644
--- a/ganttzk/src/main/resources/i18n/gl.po
+++ b/ganttzk/src/main/resources/i18n/gl.po
@@ -6,29 +6,67 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 19:41 +0100\n"
-"PO-Revision-Date: 2009-11-10 20:03+0100\n"
-"Last-Translator: Igalia <dpino@igalia.com>\n"
-"Language-Team: Spanish\n"
+"POT-Creation-Date: 2009-12-09 12:30+0100\n"
+"PO-Revision-Date: 2009-12-09 16:02+0100\n"
+"Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
+"Language-Team: Spanish <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:104
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:35
+msgid "Show all labels"
+msgstr "Mostrar todas as etiquetas"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:38
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:14
+msgid "Zoom decrease"
+msgstr "Reducir zoom"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:109
 msgid "100%"
-msgstr ""
+msgstr "100%"
 
-#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:99
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:104
 msgid "0% - 100%"
-msgstr ""
+msgstr "0% - 100%"
 
-#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:94
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:16
+msgid "Filter"
+msgstr "Filtro"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:36
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:12
+msgid "Zoom increase"
+msgstr "Aumentar zoom"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:99
 msgid "Assignation percentage"
 msgstr "Porcentaxe asignado"
 
-#: ./ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:109
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:32
+msgid "Critical path"
+msgstr "Camiño crítico"
+
+#: /home/jaragunde/projects/xestion-producion/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:147
+msgid "increasing zoom"
+msgstr "aumentando zoom"
+
+#: /home/jaragunde/projects/xestion-producion/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:164
+msgid "decreasing zoom"
+msgstr "reducindo zoom"
+
+#: /home/jaragunde/projects/xestion-producion/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:345
+msgid "Hide critical path"
+msgstr "Ocultar camiño crítico"
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:114
 msgid "+ 100%"
-msgstr ""
+msgstr "+ 100%"
+
+#: /home/jaragunde/projects/xestion-producion/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:340
+msgid "Show critical path"
+msgstr "Mostrar camiño crítico"
diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po
index fbf6b63cc..6fe6349f7 100644
--- a/navalplanner-webapp/src/main/resources/i18n/gl.po
+++ b/navalplanner-webapp/src/main/resources/i18n/gl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-04 17:55+0100\n"
-"PO-Revision-Date: 2009-11-04 18:39+0100\n"
+"POT-Creation-Date: 2009-12-09 12:30+0100\n"
+"PO-Revision-Date: 2009-12-09 15:59+0100\n"
 "Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
 "Language-Team: Galician <>\n"
 "MIME-Version: 1.0\n"
@@ -17,111 +17,102 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:176
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:195
 msgid "Work report types"
-msgstr "Tipos de informe de traballo"
+msgstr "Tipos de partes de traballo"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:<button
-#: label="${i18n:_('Back')}" onClick="orderElementController.back()"/>
-msgid "Back"
-msgstr "Atrás"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:275
+msgid "The resource cannot be null"
+msgstr "O recurso non pode ser nulo"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<label
-#: value="${i18n:_('Customer')}" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<column
-#: label="${i18n:_('Customer')}" sort="auto(customer)"
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:74
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:33
 msgid "Customer"
 msgstr "Cliente"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:181
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:<button
-#: id="adminButton" label="${i18n:_('Administration')}"
-#: disabled="@{controller.workers.changeAssignmentsDisabled}"
-#: onClick="controller.workers.showList(event);"></button>
-msgid "Administration"
-msgstr "Administración"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:546
+msgid "Hours type"
+msgstr "Tipo de horas"
 
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:<window
-#: id="${arg.top_id}" title="${i18n:_('Work report listing')}">
-msgid "Work report listing"
-msgstr "Listado de informes de traballo"
-
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<button
-#: label="${i18n:_('Create exception')}"
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:131
 msgid "Create exception"
 msgstr "Crear excepción"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:label="${i18n:_('Cancel
-#: and return')}"/>
-msgid "Cancel and return"
-msgstr "Cancelar e volver"
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:188
+msgid "Add Exception"
+msgstr "Engadir excepción"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:<edition
-#: top_id="editWindow" title="${i18n:_('Edit worker')}"
-msgid "Edit worker"
-msgstr "Editar traballador"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:id="confirmDisabledHierarchy"
-#: title="${i18n:_('Warning')}" sizable="true"
-msgid "Warning"
-msgstr "Advertencia"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:360
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:<column
-#: label="${i18n:_('Operations')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:<treecol
-#: width="150px" align="center"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:<newdatasortablecolumn
-#: width="200px" label="${i18n:_('Operations')}"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:<newdatasortablecolumn
-#: width="70px" align="center"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:<newdatasortablecolumn
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:<newdatasortablecolumn
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:<newdatasortablecolumn
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<treecol
-#: class="operations"
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<newdatasortablecolumn
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<listheader
-#: ./navalplanner-webapp/src/main/webapp/calendars/_list.zul:<treecol
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:549
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:26
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:124
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:148
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:23
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:23
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:17
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:28
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:63
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:26
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:69
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:51
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:40
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:48
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:72
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:36
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:53
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:125
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:169
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:215
+#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:27
 msgid "Operations"
 msgstr "Operacións"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:label="${i18n:_('Add
-#: criterion')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:label="${i18n:_('Add
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:7
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:9
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:660
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<comboitem
-#: label="${i18n:_('Filter by Label')}"
-msgid "Filter by Label"
-msgstr "Filtrar por etiqueta"
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:32
+msgid "Heading Fields"
+msgstr "Campos de cabeceira"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<label
-#: value="${i18n:_('Hours of day')}" />
-msgid "Hours of day"
-msgstr "Horas do día"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<button
-#: label="${i18n:_('Select')}"
-#: onClick="allocationController.onSelectWorkers(event)" />
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:176
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:305
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:320
 msgid "there must be {0} hours instead of {1}"
 msgstr "debe haber {0} horas en lugar de {1}"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:154
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:208
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:41
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:72
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:40
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:61
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:138
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:38
+msgid "Materials"
+msgstr "Materiais"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:78
+msgid "Partially scheduled"
+msgstr "Parcialmente planificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:154
 msgid ""
 "Time period contains non valid data. Ending data must be older than starting "
 "date"
@@ -129,99 +120,93 @@ msgstr ""
 "O período de tempo contén datos inválidos. A data de fin debe ser maior cá "
 "de inicio"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:<panel
-#: title="${i18n:_('Percentage of consumed budget hours / consumed')}">
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:185
+msgid "A type must be selected"
+msgstr "Debe seleccionar un tipo"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:55
+msgid "Description cannot be null or empty"
+msgstr "A descrición non pode ser nula ou baleira"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:94
 msgid "Percentage of consumed budget hours / hours consumed"
 msgstr "Porcentaxe de horas de presuposto consumidas / horas consumidas"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: label="${i18n:_('Show')}"/>
-msgid "Show"
-msgstr "Mostrar"
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:40
+msgid "login name not specified"
+msgstr "nome de usuario non especificado"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:328
-msgid "Create derived"
-msgstr "Crear derivado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:503
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:944
+msgid "You should select a start date for the exception"
+msgstr "Debe seleccionar unha data de inicio para a excepción"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/search/worker_search.zul:<label
-#: value="${i18n:_('Name/NIF')}" />
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60
+msgid "Variance At Completion"
+msgstr "Desviación ó coste final"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:56
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:41
+msgid "Help"
+msgstr "Axuda"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:52
 msgid "Name/NIF"
 msgstr "Nome/NIF"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:237
-msgid "it must be greater than zero"
-msgstr "debe ser maior que cero"
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:27
+msgid "Managing fields and labels"
+msgstr "Administrar campos e etiquetas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:236
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:247
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:276
 msgid "Please, select a calendar"
 msgstr "Por favor, seleccione un calendario"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<listheader
-#: label="${i18n:_('Summary')}" />
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:168
 msgid "Summary"
 msgstr "Resumo"
 
-#: ./navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:<?page
-#: title="${i18n:_('Navalpro: Scheduling')}"?>
-#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:<?page
-#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:<?page
-#: ./navalplanner-webapp/src/main/webapp/planner/resources_use.zul:<?page
-#: ./navalplanner-webapp/src/main/webapp/planner/index.zul:<?page
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<?page
-msgid "Navalpro: Scheduling"
-msgstr "Navalpro: planificación"
-
-#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:<label
-#: value="${i18n:_('Place')}:" />
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:<newdatasortablecolumn
-#: label="${i18n:_('Place')}" sort="auto(place)"
-msgid "Place"
-msgstr "Lugar"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:179
-msgid "Removed calendar \"{0}\""
-msgstr "Borrado calendario \"{0}\""
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:505
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:<column
-#: label="${i18n:_('Name')}" sort="auto(name)" />
-#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:<label
-#: value="${i18n:_('Name')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:<column
-#: sort="auto(firstName)"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:<listheader
-#: sort="auto(surname)"></listheader>
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:<treecol
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:<newdatasortablecolumn
-#: sort="auto(name)"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/search/worker_search.zul:<listheader
-#: sort="auto"
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:<newdatasortablecolumn
-#: sort="auto(unitName)"/>
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:<newdatasortablecolumn
-#: sortDirection="ascending"
-#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:${i18n:_('Name')}
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:${i18n:_('Name')}
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<listheader
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<listheader
-#: ./navalplanner-webapp/src/main/webapp/calendars/_list.zul:<treecol
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java:47
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:553
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:25
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:33
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:49
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:40
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:121
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:145
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:36
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:26
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:44
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition.zul:23
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:24
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:24
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:62
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:30
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:51
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:106
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:48
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:26
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:25
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:40
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:61
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:25
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:39
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:48
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:47
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:160
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:51
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:156
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:25
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:33
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:164
+#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:26
 msgid "Name"
 msgstr "Nome"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:159
 msgid ""
 "Could not save time period. Time period overlaps with another non-compatible "
 "time period"
@@ -229,429 +214,327 @@ msgstr ""
 "Non se puido gardar o período de tiempo. O período solápase con outro "
 "período de tempo incompatible"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<button
-#: id="assignButton" label="${i18n:_('&lt;&lt;')}"></button>
-#: ./navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:<button
-#: label="${i18n:_('&lt;&lt;')}"
-msgid "&lt;&lt;"
-msgstr "&lt;&lt;"
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:80
+msgid "Criterion requirements"
+msgstr "Requisitos do criterio"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:135
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:76
+msgid "START_NOT_EARLIER_THAN"
+msgstr "COMEZAR_NON_ANTES_DE"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:180
+msgid ""
+"The default calendar can not be removed. Please, change the default calendar "
+"in the Configuration window before."
+msgstr ""
+"O calendario por defecto non pode borrarse. Por favor, cambie antes o "
+"calendario por defecto na ventana de configuración."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:135
 msgid "please, select an item"
 msgstr "por favor, seleccione un elemento"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<listheader
-#: label="${i18n:_('Day of week')}" />
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:295
+msgid "Time Start cannot be null"
+msgstr "A hora de inicio non pode ser nula"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:62
+msgid "Dedication chart"
+msgstr "Gráfico de dedicación"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:154
 msgid "Day of week"
 msgstr "Día da semana"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:<column
-#: label="${i18n:_('Surname')}" sort="auto(surname)" />
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:<newdatasortablecolumn
-msgid "Surname"
-msgstr "Apelidos"
-
-#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:<label
-#: value="${i18n:_('Date')}:" />
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:<newdatasortablecolumn
-#: label="${i18n:_('Date')}" sort="auto(date)"
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: label="${i18n:_('Date')}"/>
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:xAxis="${i18n:_('Date')}"
-#: yAxis= "${i18n:_('Value')}"
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:<column
-msgid "Date"
-msgstr "Data"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:229
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:283
 msgid "It not could remove the order element "
 msgstr "Non se puido borrar o elemento de pedido "
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<tab
-#: label="${i18n:_('History')}"
-msgid "History"
-msgstr "Historia"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:500
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:502
+msgid "Error on splitting element: "
+msgstr "Erro ó dividir elemento: "
 
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:<button
-#: label="${i18n:_('New work report')}"
-msgid "New work report"
-msgstr "Novo informe de traballo"
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java:112
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java:93
+msgid "The end date cannot be before the init date"
+msgstr "A data de fin non pode ser anterior á data de inicio"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:<panel
-#: title="${i18n:_('Order lines imputation')}">
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:value="${i18n:_('Order
-#: imputation')}:" />
-msgid "Order lines imputation"
-msgstr "Imputación de liñas de pedido"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<panel
-#: title="${i18n:_('Advance assignments')}" border="normal">
-msgid "Advance assignments"
-msgstr "Asignacións de avances"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:${i18n:_('From')}:
-#: <datebox /> ${i18n:_('To')}:
-msgid "From"
-msgstr "De"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:<orderElement
-#: top_id="editOrderElement" title="${i18n:_('Edit order element')}" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:<window
-#: id="${arg.top_id}"
-msgid "Edit order element"
-msgstr "Editar elemento de pedido"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:308
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:325
-msgid "The criterion and its type cannot be null"
-msgstr "O criterio e o seu tipo non poden ser nulos"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:tooltiptext="${i18n:_('Click
-#: on the icons to execute operation in order element')}"/>
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:73
 msgid "Click on the icons to execute operation in the order element"
 msgstr "Faga click nos iconos para executar a operación no elemento de pedido"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:110
-msgid "Value is not valid, the default max value must not be null"
-msgstr "O valor non é válido, o valor máximo por defecto non debe ser nulo"
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:14
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:25
+msgid "Category name"
+msgstr "Nome da categoría"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:312
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:383
 msgid "Create order"
 msgstr "Crear pedido"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:168
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:192
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:191
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:214
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:174
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:198
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:193
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:216
 msgid ""
 "End date is not valid, the new end date must be later the current end date"
 msgstr ""
 "A data de fin non é válida, a nova data de fin debe ser posterior á actual"
 
-#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:<customMenu
-#: top_id="customMenu" title="${i18n:_('Main menu')}"/>
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:39
 msgid "Main menu"
 msgstr "Menú principal"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/search/worker_search.zul:<label
-#: value="${i18n:_('Found workers')}"/>
-msgid "Found workers"
-msgstr "Traballadores encontrados"
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:37
+msgid "Zoom increase"
+msgstr "Aumento de zoom"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:130
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:130
 msgid "cannot include an Advance of the same Advance type twice"
 msgstr "non se pode asignar un avance do mesmo tipo dúas veces"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:224
-msgid "Label saved"
-msgstr "Etiqueta salvada"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:535
+msgid "Hour start"
+msgstr "Hora de inicio"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<label
-#: value="${i18n:_('Duration')}:" />
-msgid "Duration"
-msgstr "Duración"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<label
-#: value="${i18n:_('Elapsed Days')}" />
-msgid "Elapsed Days"
-msgstr "Días transcorridos"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:${i18n:_('Start')}
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:${i18n:_('Start')}
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<label
-#: value="${i18n:_('Start')}" />
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:52
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:51
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:126
 msgid "Start"
 msgstr "Comezo"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<button
-#: id="btnDown" label="${i18n:_('Down')}"
-msgid "Down"
-msgstr "Abaixo"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:357
+msgid "There exists other workReportType with the same name."
+msgstr "Xa existe outro tipo de parte de traballo co mesmo nome."
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:label="${i18n:_('Save
-#: &amp; Continue')}"/>
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:<button
-#: label="${i18n:_('Save Continue')}"
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<button
-#: onClick="controller.saveAndContinue()" />
-msgid "Save &amp; Continue"
-msgstr "Gardar e continuar"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<tab
-#: label="${i18n:_('Label')}" />
-msgid "Label"
-msgstr "Etiqueta"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/_legendOrderPlanner.zul:<n:label>${i18n:_('Capability')}</n:label>
-msgid "Capability"
-msgstr "Capacidade"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:115
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:tooltiptext="${i18n:_('Schedule')}"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:115
+#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:28
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:64
 msgid "Schedule"
 msgstr "Planificar"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:163
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:163
 msgid "Unexpected: {0}"
 msgstr "Inesperado: {0}"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:${i18n:_('Notes')}
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:${i18n:_('Notes')}
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/DefaultUserDetailsService.java:64
+msgid "User with login name '{0}': not found"
+msgstr "Usuario con login '{0}': non atopado"
+
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:60
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:59
 msgid "Notes"
 msgstr "Notas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:142
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:constraint="no
-#: empty:${i18n:_('cannot be null or empty')}" />
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:constraint="no
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:constraint="no
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:constraint="no
-msgid "cannot be null or empty"
-msgstr "non pode ser nulo ou baleiro"
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:36
+msgid "Resources capability"
+msgstr "Capacidade de recursos"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:395
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/DetailsOrderElementController.java:553
-msgid "Value is not valid, taking into account the current list of HoursGroup"
-msgstr "O valor non é válido, tendo en conta a lista actual de HoursGroup"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:151
+msgid "changing perspective"
+msgstr "cambio de perspectiva"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<panel
-#: title="${i18n:_('Hours group')}">
-msgid "Hours group"
-msgstr "Grupo de horas"
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:139
+msgid "Add New Label Type"
+msgstr "Engadir novo tipo de etiqueta"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:328
-msgid "Delete item. Are you sure?"
-msgstr "Borrar elemento. Está seguro?"
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:48
+msgid "Default calendar"
+msgstr "Calendario por defecto"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:137
-msgid "Edit machine"
-msgstr "Editar máquina"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:85
+msgid "Changes saved"
+msgstr "Cambios gardados"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:${i18n:_('End')}
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:${i18n:_('End')}
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:56
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:55
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:130
 msgid "End"
 msgstr "Fin"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:<column
-#: label="${i18n:_('Relationship')}"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:<column
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26
 msgid "Relationship"
 msgstr "Relación"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:149
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:182
 msgid "Work report saved"
-msgstr "Informe de traballo salvado"
+msgstr "Parte de traballo gardado"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:<radio
-#: id="createCopy" label="${i18n:_('Create copy of calendar')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:<radio
-msgid "Create copy of calendar"
-msgstr "Crear copia do calendario"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:290
+msgid "{0} must be after {1}"
+msgstr "{0} debe estar despois de {1}"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:275
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:562
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:566
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<button
-#: id="btnIndent" label="${i18n:_('Indent')}"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:275
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:667
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:32
 msgid "Indent"
 msgstr "Indentar"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:189
-msgid "Quality management"
-msgstr "Xestión da calidade"
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java:97
+msgid "type code has to be unique. It is already used"
+msgstr "o código do tipo debe ser único. Xa está en uso"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<window
-#: id="${arg.top_id}" title="${i18n:_('Orders list')}">
-msgid "Orders list"
-msgstr "Lista de pedidos"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:130
-msgid "Value is not valid, the Precision value must not be null "
-msgstr "Valor inválido, o valor de precisión non debe ser nulo "
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:214
-msgid "Resource cannot be null"
-msgstr "O recurso non pode ser nulo"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:382
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:463
 msgid "Not working day"
 msgstr "Día non laborable"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:127
 msgid "Base calendar \"{0}\" saved"
 msgstr "Calendario base \"{0}\" gardado"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:<tab
-#: visible="false" label="${i18n:_('Locations')}"></tab>
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:31
 msgid "Locations"
 msgstr "Ubicacións"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:88
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java:88
 msgid "The advanceType cannot be modified"
-msgstr "O advanceType non pode ser modificado"
+msgstr "O tipo de avance non pode ser modificado"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:59
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:title="${i18n:_('Resource
-#: allocation')}" width="600px" visible="false">
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<tab
-#: id="tbResourceAllocation" label="${i18n:_('Resource
-#: image="common/img/ico_bajar.png"/>
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java:59
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:86
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:91
 msgid "Resource allocation"
 msgstr "Asignación de recursos"
 
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:<panel
-#: title="${i18n:_('Label list')}"
-msgid "Label list"
-msgstr "Lista de etiquetas"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:376
+msgid "Exist other workReportType with the same code."
+msgstr "Xa existe outro tipo de parte de traballo co mesmo código."
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:120
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:133
-msgid "spread values are not valid, at least one value should be true"
-msgstr ""
-"os valores de propagación non son válidos, alo menos un debe ser verdadeiro"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:513
+msgid "Order Code"
+msgstr "Código de pedido"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<label
-#: value="${i18n:_('Create and assign label')}" />
-msgid "Create and assign label"
-msgstr "Crear e asignar etiqueta"
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:71
+msgid "Constraint"
+msgstr "Restrición"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:<comboitem
-#: label="${i18n:_('Current')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:<comboitem
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:12
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:14
 msgid "Current"
 msgstr "Actual"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:246
-msgid "Error on showing removing element: "
-msgstr "Erro ao mostrar o elemento a borrar: "
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:303
+msgid "Time finish cannot be null"
+msgstr "A hora de fin non pode ser nula"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:96
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:85
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:91
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:96
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:342
 msgid "Information"
 msgstr "Información"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:label="${i18n:_('Remove
-#: exception')}"
-msgid "Remove exception"
-msgstr "Borrar excepción"
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:39
+msgid "Zoom decrease"
+msgstr "Redución de zoom"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:147
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:155
 msgid "Worker saved"
 msgstr "Traballador gardado"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:<panel
-#: title="${i18n:_('Direct imputation')}">
-msgid "Direct imputation"
-msgstr "Imputación directa"
-
-#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:<edition
-#: top_id="createWindow" title="${i18n:_('Create new advance type')}"
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:36
 msgid "Create new advance type"
 msgstr "Crear un novo tipo de avance"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:38
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:37
+msgid "Criterion Requirement"
+msgstr "Requisito do criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java:320
+msgid "New hours group "
+msgstr "novo grupo de horas "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:54
 msgid "Company Scheduling"
 msgstr "Planificación da compañía"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:186
-msgid "Calendars"
-msgstr "Calendarios"
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:21
+msgid "Navalpro: Configuration"
+msgstr "Navalpro: Configuración"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:id="createNewVersion"
-#: title="${i18n:_('Create new version')}" >
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:label="${i18n:_('Create
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26
+msgid "Heading"
+msgstr "Cabeceira"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:22
 msgid "Create new version"
 msgstr "Crear versión nova"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<label
-#: value="${i18n:_('Mandatory')}" />
-msgid "Mandatory"
-msgstr "Obrigatorio"
-
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<listheader
-#: label="${i18n:_('Expiring Date')}" />
-msgid "Expiring Date"
-msgstr "Data de expiración"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:96
-msgid "Scheduling saved"
-msgstr "Planificación gardada"
-
-#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:<button
-#: label="${i18n:_('Add new row')}"
-msgid "Add new row"
-msgstr "Engadir nova fila"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:157
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:189
 msgid "Derived"
 msgstr "Derivado"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<button
-#: label="${i18n:_('Add new advance assignment')}"
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java:184
+msgid "a disabled resource has enabled subresources"
+msgstr "un recurso deshabilitado ten subrecursos habilitados"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:28
 msgid "Add new advance assignment"
-msgstr "Engadir nova asignación de avance"
+msgstr "engadir nova asignación de avance"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138
-msgid "Could not save new criterion"
-msgstr "No se puido gardar o novo criterio"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:228
+msgid "Could not save machine"
+msgstr "Non se puido gardar a máquina"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:140
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:169
+msgid "Unable to convert value to {0} type"
+msgstr "No se puido convertir o valor a tipo {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:145
 msgid "Worker must be not-null"
 msgstr "O traballador non debe ser nulo"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:description="${i18n:_('Show
-#: all order elements')}" />
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:41
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:46
 msgid "Show all order elements"
-msgstr "Mostrar tódolos elementos de pedido"
+msgstr "Mostrar todos os elementos de pedido"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:278
-msgid "Not indent"
-msgstr "Non indentar"
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialCategory.java:120
+msgid "material category name has to be unique. It is already used"
+msgstr "o nome da categoría de materiais debe ser único. Xa está en uso"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:253
-msgid "Unknow option {0} to create a resource calendar"
-msgstr "Opción descoñecida {0} ao crear un calendario de recursos"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:value="${i18n:_('Imputed
-#: hours'):}" />
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:117
 msgid "Imputed hours"
 msgstr "Horas imputadas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:188
-msgid "Responsible cannot be null"
-msgstr "O responsable non pode ser nulo"
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:42
+msgid "Worker assignments"
+msgstr "Asignacións de traballador"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<label
-#: value="${i18n:_('Required criteria')}:" />
-msgid "Required criteria"
-msgstr "Criterios necesarios"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:133
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:101
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:128
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:307
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:431
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:133
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:96
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:101
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java:128
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:307
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:453
 msgid "{0} already exists"
 msgstr "{0} xa existe"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:152
-msgid "Edit label type"
-msgstr "Editar tipo de etiqueta"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:139
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:388
+msgid "Confirm deleting this hour cost. Are you sure?"
+msgstr "Confirmar o borrado deste coste por hora. ¿Está seguro?"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:206
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:213
 msgid "Create Worker"
 msgstr "Crear traballador"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<label
-#: value="${i18n:_('Code ')}" />
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:341
+msgid "The order has no scheduled elements"
+msgstr "O pedido no ten elementos planificados"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:17
 msgid "Code "
 msgstr "Código"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<label
-#: class="subtitulo" value="${i18n:_('Non-assigned locations')}" />
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:47
 msgid "Non-assigned locations"
 msgstr "Ubicacións non asignadas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:357
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:380
 msgid ""
 "The {0} is not valid, criterionType overlaps with other "
 "criterionSatisfaction from the same criterionType"
@@ -659,85 +542,42 @@ msgstr ""
 "{0} non é válido, criterionType solápase con outro criterionSatisfaction do "
 "mesmo criterionType"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/_legendCompanyPlanner.zul:<n:label
-#: class="title">${i18n:_('Chart legend')}</n:label>
-#: ./navalplanner-webapp/src/main/webapp/planner/_legendOrderPlanner.zul:<n:label
-msgid "Chart legend"
-msgstr "Lenda do gráfico"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:842
+msgid "None"
+msgstr "Ningún"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:<treecol
-#: width="60px" align="center" label="${i18n:_('Active')}" />
-#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:<label
-#: value="${i18n:_('Active')}"
-msgid "Active"
-msgstr "Activo"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:864
+msgid "Configure"
+msgstr "Configurar"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/_legendOrderPlanner.zul:<n:label>${i18n:_('Other
-#: assignments')}</n:label>
-msgid "Other assignments"
-msgstr "Outras asignacións"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:<editWorkRelationship
-#: top_id="editWorkRelationshipWindow" title="${i18n:_('Edit work
-#: relationship')}"
-msgid "Edit work relationship"
-msgstr "Editar relación de traballo"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:<label
-#: value="${i18n:_('First name')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:<newdatasortablecolumn
-#: label="${i18n:_('First sort="auto(firstName)"/>
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:25
 msgid "First name"
 msgstr "Nome"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:261
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:539
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<button
-#: id="btnUnindent" label="${i18n:_('Unindent')}"
-msgid "Unindent"
-msgstr "Desindentar"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<panel
-#: title="${i18n:_('Direct labels')}" border="normal">
-msgid "Direct labels"
-msgstr "Etiquetas directas"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<button
-#: id="btnDelete" label="${i18n:_('Delete order element')}"
-msgid "Delete order element"
-msgstr "Borrar elemento de pedido"
-
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:<newdatasortablecolumn
-#: label="${i18n:_('Actions')}" />
-msgid "Actions"
-msgstr "Accións"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:56
-msgid "Order Scheduling"
-msgstr "Planificación de pedidos"
-
-#: ./navalplanner-webapp/src/main/webapp/common/event_error.zul:<window
-#: title="${i18n:__('Error',
-#: requestScope['javax.servlet.error.status_code'])}"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:883
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:95
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:409
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:21
 msgid "Error"
 msgstr "Erro"
 
-#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:<label
-#: value="${i18n:_('Precision')}" />
-msgid "Precision"
-msgstr "Precisión"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62
+msgid "Cost Performance Index"
+msgstr "Eficiencia en coste"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:99
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<button
-#: id="btnNew" label="${i18n:_('New order element')}"
-msgid "New order element"
-msgstr "Novo elemento de pedido"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:60
+msgid "ETC"
+msgstr "ETC"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:238
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:139
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:951
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:204
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:317
 msgid "Confirm deleting {0}. Are you sure?"
-msgstr "Confirmar o borrado de {0}. Está seguro?"
+msgstr "Confirmar o borrado de {0}. ¿Está seguro?"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:132
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:138
 msgid ""
 "Criterion is not valid, the criterion overlap other criterionSatisfaction "
 "whith same criterion"
@@ -745,24 +585,23 @@ msgstr ""
 "Criterion non é válido, outro criterionSatisfaction solápase co mesmo "
 "criterion"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<panel
-#: title="${i18n:_('Indirect labels')}" border="normal">
-msgid "Indirect labels"
-msgstr "Etiquetas indirectas"
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:52
+msgid "Log out"
+msgstr "Saír"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:232
-msgid "it must be no zero or must add more allocations"
-msgstr "non debe ser cero ou debe conter máis ubicacións"
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:23
+msgid "Add new configuration unit"
+msgstr "engadir nova unidade de configuración"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:172
-msgid ""
-"The calendar was not removed because it still has children. Some other "
-"calendar is derived from this one."
-msgstr ""
-"O calendario non foi borrado porque aínda ten fillos. Algún outro calendario "
-"deriva deste."
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:37
+msgid "Main preferences"
+msgstr "Preferencias principais"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:151
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:176
+msgid "The order {0} must be scheduled"
+msgstr "O pedido {0} debe ser planificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:153
 msgid ""
 "Criterion is not valid, it overlaps other criterionSatisfaction with the "
 "same criterion"
@@ -770,43 +609,36 @@ msgstr ""
 "Criterion non válido, outro criterionSatisfaction solápase co mesmo "
 "criterionType"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:140
-msgid "The order {0} must be scheduled"
-msgstr "O pedido {0} debe ser planificado"
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:45
+msgid "Add new worker assignment"
+msgstr "Engadir nova asignación de traballador"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:165
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:165
 msgid "Label type saved"
-msgstr "Tipo de etiqueta salvado"
+msgstr "Tipo de etiqueta gardado"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:113
-msgid "Create machine"
-msgstr "Crear máquina"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:463
+msgid "resources per day must be not empty and bigger than zero"
+msgstr "os recursos por día deben ser non baleiros e maiores que cero"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<listitem
-#: label="${i18n:_('Machine')}" value="MACHINE" />
-msgid "Machine"
-msgstr "Máquina"
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:23
+msgid "Edit type of work hour"
+msgstr "Editar tipo de horas de traballo"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:136
-msgid ""
-"Value is not valid, the Precision value must be less than the defalt max "
-"value "
-msgstr ""
-"O valor non é válido, o valor de precisión debe ser menor có valor máximo "
-"por defecto "
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:238
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<button
-#: id="btnUp" label="${i18n:_('Up')}"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:248
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:28
 msgid "Up"
 msgstr "Arriba"
 
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:<window
-#: id="${arg.top_id}" title="${i18n:_('Work Report types')}">
-msgid "Work Report types"
-msgstr "Tipos de informe de traballo"
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:111
+msgid "Total Estimated hours"
+msgstr "Horas totais estimadas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:155
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:21
+msgid "Work Report types"
+msgstr "Tipos de partes de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:157
 msgid ""
 "CriterionType is not valid, it overlaps other criterionSatisfaction with the "
 "same criterionType"
@@ -814,456 +646,267 @@ msgstr ""
 "CriterionType non válido, outro criterionSatisfaction solápase co mesmo "
 "criterionType"
 
-#: ./navalplanner-webapp/src/main/webapp/common/error.zul:<button
-#: id="reload" label="${i18n:_('Reload')}" />
-#: ./navalplanner-webapp/src/main/webapp/common/event_error.zul:<button
-msgid "Reload"
-msgstr "Recargar"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58
+msgid "EAC"
+msgstr "EAC"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:<window
-#: id="listing" title="${i18n:_('Criterion type list')}">
-msgid "Criterion type list"
-msgstr "Lista de tipos de criterio"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53
+msgid "Budgeted Cost Work Scheduled"
+msgstr "Coste de traballo presupostado planificado"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:186
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:50
+msgid "Name cannot be null or empty"
+msgstr "O nome non pode ser nulo ou baleiro"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:186
 msgid "The task '{0}' has some repeated Worker assigned"
 msgstr "A tarefa '{0}' ten asignado algún traballador repetido"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<treecol
-#: label="${i18n:_('Name and description')}" class="name"/>
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:69
 msgid "Name and description"
 msgstr "Nome e descrición"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<panel
-#: title="${i18n:_('Assigned resources')}" border="normal" style="margin-top:
-#: 5px" sclass="assignedresources">
-msgid "Assigned resources"
-msgstr "Recursos asignados"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionModel.java:142
+msgid "Some stretch has higher or equal values than the previous stretch"
+msgstr "Algún tramo ten valores maiores ou iguais có tramo anterior"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<button
-#: label="${i18n:_('Add new advance measurement')}"
-msgid "Add new advance measurement"
-msgstr "Engadir nova medida de avance"
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:16
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:68
+msgid "End date"
+msgstr "Data de fin"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:517
-msgid "Move up"
-msgstr "Mover arriba"
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:99
+msgid "Start Date"
+msgstr "Data de inicio"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:tooltiptext="${i18n:_('Not
-#: deletable')}" disabled="@{criterionType.immutable}">
-#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:tooltiptext="${i18n:_('Not
-#: disabled="@{advanceType.immutable}"
-#: onClick="controller.confirmRemove(self.parent.parent.value);">
-msgid "Not deletable"
-msgstr "Imborrable"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:<column
-#: label="${i18n:_('NIF')}" sort="auto(nif)" />
-#: ./navalplanner-webapp/src/main/webapp/resources/search/worker_search.zul:<listheader
-#: sort="auto"
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:<label
-#: value="${i18n:_('NIF')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:<newdatasortablecolumn
-msgid "NIF"
-msgstr "NIF"
-
-#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:<label
-#: value="${i18n:_('Criterion types')}" />
-msgid "Criterion types"
-msgstr "Tipos de criterio"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<tab
-#: label="${i18n:_('Worker search')}" image="common/img/ico_bajar.png"/>
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:92
 msgid "Worker search"
 msgstr "Búsqueda de traballadores"
 
-#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:tooltiptext="${i18n:_('Not
-#: editable')}" disabled="@{advanceType.immutable}"
-#: onClick="controller.goToEditForm(self.parent.parent.value);">
-msgid "Not editable"
-msgstr "Non editable"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56
+msgid "Cost Variance"
+msgstr "Desviación en coste"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:167
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:65
-msgid "Scheduling"
-msgstr "Planificación"
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:323
+msgid "criterion type does not allow resource hierarchy"
+msgstr "o tipo de criterio non permite xerarquía de recursos"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:<label
-#: value="${i18n:_('Total')}:" />
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:55
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:81
 msgid "Total"
 msgstr "Total"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:id="confirmRemove"
-#: title="${i18n:_('Confirmation')}" sizable="true"
-msgid "Confirmation"
-msgstr "Confirmación"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:198
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:81
+msgid "Invalidate"
+msgstr "Invalidar"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/search/worker_search.zul:<label
-#: value="${i18n:_('Criteria')}" />
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:39
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:100
 msgid "Criteria"
 msgstr "Criterios"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:47
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:46
 msgid "Order Details"
 msgstr "Detalles de pedido"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:value="${i18n:_('Budget
-#: hours')}:" />
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:111
 msgid "Budget hours"
-msgstr "Horas do presupuesto"
+msgstr "Horas do presuposto"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<label
-#: value="${i18n:_('Assign Label')}" />
-msgid "Assign Label"
-msgstr "Asignar etiqueta"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:65
+msgid "AS_SOON_AS_POSSIBLE"
+msgstr "TAN_PRONTO_COMO_SEXA_POSIBLE"
 
-#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:<window
-#: id="${arg.id}" title="${i18n:_('List label types')}">
-msgid "List label types"
-msgstr "Listar tipos de etiqueta"
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:43
+msgid "Lines"
+msgstr "Liñas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:45
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java:44
 msgid "Orders List"
 msgstr "Lista de pedidos"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:547
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:744
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1064
 msgid "OrderElement not found"
-msgstr "OrderElement non encontrado"
+msgstr "Elemento de pedido non atopado"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:175
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:187
+msgid "Error on showing warning message removing workReportType: "
+msgstr ""
+"Erro ao mostrar mensaxe de advertencia borrando tipo de parte de traballo: "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:214
 msgid "Could not save Machine"
 msgstr "Non se puido gardar a máquina"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:<newdatasortablecolumn
-#: label="${i18n:_('State')}" sort="auto(state)" width="70px" align="center"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:<column
-msgid "State"
-msgstr "Estado"
-
-#: ./navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul:<n:td
-#: class="usuario_clave">${i18n:_('Password')}</n:td>
-msgid "Password"
-msgstr "Contrasinal"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:<tab
-#: label="${i18n:_('Personal data')}"></tab>
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:29
 msgid "Personal data"
 msgstr "Datos persoais"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:638
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<combobox
-#: id="cbFilterType" value="${i18n:_('Show all')}"
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<comboitem
-#: label="${i18n:_('Show
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:194
+msgid "Work reports"
+msgstr "Partes de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:737
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:37
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:40
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:41
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:45
 msgid "Show all"
 msgstr "Mostrar todo"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:175
-msgid "Work reports"
-msgstr "Informes de traballo"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:222
-msgid "Código cannot be null"
-msgstr "Código non pode ser nulo"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:85
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java:85
 msgid "{0} annotation required on {1}"
 msgstr "{0} anotación obrigatoria en {1}"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:<label
-#: value="${i18n:_('Valid from')}" />
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<listheader
-#: label="${i18n:_('Valid
-msgid "Valid from"
-msgstr "Válido desde"
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:27
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52
+msgid "Default price"
+msgstr "Prezo por defecto"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:197
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:184
+msgid "Add Criterion"
+msgstr "Engadir criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:196
 msgid "Fattened Tree {0}"
-msgstr "Árbore aplanado {0}"
+msgstr "Árbore aplanada {0}"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:228
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:61
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:235
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:61
 msgid "MessagesContainer is needed"
 msgstr "É necesario un MessagesContainer"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:<column
-#: label="${i18n:_('Ending date')}" width="150px"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<column
-#: sort="auto(endDate)" />
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:<newdatasortablecolumn
-#: width="200px" align="center"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:<column
-#: date')}"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<label
-#: value="${i18n:_('Ending
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<column
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:21
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:24
 msgid "Ending date"
 msgstr "Data de fin"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:380
-msgid "Exception"
-msgstr "Excepción"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:209
+msgid "Manage cost categories"
+msgstr "Administrar categorías de coste"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:286
-msgid "Edit order"
-msgstr "Editar pedido"
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:31
+msgid "Create new order"
+msgstr "Crear pedido novo"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:<calendarEdition
-#: top_id="editCalendarWindow" title="${i18n:_('Edit Calendar')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:<calendarEdition
-#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:<edition
-#: top_id="editWindow"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:183
+msgid "General resource allocation"
+msgstr "Asignación de recursos xeral"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:46
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:39
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:43
 msgid "Edit Calendar"
 msgstr "Editar calendario"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java:63
-msgid "Merge"
-msgstr "Combinar"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:<comboitem
-#: label="${i18n:_('All')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:<comboitem
-msgid "All"
-msgstr "Todo"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:<button
-#: label="${i18n:_('Accept')}" id="acceptButton" />
-#: ./navalplanner-webapp/src/main/webapp/planner/main.zul:<button
-#: id="ok"
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<button
-#: id="splitOk"
-msgid "Accept"
-msgstr "Aceptar"
-
-#: ./navalplanner-webapp/src/main/webapp/calendars/_list.zul:<window
-#: id="${arg.top_id}" title="${i18n:_('Calendars List')}">
-msgid "Calendars List"
-msgstr "Lista de calendarios"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:constraint="no
-#: empty:${i18n:_('Cannot be empty or null')}" width="500px" /> width="150px"
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:14
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:20
 msgid "Cannot be empty or null"
 msgstr "Non pode ser baleiro ou nulo"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:172
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:182
-msgid "Edit Worker"
-msgstr "Editar traballador"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<label
-#: value="${i18n:_('Hierarchy')}" />
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:49
 msgid "Hierarchy"
 msgstr "Xerarquía"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: label="${i18n:_('Calculated')}"/>
-msgid "Calculated"
-msgstr "Calculado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:66
+msgid "C"
+msgstr "C"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:170
-msgid "Workers List"
-msgstr "Lista de traballadores"
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:26
+msgid "Overload due to other assignments"
+msgstr "Sobrecarga debido a outras asignacións"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:188
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168
-msgid "Criterion must be not-null"
-msgstr "O criterio non debe ser nulo"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<listitem
-#: label="${i18n:_('Worker')}" value="WORKER" />
-msgid "Worker"
-msgstr "Traballador"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:305
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:311
-msgid " The "
-msgstr " O "
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<chart
-#: id="chart" title="${i18n:_('Advance Progress')}"
-msgid "Advance Progress"
-msgstr "Progreso de avance"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:148
 msgid "Time period saved"
 msgstr "Período de tiempo gardado"
 
-#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:<tab
-#: label="${i18n:_('Report data')}"></tab>
-msgid "Report data"
-msgstr "Datos do informe"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56
+msgid "CV"
+msgstr "CV"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:264
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:264
 msgid "Not Unindent"
 msgstr "Non desindentar"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<tab
-#: label="${i18n:_('Order elements')}" />
-msgid "Order elements"
-msgstr "Elementos de pedido"
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:30
+msgid "Stretches function configuration"
+msgstr "Configuración da asignación por tramos"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<label
-#: value="${i18n:_('Order element name')}" />
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java:752
+msgid "Two assignments overlap in time"
+msgstr "Dúas asignacións solápanse no tempo"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:11
 msgid "Order element name"
 msgstr "Nome do elemento de pedido"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:352
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:<label
-#: value="${i18n:_('Code')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:<column
-#: label="${i18n:_('Code')}" sort="auto(code)"
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<treecol
-#: class="code"/>
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<column
-msgid "Code"
-msgstr "Código"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:<label
-#: class="subtitulo" value="${i18n:_('Filters')}:" />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:<label
-msgid "Filters"
-msgstr "Filtros"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:103
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:<workers
-#: top_id="workersComponent" title="${i18n:_('Workers')}"
-#: cancel_button_label="${i18n:_('Return')}"/>
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:103
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:41
 msgid "Workers"
 msgstr "Traballadores"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:216
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:456
+msgid "end date: {0} must be after start date: {1}"
+msgstr "data de fin: {0} debe ser posterior á data de inicio {1}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:216
 msgid "Advance measurements: "
 msgstr "Medidas de avance: "
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:188
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:188
-msgid ""
-"Start date is not valid, the new start date must be lower than the end date"
-msgstr ""
-"A data de inicio non é válida, a fecha de inicio nova debe ser anterior á "
-"data de fin"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:save_button_label="${i18n:_('Save
-#: changes')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:save_button_label="${i18n:_('Save
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:47
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:40
 msgid "Save changes"
 msgstr "Gardar cambios"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:414
-msgid "Hours for an exception day should be greater or equal than zero"
-msgstr "As horas para un día de excepción deben ser maiores ou iguais a cero"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:205
+msgid "Error on removing workReportType: "
+msgstr "Erro ao borrar tipo de parte de traballo: "
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:320
-msgid "Already exists other criterion with the same name"
-msgstr "Xa existe outro criterio co mesmo nome"
-
-#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:<label
-#: value="${i18n:_('Unit name')}" />
-msgid "Unit name"
-msgstr "Nome da unidade"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:242
-msgid "at least one no empty allocation is needed"
-msgstr "é necesaria alo menos unha asignación non baleira"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67
-msgid "Assigned"
-msgstr "Asignado"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:159
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:385
-msgid "Normal"
-msgstr "Normal"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:841
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:841
 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 có valor máximo"
+msgstr "O valor non é válido, o valor actual debe ser menor que o valor máximo"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<tab
-#: label="${i18n:_('Details')}" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:<tab
-#: id="tabDetails" label="${i18n:_('Details')}"></tab>
-msgid "Details"
-msgstr "Detalles"
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:122
+msgid "Day"
+msgstr "Día"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:183
-msgid "Date cannot be null"
-msgstr "A data non pode ser nula"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: label="${i18n:_('Value')}" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<newdatasortablecolumn
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:31
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:52
 msgid "Value"
 msgstr "Valor"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:478
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/Autocomplete.java:91
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:53
+msgid "Hour costs"
+msgstr "Costes por hora"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:684
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:919
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/Autocomplete.java:91
 msgid "Please, select an item"
 msgstr "Por favor, seleccione un elemento"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:<i18n
-#: value="Do you want to delete &quot;{0}&quot;?"
-msgid "Do you want to delete &quot;{0}&quot;?"
-msgstr "Quere borrar &quot;{0}&quot;?"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:250
-msgid ""
-"there are no workers for required criteria. So the generic allocation can't "
-"be done"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:525
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:966
+msgid "Exception end date should be greater or equals than start date"
 msgstr ""
-"Non hai traballadores cos criterios solicitados. Por tanto, non se pode "
-"facer a asignación xenérica"
+"A data de fin dunha excepción debe ser maior ou igual cá data de inicio"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<listheader
-#: label="${i18n:_('Parent')}" />
-msgid "Parent"
-msgstr "Pai"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:139
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:174
 msgid "Work report type saved"
-msgstr "Tipo de informe de traballo gardado"
+msgstr "Tipo de partes de traballo gardado"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplitTaskCommand.java:85
-msgid "Split task"
-msgstr "Dividir tarefa"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionModel.java:190
+msgid "Stretch date should be between task dates"
+msgstr "A data do tramo debe estar entre as datas da tarefa"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:<button
-#: id="add_new_criterion" label="${i18n:_('New criterion')}"
-msgid "New criterion"
-msgstr "Criterio novo"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:178
-msgid "Work report list"
-msgstr "Lista de informes de traballo"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<label
-#: value="${i18n:_('Description')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:<column
-#: label="${i18n:_('Description')}" sort="auto(description)"
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<column
-msgid "Description"
-msgstr "Descrición"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<button
-#: label="${i18n:_('Apply')}" id="applyButton" />
-msgid "Apply"
-msgstr "Aplicar"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/_legendOrderPlanner.zul:<n:label>${i18n:_('Load
-#: due to order')}</n:label>
-msgid "Load due to order"
-msgstr "Carga debido a pedido"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:354
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java:377
 msgid ""
 "The {0} can not be assigned to this resource. Its interval overlaps with "
 "other criterion"
@@ -1271,252 +914,116 @@ msgstr ""
 "O {0} non se pode asignar a este recurso. O seu intervalo solápase con outro "
 "criterio"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63
-msgid "Not found converter for {0}"
-msgstr "Non se atopou un conversor para {0}"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:63
+msgid "Schedule Performance Index"
+msgstr "Índice de rendemento da planificación"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:187
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:26
+msgid "Type data"
+msgstr "Datos do tipo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:207
 msgid "Label types"
 msgstr "Tipos de etiqueta"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:<workRelationships
-#: top_id="workRelationshipsWindow" title="${i18n:_('Work relationships')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:title="${i18n:_('Work
-#: save_button_label="${i18n:_('Save')}"
-msgid "Work relationships"
-msgstr "Relacións de traballo"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:205
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:245
+msgid "Indicators"
+msgstr "Indicadores"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:label="${i18n:_('Delete
-#: hours group')}"
-msgid "Delete hours group"
-msgstr "Borrar grupo de horas"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:286
+msgid "The order element code cannot be null"
+msgstr "O código do elemento de pedido non pode ser nulo"
 
-#: ./navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul:<n:td
-#: class="usuario_clave">${i18n:_('User')}</n:td>
-msgid "User"
-msgstr "Usuario"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:538
+msgid "Hour finish"
+msgstr "Hora de fin"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/DetailsOrderElementController.java:664
-msgid "At least one HoursGroup is needed"
-msgstr "É necesario alo menos un HoursGroup"
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:65
+msgid "Perspectives"
+msgstr "Perspectivas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:188
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:74
 msgid "Order"
 msgstr "Pedido"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<label
-#: value="${i18n:_('Multiple values per resource')}"/>
-msgid "Multiple values per resource"
-msgstr "Múltiples valores por recurso"
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:123
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:146
+msgid "Position"
+msgstr "Posición"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:120
-msgid "Work report deleted"
-msgstr "Informe de traballo borrado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:846
+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"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:136
-msgid "Create label type"
-msgstr "Crear tipo de etiqueta"
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:87
+msgid "Incorrect authentication"
+msgstr "Identificación incorrecta"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<label
-#: value="${i18n:_('Select the calendar')}" />
-msgid "Select the calendar"
-msgstr "Seleccionar o calendario"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:<tab
-#: visible="false" label="${i18n:_('Work record')}"></tab>
-msgid "Work record"
-msgstr "Rexistro de traballo"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174
-msgid "Criterion saved"
-msgstr "Criterio gardado"
-
-#: ./navalplanner-webapp/src/main/webapp/workreports/workReport.zul:<edition
-#: top_id="createWindow" title="${i18n:_('Edit work report')}"
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:36
 msgid "Edit work report"
-msgstr "Editar informe de traballo"
+msgstr "Editar parte de traballo"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:<column
-#: label="${i18n:_('Starting date')}" width="150px"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<listheader
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<column
-#: sort="auto(startDate)" />
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:<newdatasortablecolumn
-#: width="200px" align="center"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:<column
-#: date')}"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<label
-#: value="${i18n:_('Starting
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<column
-msgid "Starting date"
-msgstr "Data de inicio"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:748
+msgid "A description field of the same name already exists."
+msgstr "Xa existe un campo de descrición co mesmo nome."
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:153
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:113
-msgid "{0} not found type for criterion "
-msgstr "{0} non atopado tipo para criterio "
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:483
+msgid "Split new assignment"
+msgstr "Dividir nova asignación"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:<button
-#: label="${i18n:_('-')}" id="zoomDecrease"/>
-msgid "-"
-msgstr "-"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:518
-msgid "Function"
-msgstr "Función"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:<button
-#: label="${i18n:_('Cancel')}" id="cancelList"></button>
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:cancel_button_label="${i18n:_('Cancel')}"
-#: />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:<button
-#: onClick="controller.cancel();"
-#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:<button
-#: id="cancelButton"
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<button
-#: id="splitCancel"
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<button
-#: onClick="controller.cancel()"
-#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:cancel_button_label="${i18n:_('Cancel')}"
-#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:<button
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: label="${i18n:_('Current value')}"/>
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42
 msgid "Current value"
 msgstr "Valor actual"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:263
-msgid "Confirm scheduling {0}. Are you sure?"
-msgstr "Confirmar planificación {0}. Está seguro?"
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:167
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:214
+msgid "Expiry date"
+msgstr "Data de vencemento"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:172
-msgid "Machines List"
-msgstr "Lista de máquinas"
-
-#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:<n:td
-#: class="usuario">${i18n:_('user: admin')}</n:td>
-msgid "user: admin"
-msgstr "usuario: admin"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskCommand.java:69
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:474
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:352
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:tooltiptext="${i18n:_('Edit')}"
-#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:<edition
-#: top_id="editWindow" title="${i18n:_('Edit')}"
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:tooltiptext="${i18n:_('Edit')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<tab
-#: label="${i18n:_('Edit')}" width="850"></tab>
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:<button
-#: onClick="controller.workers.goToEditPage(self.getParent().getValue());"></button>
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:<edition
-#: top_id="editComponent"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:<edition
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:tooltiptext="${i18n:_('Edit')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:add_button_label="${i18n:_('Edit')}"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:tooltiptext="${i18n:_('Edit')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:tooltiptext="${i18n:_('Edit')}"
-#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:tooltiptext="${i18n:_('Edit')}"
-#: disabled="@{advanceType.immutable}"
-#: onClick="controller.goToEditForm(self.parent.parent.value);">
-#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:<tab
-#: label="${i18n:_('Edit')}"></tab>
-#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:tooltiptext="${i18n:_('Edit')}"
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:tooltiptext="${i18n:_('Edit')}"
-msgid "Edit"
-msgstr "Editar"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:<window
-#: id="${arg.top_id}" title="${i18n:_('Workers list')}">
-msgid "Workers list"
-msgstr "Lista de traballadores"
-
-#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:<label
-#: value="${i18n:_('Responsible')}:" />
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:<newdatasortablecolumn
-#: label="${i18n:_('Responsible')}" sort="auto(responsible)"
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<label
-#: value="${i18n:_('Responsible')}"
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<column
-msgid "Responsible"
-msgstr "Responsable"
-
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<listheader
-#: label="${i18n:_('By default')}" />
-msgid "By default"
-msgstr "Por defecto"
-
-#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:<edition
-#: top_id="createWindow" title="${i18n:_('Create Calendar')}"
-msgid "Create Calendar"
-msgstr "Crear Calendario"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:<tab
-#: label="${i18n:_('Configuration')}"></tab>
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:213
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:31
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:34
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:label="${i18n:_('Create
-#: calendar from scratch')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:label="${i18n:_('Create
-msgid "Create calendar from scratch"
-msgstr "Crear calendario desde cero"
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:48
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:41
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:121
+msgid "Categories"
+msgstr "Categorías"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:533
-msgid "Go to this calendar"
-msgstr "Ir a este calendario"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:80
+msgid "Unscheduled"
+msgstr "Non planificado"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:label="${i18n:_('Add
-#: new hours group')}"
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:139
 msgid "Add new hours group"
 msgstr "Engadir novo grupo de horas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:137
-msgid ""
-"CriterionType is not valid, the criterionType overlap other "
-"criterionSatisfaction whith same criterionType"
-msgstr ""
-"CriterionType non válido, o criterionType solápase con outro "
-"criterionSatisfaction co mesmo criterionType"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:164
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:211
-msgid ""
-"End date is not valid, the new end date must be greater than the start date"
-msgstr ""
-"Data de fin inválida, a data de fin nova debe ser posterior á data de inicio"
-
-#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:<label
-#: value="${i18n:_('Percentage')}" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: label="${i18n:_('Percentage')}"/> label="${i18n:_('Percentage')}"
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:58
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68
 msgid "Percentage"
 msgstr "Porcentaxe"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:tooltiptext="${i18n:_('Total
-#: order element hours')}" />
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:68
 msgid "Total order element hours"
 msgstr "Total de horas en elementos de pedido"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<label
-#: value="${i18n:_('Calculation type')}:" />
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:137
 msgid "Calculation type"
 msgstr "Tipo de cálculo"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:184
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<panel
-#: id="panelCriterions" title="${i18n:_('Manage criteria')}">
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:204
 msgid "Manage criteria"
 msgstr "Xestionar criterios"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:116
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:138
+msgid "No worker selected"
+msgstr "Ningún traballador seleccionado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:116
 msgid ""
 "Value is not valid, the Precision value must be less than the defalt max "
 "value and not null"
@@ -1524,212 +1031,1643 @@ msgstr ""
 "O valor non é válido, o valor de precisión debe ser menor có valor máximo "
 "por defecto e non debe ser nulo"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:114
-msgid "{0} (max: {1})"
-msgstr "{0} (máx: {1})"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/_legendCompanyPlanner.zul:<n:label>${i18n:_('Total
-#: capability')}</n:label>
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:38
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:28
 msgid "Total capability"
 msgstr "Capacidade total"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java:104
-msgid "{0} already assigned to resource allocation list"
-msgstr "{0} xa está na lista de asignación de recursos"
-
-#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:<?page
-#: title="${i18n:_('Navalpro: Calendars')}"?>
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21
 msgid "Navalpro: Calendars"
 msgstr "Navalpro: Calendarios"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<label
-#: class="subtitulo" value="${i18n:_('Log')}" />
-msgid "Log"
-msgstr "Diario"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:349
+msgid "Hours invested"
+msgstr "Horas invertidas"
 
-#: ./navalplanner-webapp/src/main/webapp/common/event_error.zul:<button
-#: id="continueWorking" label="${i18n:_('Continue')}" />
-#: ./navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:<button
-#: id="continue"
-msgid "Continue"
-msgstr "Continuar"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:345
+msgid "Advance"
+msgstr "Avance"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:<newdatasortablecolumn
-#: label="${i18n:_('Type')}" sort="auto(workReportType.name)"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<label
-#: value="${i18n:_('Type')}" />
-#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:<label
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: tooltiptext="Advance unit type"
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<label
-msgid "Type"
-msgstr "Tipo"
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:50
+msgid "Amount work percentage"
+msgstr "Porcentaxe de cantidade de traballo"
 
-#: ./navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul:<n:input
-#: name="button" type="submit" class="entrar" id="button"
-#: value="${i18n:_('Sign in')}" />
-msgid "Sign in"
-msgstr "Rexistrarse"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:description="${i18n:_('Filter
-#: all order elements by label')}" />
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:48
 msgid "Filter all order elements by label"
-msgstr "Filtrar tódolos elementos de pedido por etiqueta"
+msgstr "Filtrar todos os elementos de pedido por etiqueta"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplittingController.java:76
-msgid "The sum is not equal: {0}"
-msgstr "A suma non é igual: {0}"
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:90
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:123
+msgid "Exception Type"
+msgstr "Tipo de excepción"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:378
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:459
 msgid "Derived exception"
 msgstr "Excepción derivada"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:<panel
-#: title="${i18n:_('Associated Criteria')}" border="normal">
-msgid "Associated Criteria"
-msgstr "Criterios asignados"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java:186
+msgid "both {0} of category {1} and {2} of category {3} have the same code"
+msgstr "{0} da categoría {1} e {2} da categoría {3} teñen o mesmo código"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:<tab
-#: label="${i18n:_('Labels')}"></tab>
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:354
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:36
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationDTO.java:40
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:452
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<listitem
-#: label="${i18n:_('Generic')}" value="RESOURCE" />
-msgid "Generic"
-msgstr "Xenérico"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:847
-msgid "Value is not valid, the Precision value must be exact "
-msgstr "O valor non é válido, o valor de precisión debe ser exacto "
-
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<label
-#: value="${i18n:_('Total order hours')}:" />
-msgid "Total order hours"
-msgstr "Total de horas de pedido"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:139
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:139
 msgid "Couldn't find element: {0}"
-msgstr "No se puido atopar o elemento: {0}"
+msgstr "Non se puido atopar o elemento: {0}"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<tab
-#: label="${i18n:_('Data')}" id="dataTab" />
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21
+msgid "Navalpro: AdvanceTypes"
+msgstr "Navalpro: Tipos de avance"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60
 msgid "Data"
 msgstr "Datos"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<treecol
-#: label="${i18n:_('Estimated init')}" class="estimated_init"/>
-msgid "Estimated init"
-msgstr "Inicio estimado"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:237
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:277
+msgid "Select date:"
+msgstr "Seleccione data:"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<label
-#: value="${i18n:_('Total hours')}:" /> <label id="totalHoursLabel"/>
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<label
-#: hours')}"
-msgid "Total hours"
-msgstr "Horas totais"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:181
+msgid "Company view"
+msgstr "Vista da compañía"
 
-#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:<?page
-#: title="${i18n:_('Navalpro: AdvanceTypes')}"?>
-msgid "Navalpro: AdvanceTypes"
-msgstr "Navalpro: AdvanceTypes"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:511
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:952
+msgid "You should select a end date for the exception"
+msgstr "Debe seleccionar unha data de fin para a excepción"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<button
-#: id="unassignButton" label="${i18n:_('&gt;&gt;')}"></button>
-#: ./navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:<button
-#: label="${i18n:_('&gt;&gt;')}"
-msgid "&gt;&gt;"
-msgstr "&gt;&gt;"
-
-#: ./navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:<label
-#: value="${i18n:_('Default max value')}" />
-msgid "Default max value"
-msgstr "Valor máximo por defecto"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:109
 msgid "Unknown attribute '{0}' in class {1}"
 msgstr "Atributo descoñecido '{0}' na clase {1}"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:title="${i18n:_('Calendar
-#: allocation')}" width="600px"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java:57
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:197
 msgid "Calendar allocation"
 msgstr "Asignación de calendario"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:272
-msgid "Calculate End Date"
-msgstr "Calcular data de fin"
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:74
+msgid "Activation periods"
+msgstr "Períodos de activación"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:114
-msgid "please, select a label"
-msgstr "por favor, seleccione unha etiqueta"
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:74
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:159
+msgid "Category"
+msgstr "Categoría"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:117
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:155
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:97
+msgid "Order Element Information"
+msgstr "Información de elemento de pedido"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:23
+msgid "Edit cost category"
+msgstr "Editar categoría de coste"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:117
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:155
 msgid "already assigned"
 msgstr "xa asignado"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:<tab
-#: label="${i18n:_('Calendar')}"></tab>
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:<tab
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:33
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:30
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:90
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:169
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:<?page
-#: title="${i18n:_('Resources')}"?>
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:<?page
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:26
+msgid "Category data"
+msgstr "Datos de categoría"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:283
+msgid "[generic all workers]"
+msgstr "[xenérico todos os traballadores]"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:188
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:21
+#: navalplanner-webapp/src/main/webapp/resources/machine/machines.zul:21
 msgid "Resources"
 msgstr "Recursos"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java:279
-msgid "[generic all workers]"
-msgstr "[xenérico tódolos traballadores]"
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:144
+msgid "Search"
+msgstr "Buscar"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:228
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:227
 msgid "CriterionType and its criteria saved"
-msgstr "CriterionType e os seus criterios gardados"
+msgstr "Tipo de criterio e os seus criterios gardados"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:<newdatasortablecolumn
-#: label="${i18n:_('Criterion name')}" sort="auto(criterionAndType)"
-#: sortDirection="ascending"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:<column
-#: sortDirection="ascending" />
-msgid "Criterion name"
-msgstr "Nome do criterio"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:117
-msgid "values are not valid, the values must not be null"
-msgstr "os valores non son válidos, non deben ser nulos"
-
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<label
-#: value="${i18n:_('to')}" />
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:192
 msgid "to"
 msgstr "a"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154
-msgid ""
-"The name is not valid, there is another advance type with a similar name. "
-msgstr "O nome non é válido, xa hai outro tipo de avance cun nome similar. "
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/DetailsOrderElementController.java:478
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<listheader
-#: label="${i18n:_('%')}" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:<label
-#: value="${i18n:_('%')}"
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:126
 msgid "%"
 msgstr "%"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:cancel_button_label="${i18n:_('Remove
-#: calendar')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:cancel_button_label="${i18n:_('Remove
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:49
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:42
 msgid "Remove calendar"
 msgstr "Borrar calendario"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:349
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:82
+msgid "Order Element"
+msgstr "Elemento de pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:507
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:46
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:71
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:26
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33
+msgid "Resource"
+msgstr "Recurso"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:122
+msgid "Could not load any resource"
+msgstr "Non se puido cargar un recurso"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:34
+msgid "Material search"
+msgstr "Búsqueda de materiais"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:36
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:35
+msgid "Advances"
+msgstr "Avances"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:308
+msgid ""
+"You must allow multiple active criteria for this type to use this assignment "
+"strategy"
+msgstr ""
+"Debe permitir múltiples criterios activos para este tipo para usar esta "
+"estratexia de asignación"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:176
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:76
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:177
+msgid "Close"
+msgstr "Pechar"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:147
+msgid "Default Label"
+msgstr "Etiqueta por defecto"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:50
+msgid "Last name"
+msgstr "Apelidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:371
+msgid "Remove"
+msgstr "Borrar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:348
+msgid "Create copy"
+msgstr "Crear copia"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:21
+msgid "Criterions Requirement"
+msgstr "Requisito do criterio"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:49
+msgid "Length percentage"
+msgstr "Porcentaxe de lonxitude"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:62
+msgid "SPI"
+msgstr "SPI"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93
+msgid "Hours Management"
+msgstr "Administración de horas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:440
+msgid ""
+"there are no workers for required criteria: {0}. So the generic allocation "
+"can't be added"
+msgstr ""
+"non hai traballadores cos criterios solicitados: {0}. Por tanto, non se pode "
+"engadir a asignación xenérica"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:59
+msgid "Type of day"
+msgstr "Tipo de día"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:366
+msgid "the code must be not null or not empty"
+msgstr "o código non pode ser nulo ou baleiro"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:36
+msgid "Stretches list"
+msgstr "Lista de tramos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:201
+#: navalplanner-webapp/src/main/webapp/workreports/workReport.zul:37
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:36
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:72
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:47
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:36
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:42
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:47
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:50
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:44
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:77
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:120
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:37
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:88
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:80
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:69
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:61
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:123
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:40
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:44
+msgid "Save"
+msgstr "Gardar"
+
+#: navalplanner-webapp/src/main/webapp/common/error.zul:36
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:30
+msgid "Exit session"
+msgstr "Saír da sesión"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:30
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:52
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:66
+msgid "Group"
+msgstr "Grupo"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:54
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:25
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:26
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:57
+msgid "Enabled"
+msgstr "Activado"
+
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:38
+msgid "Edit advance type data"
+msgstr "Editar datos do tipo de avance"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:167
+msgid "Criterion previously selected"
+msgstr "Criterio seleccionado previamente"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:76
+msgid "Completely scheduled"
+msgstr "Completamente planificado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:238
+msgid "Order Element code cannot be null"
+msgstr "O código do elemento de pedido non pode ser nulo"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:35
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:34
+msgid "Assigned hours"
+msgstr "Horas asignadas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:810
+msgid "You are going to change the assignment function. Are you sure?"
+msgstr "Vai cambiar a función de asignación. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:38
+msgid "Assigned load"
+msgstr "Carga asignada"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:105
+msgid "End Date"
+msgstr "Data de fin"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:164
+msgid "Resources Per Day"
+msgstr "Recursos por día"
+
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:46
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:52
+msgid "Filter"
+msgstr "Filtro"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:187
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167
+msgid "ResourceType must be not-null"
+msgstr "ResourceType non debe ser nulo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionServiceREST.java:138
+msgid "criterion type name is used by another criterion type being imported"
+msgstr ""
+"o nome de tipo de criterio está sendo usado por outro tipo de criterio "
+"importado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:272
+msgid "Order saved"
+msgstr "Pedido gardado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:601
+msgid "Move down"
+msgstr "Mover abaixo"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:26
+msgid "Report structure"
+msgstr "Estrutura do parte"
+
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:43
+msgid "password not specified"
+msgstr "non se indicou un password"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:49
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:50
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:56
+msgid "Yes"
+msgstr "Si"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:25
+msgid "Assigned locations"
+msgstr "Ubicacións asignadas"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:32
+msgid "General data"
+msgstr "Datos xerais"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57
+msgid "BAC"
+msgstr "BAC"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:332
+msgid "Calculate Number of Hours"
+msgstr "Calcular número de horas"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:210
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:146
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:77
+msgid "Assign"
+msgstr "Asignar"
+
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java:121
+msgid "Two hour costs with the same type overlap in time"
+msgstr "Dous costes por hora co mesmo tipo solápanse no tempo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:70
+msgid "U"
+msgstr "N"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:63
+msgid "Ok"
+msgstr "Aceptar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54
+msgid "ACWP"
+msgstr "ACWP"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:49
+msgid "Add work relationship"
+msgstr "Engadir relación de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:164
+msgid "Advance type saved"
+msgstr "Tipo de avance gardado"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul:42
+msgid "START"
+msgstr "INICIO"
+
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:62
+msgid "Back"
+msgstr "Atrás"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:57
+msgid "Schedule Variance"
+msgstr "Desviación en planificación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:201
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:40
+msgid "Administration"
+msgstr "Administración"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:21
+msgid "Work report listing"
+msgstr "Listado de partes de traballo"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:46
+msgid "Cancel and return"
+msgstr "Cancelar e volver"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:41
+msgid "Edit worker"
+msgstr "Editar traballador"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:409
+msgid "Delete item {0}. Are you sure?"
+msgstr "Borrar elemento {0}. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:185
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:876
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:57
+msgid "Warning"
+msgstr "Advertencia"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:758
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:42
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:47
+msgid "Filter by Label"
+msgstr "Filtrar por etiqueta"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:34
+#: navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:29
+msgid "Select parent calendar"
+msgstr "Seleccionar o calendario pai"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:64
+msgid "Hours of day"
+msgstr "Horas do día"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:849
+msgid "Stretches"
+msgstr "Tramos"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:154
+msgid "Allocations"
+msgstr "Asignacións"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47
+msgid "Show"
+msgstr "Mostrar"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:30
+msgid "Assignment Type"
+msgstr "Tipo de asignación"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:122
+msgid "Length"
+msgstr "Lonxitude"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:336
+msgid "Create derived"
+msgstr "Crear derivado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:417
+msgid "it must be greater than zero"
+msgstr "debe ser maior que cero"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129
+msgid "must be a real positive number"
+msgstr "debe ser un número real positivo"
+
+#: navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/index.zul:21
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:21
+msgid "Navalpro: Scheduling"
+msgstr "Navalpro: planificación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:187
+msgid "Removed calendar \"{0}\""
+msgstr "Borrado calendario \"{0}\""
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:43
+#: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:43
+msgid "&lt;&lt;"
+msgstr "&lt;&lt;"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:87
+msgid "START_IN_FIXED_DATE"
+msgstr "COMEZAR_EN_DATA_FIXA"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:875
+msgid "You need to select some function to configure"
+msgstr "Necesita seleccionar algunha función para configurar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:60
+msgid "as soon as possible"
+msgstr "tan pronto como sexa posible"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:26
+msgid "Surname"
+msgstr "Apelidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:351
+msgid "the name must be not null or not empty"
+msgstr "o nome non pode ser nulo ou baleiro"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:501
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:42
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:25
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:48
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:69
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:77
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32
+msgid "Date"
+msgstr "Data"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:34
+msgid "Human hours per machine working hour within configuration unit"
+msgstr ""
+"Horas humanas por hora de traballo de máquina dentro de unidade de "
+"configuración"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:45
+msgid "New work report"
+msgstr "Novo parte de traballo"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:66
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:76
+msgid "Order lines imputation"
+msgstr "Imputación de liñas de pedido"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:23
+msgid "Advance assignments"
+msgstr "Asignaciones de avances"
+
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:28
+msgid "Edit order element"
+msgstr "Editar elemento de pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:314
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:327
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:315
+msgid "The criterion and its type cannot be null"
+msgstr "O criterio e o seu tipo non poden ser nulos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:200
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:77
+msgid "Validate"
+msgstr "Validar"
+
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:32
+msgid "Save order"
+msgstr "Gardar pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:110
+msgid "Value is not valid, the default max value must not be null"
+msgstr "O valor non é válido, o valor máximo por defecto non debe ser nulo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:148
+msgid "Error on removing element: "
+msgstr "Erro ao borrar elemento: "
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:34
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:3
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:32
+msgid "Cost category assignment"
+msgstr "Asignación de categoría de coste"
+
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:57
+msgid "Found workers"
+msgstr "Traballadores atopados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:224
+msgid "Label saved"
+msgstr "Etiqueta gardada"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:103
+msgid "Split assignment"
+msgstr "Dividir asignación"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:26
+msgid "Down"
+msgstr "Abaixo"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:37
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:74
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:80
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:91
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:71
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:125
+msgid "Save &amp; Continue"
+msgstr "Gardar e continuar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:918
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:37
+msgid "Label"
+msgstr "Etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:224
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:241
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:142
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:127
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:93
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:43
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:70
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:42
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:43
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:49
+#: navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul:38
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:81
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:43
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:35
+msgid "cannot be null or empty"
+msgstr "non pode ser nulo ou baleiro"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:537
+msgid "Value is not valid, taking into account the current list of HoursGroup"
+msgstr "O valor non é válido, tendo en conta a lista actual de HoursGroup"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:357
+msgid "Calculate Resources per Day"
+msgstr "Calcular recursos por día"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:116
+msgid "Hours group"
+msgstr "Grupo de horas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:980
+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/planner/chart/EarnedValueChartFiller.java:59
+msgid "Estimate At Completion"
+msgstr "Estimación de coste total actual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:194
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:328
+msgid "Delete item. Are you sure?"
+msgstr "Borrar elemento. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:173
+msgid "Edit machine"
+msgstr "Editar máquina"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
+msgid "Estimate To Complete"
+msgstr "Estimación do coste pendente"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:234
+msgid ""
+"Are you sure of changing the resource type? You will lose the criterions "
+"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/orders/CriterionRequirementWrapper.java:27
+msgid "Indirect"
+msgstr "Indirecto"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:24
+msgid "Assigned Criterion Requirements"
+msgstr "Requisitos do criterio asignados"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:86
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:71
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:157
+msgid "Unit type"
+msgstr "Tipo de unidade"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:27
+msgid "Order code"
+msgstr "Código de pedido"
+
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/Material.java:123
+msgid "materialcode has to be unique. It is already used"
+msgstr "o código do material debe ser único. Xa está en uso"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java:25
+msgid "Direct"
+msgstr "Directo"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:41
+msgid "Load due to other assignments"
+msgstr "Carga debido a outras asignacións"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:73
+msgid "Work week"
+msgstr "Semana de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:102
+msgid "You will lose the changes. Are you sure?"
+msgstr "Perderanse os cambios. ¿Está seguro?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:216
+msgid "Quality management"
+msgstr "Xestión da calidade"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:185
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:21
+msgid "Orders list"
+msgstr "Lista de pedidos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:130
+msgid "Value is not valid, the Precision value must not be null "
+msgstr "Valor inválido, o valor de precisión non debe ser nulo "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:232
+msgid "Resource cannot be null"
+msgstr "O recurso non pode ser nulo"
+
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:91
+msgid "login name is already being used by another user"
+msgstr "o nome de usuario xa está sendo usado"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:123
+msgid "Criterion Requirements"
+msgstr "Requisitos do criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:103
+msgid "Confirm cancel"
+msgstr "Confirmar cancelación"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:53
+msgid "OrderElement Code"
+msgstr "Código do elemento de pedido"
+
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:50
+msgid "Label list"
+msgstr "Lista de etiquetas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:120
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:133
+msgid "spread values are not valid, at least one value should be true"
+msgstr ""
+"os valores de propagación non son válidos, alo menos un debe ser verdadeiro"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:85
+msgid "Create and assign label"
+msgstr "Crear e asignar etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:56
+msgid "SV"
+msgstr "SV"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:959
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:212
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:146
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:396
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:247
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:325
+msgid "Error on showing removing element: "
+msgstr "Erro ao mostrar o elemento a borrar: "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:71
+msgid "start not earlier than"
+msgstr "empezar non antes de"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:882
+msgid "Unknown assignment function: "
+msgstr "Función de asignación descoñecida: "
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:21
+msgid "Cost categories listing"
+msgstr "Listado de categorías de coste"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:26
+msgid "Direct imputation"
+msgstr "Imputación directa"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:66
+msgid "Price per hour"
+msgstr "Prezo por hora"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:206
+msgid "Calendars"
+msgstr "Calendarios"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:29
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:39
+msgid "Mandatory"
+msgstr "Obrigatorio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:264
+msgid "The date cannot be null"
+msgstr "A data non pode ser nula"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:96
+msgid "Scheduling saved"
+msgstr "Planificación gardada"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:78
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:6
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:57
+msgid "Add new row"
+msgstr "Engadir nova fila"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:138
+msgid "Could not save new criterion"
+msgstr "Non se puido gardar o novo criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:521
+msgid "Sum of all rows"
+msgstr "Suma de todas as filas"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:33
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul:33
+msgid "Overload"
+msgstr "Sobrecarga"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:278
+msgid "Not indent"
+msgstr "Non indentar"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:46
+msgid "Load due to current order"
+msgstr "Carga debido ao pedido actual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:152
+msgid "Edit label type"
+msgstr "Editar tipo de etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionModel.java:147
+msgid ""
+"Last stretch should have one hundred percent for length and amount of work "
+"percentage"
+msgstr ""
+"O último tramo debe ter 100% de porcentaxes de lonxitude e cantidade de "
+"traballo"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:31
+msgid "Each worker configuration unit name"
+msgstr "Nome da unidade de configuración de cada traballador"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:39
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:40
+msgid "Active"
+msgstr "Activo"
+
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:304
+msgid "criterion type name is already being used"
+msgstr "o nome de tipo de criterio está sendo usado"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:46
+msgid "Edit work relationship"
+msgstr "Editar relación de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:261
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:646
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:30
+msgid "Unindent"
+msgstr "Desindentar"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:46
+msgid "Direct labels"
+msgstr "Etiquetas directas"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:34
+msgid "Delete order element"
+msgstr "Borrar elemento de pedido"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:79
+msgid "Log in"
+msgstr "Entrar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java:56
+msgid "Order Scheduling"
+msgstr "Planificación de pedidos"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:29
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26
+msgid "Actions"
+msgstr "Accións"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java:94
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:24
+msgid "New order element"
+msgstr "Novo elemento de pedido"
+
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:49
+msgid "Precision"
+msgstr "Precisión"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:72
+msgid "Exceptions"
+msgstr "Excepcións"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:25
+msgid "Indirect labels"
+msgstr "Etiquetas indirectas"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:65
+msgid "Scheduling state"
+msgstr "Estado de planificación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:177
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:280
+msgid "The init date cannot be empty"
+msgstr "A data de inicio non pode ser baleira"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:172
+msgid ""
+"The calendar was not removed because it still has children. Some other "
+"calendar is derived from this one."
+msgstr ""
+"O calendario non foi borrado porque aínda ten fillos. Algún outro calendario "
+"deriva deste."
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:149
+msgid "Create machine"
+msgstr "Crear máquina"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:136
+msgid ""
+"Value is not valid, the Precision value must be less than the defalt max "
+"value "
+msgstr ""
+"O valor no es válido, o valor de precisión debe ser menor que o valor máximo "
+"por defecto "
+
+#: navalplanner-webapp/src/main/webapp/common/error.zul:35
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:29
+msgid "Reload"
+msgstr "Recargar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java:370
+msgid ""
+"Value is not valid.\n"
+" Code cannot contain chars like '_'."
+msgstr ""
+"O valor no es válido.\n"
+" o código no pode conter caracteres como '_'."
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:21
+msgid "Criterion type list"
+msgstr "Lista de tipos de criterio"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:132
+msgid "Hours Group"
+msgstr "Grupo de horas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:899
+msgid "Unallocated name"
+msgstr "Nome no asignado"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:58
+msgid "Add new advance measurement"
+msgstr "Engadir nova medida de avance"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:429
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:292
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:43
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:47
+msgid "Not deletable"
+msgstr "Imborrable"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:623
+msgid "Move up"
+msgstr "Mover arriba"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul:63
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:55
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:27
+msgid "NIF"
+msgstr "NIF"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55
+msgid "BCWP"
+msgstr "BCWP"
+
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:40
+msgid "Not editable"
+msgstr "Non editable"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:180
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:231
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java:68
+msgid "Scheduling"
+msgstr "Planificación"
+
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java:46
+msgid "user roles not specified"
+msgstr "roles do usuario non especificados"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:85
+msgid "Dependencies have priority"
+msgstr "As dependencias teñen prioridade"
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:48
+msgid "Confirmation"
+msgstr "Confirmación"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:58
+msgid "Budget At Completion"
+msgstr "Total coste planificado"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:73
+msgid "Assign Label"
+msgstr "Asignar etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:184
+msgid ""
+"Cannot delete work report type. There are some work reports bound to it."
+msgstr ""
+"Non se pode borrar o tipo de parte de traballo. Hai algún parte de traballo "
+"ligado a el."
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:21
+msgid "Type of work hours listing"
+msgstr "Listado de tipos de horas de traballo"
+
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:21
+msgid "List label types"
+msgstr "Listar tipos de etiqueta"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:22
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:25
+msgid "State"
+msgstr "Estado"
+
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:70
+msgid "Must start after"
+msgstr "Debe empezar despois"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:115
+msgid "Add New Description Field"
+msgstr "Engadir novo campo de descrición"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:66
+msgid "Password"
+msgstr "Contrasinal"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:811
+msgid "Confirm change"
+msgstr "Confirmar cambio"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:26
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:166
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:189
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:213
+msgid "Valid from"
+msgstr "Válido desde"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:461
+msgid "Exception"
+msgstr "Excepción"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:354
+msgid "Edit order"
+msgstr "Editar pedido"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:280
+msgid "Cannot insert material in general view. Please, select a category"
+msgstr ""
+"Non se pode insertar material na vista xeral. Por favor, seleccione unha "
+"categoría"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:51
+msgid "user"
+msgstr "usuario"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:11
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:13
+msgid "All"
+msgstr "Todo"
+
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26
+msgid "Type name"
+msgstr "Nome do tipo"
+
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:33
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:79
+#: navalplanner-webapp/src/main/webapp/planner/main.zul:65
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:81
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:185
+msgid "Accept"
+msgstr "Aceptar"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:21
+msgid "Calendars List"
+msgstr "Lista de calendarios"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:478
+msgid ""
+"Create new material assignment out of material assignment {0}. Are you sure?"
+msgstr ""
+"Crear nova asignación de material fóra da asignación de material {0}. ¿Está "
+"seguro?"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:178
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:188
+msgid "Edit Worker"
+msgstr "Editar traballador"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:74
+msgid "Work report lines"
+msgstr "Liñas do parte de traballo"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:218
+msgid "Create activation period"
+msgstr "Crear período de activación"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46
+msgid "Calculated"
+msgstr "Calculado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:189
+msgid "Workers List"
+msgstr "Lista de traballadores"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:188
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:168
+msgid "Criterion must be not-null"
+msgstr "O criterio non debe ser nulo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:309
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java:315
+msgid " The "
+msgstr " O "
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:38
+msgid "Access to the system"
+msgstr "Acceso ao sistema"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:74
+msgid "Advance Progress"
+msgstr "Progreso de avance"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:28
+msgid "External overload"
+msgstr "Sobrecarga externa"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:26
+msgid "Report data"
+msgstr "Datos do parte"
+
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:43
+msgid "External load"
+msgstr "Carga externa"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:33
+msgid "Order elements"
+msgstr "Elementos de pedido"
+
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:288
+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/webapp/workreports/_editWorkReportType.zul:50
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:43
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:25
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:83
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:25
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:55
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:68
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:155
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:66
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:26
+msgid "Code"
+msgstr "Código"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:8
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:10
+msgid "Filters"
+msgstr "Filtros"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:289
+msgid "Materials saved"
+msgstr "Materiais gardados"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:40
+msgid "Add stretch"
+msgstr "Engadir tramo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:194
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:190
+msgid ""
+"Start date is not valid, the new start date must be lower than the end date"
+msgstr ""
+"A data de inicio non é válida, a data de inicio nova debe ser anterior á "
+"data de fin"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:537
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:978
+msgid "Hours for an exception day should be greater or equal than zero"
+msgstr "As horas para un día de excepción deben ser maiores o iguais a cero"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:52
+msgid "Start date"
+msgstr "Data de inicio"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:135
+msgid "Update exception"
+msgstr "Actualizar excepción"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:320
+msgid "Already exists other criterion with the same name"
+msgstr "Xa existe outro criterio co mesmo nome"
+
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:36
+msgid "Unit name"
+msgstr "Nome da unidade"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:45
+msgid "Code cannot be null or empty"
+msgstr "O código non pode ser nulo ou baleiro"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:103
+msgid "Disable Delete"
+msgstr "Deshabilitar borrado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:67
+msgid "Assigned"
+msgstr "Asignado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:191
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:466
+msgid "Normal"
+msgstr "Normal"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:34
+#: navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:33
+msgid "Details"
+msgstr "Detalles"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:226
+msgid "Date cannot be null"
+msgstr "A data non pode ser nula"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:154
+msgid ""
+"The name is not valid, there is another advance type with the same name. "
+msgstr "O nome non é válido, xa hai outro tipo de avance co mesmo nome. "
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:52
+msgid "Do you want to delete &quot;{0}&quot;?"
+msgstr "¿Quere borrar &quot;{0}&quot;?"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:165
+msgid "Parent"
+msgstr "Pai"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:203
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:243
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:48
+msgid "Load"
+msgstr "Carga"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27
+msgid "New criterion"
+msgstr "Criterio novo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:197
+msgid "Work report list"
+msgstr "Lista de partes de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:112
+msgid "Type of work hours saved"
+msgstr "Tipo de horas de traballo gardado"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:60
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:53
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:27
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:84
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:79
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
+msgid "Description"
+msgstr "Descrición"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:187
+msgid "Apply"
+msgstr "Aplicar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java:63
+msgid "Not found converter for {0}"
+msgstr "Non se atopou un conversor para {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java:82
+msgid "start in fixed date"
+msgstr "comezar en data fixa"
+
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:108
+msgid "Descripiton Fields"
+msgstr "Campos de descrición"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:446
+msgid "already exists an allocation for criteria {0}"
+msgstr "xa existe unha asignación para os criterios {0}"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:906
+msgid "Text field"
+msgstr "Campo de texto"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:44
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:69
+msgid "Work relationships"
+msgstr "Relacións de traballo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java:409
+msgid "At least one HoursGroup is needed"
+msgstr "É necesario alo menos un HoursGroup"
+
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:57
+msgid "User"
+msgstr "Usuario"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:45
+msgid "Multiple values per resource"
+msgstr "Múltiples valores por recurso"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:198
+msgid "Create new work week"
+msgstr "Crear nova semana de traballo"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:102
+msgid "Split"
+msgstr "Dividir"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:136
+msgid "Create label type"
+msgstr "Crear tipo de etiqueta"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:32
+msgid "Work record"
+msgstr "Rexistro de traballo"
+
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:202
+msgid "Select the calendar"
+msgstr "Seleccionar o calendario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:174
+msgid "Criterion saved"
+msgstr "Criterio gardado"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:20
+#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:59
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:23
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:27
+msgid "Starting date"
+msgstr "Data de inicio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:311
+msgid "Hours cannot be null"
+msgstr "As horas non poden ser nulas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:153
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:113
+msgid "{0} not found type for criterion "
+msgstr "{0} non atopado tipo para criterio "
+
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java:338
+msgid "resource type does not allow enabled criteria"
+msgstr "o tipo de recurso non permite criterios habilitados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:566
+msgid "Function"
+msgstr "Función"
+
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:38
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:42
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:48
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:65
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:70
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:83
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:94
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:84
+#: navalplanner-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:73
+#: navalplanner-webapp/src/main/webapp/common/configuration.zul:63
+#: navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:34
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:81
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:188
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:212
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:127
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:42
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:46
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:33
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul:31
+msgid "Unschedule"
+msgstr "Quitar planificación"
+
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:69
+msgid "Accumulated hours chart"
+msgstr "Gráfico de horas acumuladas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:191
+msgid "Machines List"
+msgstr "Lista de máquinas"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:61
+msgid "CPI"
+msgstr "CPI"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:93
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:573
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:360
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:35
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:39
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:41
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:25
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:32
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:37
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:39
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:35
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:48
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:41
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:38
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:38
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:37
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:24
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:34
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:40
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:34
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:51
+msgid "Edit"
+msgstr "Editar"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:21
+msgid "Workers list"
+msgstr "Lista de traballadores"
+
+#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:15
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:67
+msgid "Init date"
+msgstr "Data de inicio"
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:69
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:31
+msgid "Responsible"
+msgstr "Responsable"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:156
+msgid "By default"
+msgstr "Por defecto"
+
+#: navalplanner-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:17
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:70
+msgid "Units"
+msgstr "Unidades"
+
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:39
+msgid "Create Calendar"
+msgstr "Crear Calendario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionModel.java:138
+msgid "At least one stretch is needed"
+msgstr "Necesítase alo menos un tramo"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskCommand.java:74
+msgid "Task Properties"
+msgstr "Propiedades da tarefa"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:143
+msgid ""
+"CriterionType is not valid, the criterionType overlap other "
+"criterionSatisfaction whith same criterionType"
+msgstr ""
+"CriterionType non válido, o criterionType solápase con outro "
+"criterionSatisfaction co mesmo criterionType"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:140
+msgid "Cost category saved"
+msgstr "Categoría de coste gardada"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:170
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:213
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java:236
+msgid ""
+"End date is not valid, the new end date must be greater than the start date"
+msgstr ""
+"Data de fin inválida, a data de fin nova debe ser posterior á data de inicio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java:137
+msgid "Unable to convert {0} value to {1} type"
+msgstr "Non se puido convertir o valor {0} ao tipo {1}"
+
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:85
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:72
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:158
+msgid "Unit price"
+msgstr "Prezo da unidade"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java:114
+msgid "{0} (max: {1})"
+msgstr "{0} (máx: {1})"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java:422
+msgid "{0} already assigned to resource allocation list"
+msgstr "{0} xa está na lista de asignación de recursos"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:62
+msgid "Log"
+msgstr "Diario"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:319
+msgid "The type of hours cannot be null."
+msgstr "O tipo de horas no pode ser nulo."
+
+#: navalplanner-webapp/src/main/webapp/common/event_error.zul:28
+#: navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul:35
+msgid "Continue"
+msgstr "Continuar"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java:53
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34
+#: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:28
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:40
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:54
+#: navalplanner-webapp/src/main/webapp/costcategories/_editCostCategory.zul:65
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:39
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:124
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:40
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:38
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:176
+msgid "Type"
+msgstr "Tipo"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:92
+msgid "Total Hours OrderElement"
+msgstr "Total de horas do elemento de pedido"
+
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:21
+msgid "Associated Criteria"
+msgstr "Criterios asignados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java:49
+msgid "Generic"
+msgstr "Xenérico"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:847
+msgid "Value is not valid, the Precision value must be exact "
+msgstr "O valor non é válido, o valor de precisión debe ser exacto "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:53
+msgid "BCWS"
+msgstr "BCWS"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/SchedulingStateToggler.java:68
+msgid "P"
+msgstr "P"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:518
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:959
+msgid "Exception start date should be greater than current date"
+msgstr "A data de inicio da excepción debe ser maior cá data actual"
+
+#: scripts/../navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Machine.java:93
+msgid "machine code has to be unique. It is already used"
+msgstr "o código de máquina debe ser único. Xa está sendo usado"
+
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:31
+msgid "Add criterion requirement"
+msgstr "Engadir requisito de criterio"
+
+#: navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44
+msgid "Default max value"
+msgstr "Valor máximo por defecto"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:42
+#: navalplanner-webapp/src/main/webapp/common/components/twowayselector.zul:45
+msgid "&gt;&gt;"
+msgstr "&gt;&gt;"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:344
+msgid "Calculate End Date"
+msgstr "Calcular data de fin"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java:114
+msgid "please, select a label"
+msgstr "por favor, seleccione unha etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:211
+msgid "Manage types of work hours"
+msgstr "Administrar tipos de horas de traballo"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:19
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:22
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:38
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26
+msgid "Criterion name"
+msgstr "Nome do criterio"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:143
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java:115
+msgid "The following errors were found: "
+msgstr "Atopáronse os seguintes errores: "
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:54
+msgid "Actual Cost Work Performed"
+msgstr "Coste de traballo realizado"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:117
+msgid "values are not valid, the values must not be null"
+msgstr "os valores non son válidos, non deben ser nulos"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:459
 msgid ""
 "Value is not valid.\n"
 " Code cannot contain chars like '_' \n"
@@ -1739,462 +2677,310 @@ msgstr ""
 " O código non pode conter caracteres como '_' \n"
 " e non debe ser baleiro"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:118
+msgid "Task information"
+msgstr "Información de tarefa"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/TwoWaySelector.java:78
 msgid "Unassigned"
 msgstr "Non asignado"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:<label
-#: value="${i18n:_('Select the date from which new version will be valid')}"
-#: />
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:100
+msgid "Add new criterion requirement"
+msgstr "Engadir novo requisito de criterio"
+
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:24
 msgid "Select the date from which the new version will be valid"
 msgstr "Seleccione a data a partir da cal a versión nova será válida"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul:<button
-#: label="${i18n:_('+')}" id="zoomIncrease"/>
-msgid "+"
-msgstr "+"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:55
+msgid "Budgeted Cost Work Performed"
+msgstr "Coste presupostado do traballo realizado"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:350
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:<column
-#: label="${i18n:_('Resource')}" />
-msgid "Resource"
-msgstr "Recurso"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:<radio
-#: id="createDerived" label="${i18n:_('Create derived calendar')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:<radio
-msgid "Create derived calendar"
-msgstr "Crear calendario derivado"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java:122
-msgid "Could not load any resource"
-msgstr "Non se puido cargar un recurso"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:123
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:add_button_label="${i18n:_('Add')}"/>
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java:123
+#: navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:51
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:53
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:76
 msgid "Add"
 msgstr "Engadir"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<tab
-#: id="tabAdvances" label="${i18n:_('Advances')}" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:<tab
-#: label="${i18n:_('Advances')}"></tab>
-msgid "Advances"
-msgstr "Avances"
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:87
+msgid "Disabled"
+msgstr "Deshabilitado"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<button
-#: label="${i18n:_('Advance allocation')}"
-msgid "Advance allocation"
-msgstr "Asignación de avances"
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:55
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:123
+msgid "Unselect"
+msgstr "Deseleccionar"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java:303
-msgid ""
-"You must allow multiple active criteria for this type to use this assignment "
-"strategy"
-msgstr ""
-"Debe permitir múltiples criterios activos para este tipo para usar esta "
-"estratexia de asignación"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:204
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:244
+msgid "Earned value"
+msgstr "Valor gañado"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:213
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:415
+msgid "Error on showing delete materialAssignment: "
+msgstr "Erro ao mostrar o borrado da asignación de material: "
+
+#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:64
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:33
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:71
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:29
+msgid "Deadline"
+msgstr "data límite"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:493
+msgid "You should select the type of exception"
+msgstr "Debe seleccionar o tipo de excepción"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:213
 msgid "Advance measurements"
 msgstr "Medidas de avance"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:label="${i18n:_('Close')}"/>
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:<button
-#: label="${i18n:_('Close')}"
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<button
-#: onClick="allocationController.onCloseSelectWorkers()" />
-msgid "Close"
-msgstr "Pechar"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:213
+msgid "Amount work percentage should be between 0 and 100"
+msgstr "A porcentaxe de cantidade de traballo debe estar entre 0 y 100"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:<tab
-#: id="tbMachineData" label="${i18n:_('Machine data')}"></tab>
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:28
 msgid "Machine data"
 msgstr "Datos da máquina"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/DetailsOrderElementController.java:484
-msgid "Fixed percentage"
-msgstr "Porcentaje fixo"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/EarnedValueChartFiller.java:59
+msgid "VAC"
+msgstr "VAC"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:<label
-#: value="${i18n:_('Last name')}" />
-msgid "Last name"
-msgstr "Apelidos"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:358
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:371
-msgid "{0} not supported yet"
-msgstr "{0} aínda non soportado"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:160
-msgid "Advanced Allocation"
-msgstr "Asignación de avances"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:363
-msgid "Remove"
-msgstr "Borrar"
-
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:<tab
-#: label="${i18n:_('Label type')}"></tab>
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<column
-#: type')}" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<newdatasortablecolumn
-#: sort="auto(type.name)"/>
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:27
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:30
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:51
 msgid "Label type"
 msgstr "Tipo de etiqueta"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:340
-msgid "Create copy"
-msgstr "Crear copia"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java:177
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:190
+msgid "Advanced Allocation"
+msgstr "Asignación avanzada"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:<button
-#: label="${i18n:_('New entry')}"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:448
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:461
+msgid "{0} not supported yet"
+msgstr "{0} aínda non soportado"
+
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33
+msgid "Alpha"
+msgstr "Alfa"
+
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:52
 msgid "New entry"
 msgstr "Entrada nova"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:47
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:47
 msgid "Resources Load"
 msgstr "Carga de recursos"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:45
+#: navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:31
+msgid "Overload due to current order"
+msgstr "Sobrecarga debido ao pedido actual"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java:91
+msgid "Changes have been canceled"
+msgstr "Cambios cancelados"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java:45
 msgid "Overall Resources Load"
 msgstr "Carga global de recursos"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:173
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:147
+msgid "Recommended Allocation"
+msgstr "Asignación recomendada"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:211
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java:225
 msgid "Machine saved"
 msgstr "Máquina gardada"
 
-#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:<window
-#: id="${arg.top_id}" title="${i18n:_('Advance type list')}">
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:21
 msgid "Advance type list"
 msgstr "Lista de tipos de avance"
 
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<label
-#: value="${i18n:_('Type of day')}" />
-msgid "Type of day"
-msgstr "Tipo de día"
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:75
+msgid "Status"
+msgstr "Estado"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:354
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:512
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/DetailsOrderElementController.java:476
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<column
-#: label="${i18n:_('Hours')}" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul:<listheader
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<treecol
-#: class="hours"
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:<column
-#: ./navalplanner-webapp/src/main/webapp/calendars/_edition.zul:<listheader
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:543
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java:560
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:65
+#: navalplanner-webapp/src/main/webapp/planner/stretches_function.zul:72
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:101
+#: navalplanner-webapp/src/main/webapp/planner/order.zul:162
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:125
+#: navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:67
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul:34
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:110
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:124
+#: navalplanner-webapp/src/main/webapp/calendars/_edition.zul:155
 msgid "Hours"
 msgstr "Horas"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:334
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java:334
 msgid "The name of the criterion is empty."
-msgstr "O nome do criterio está vacío."
+msgstr "O nome do criterio está baleiro."
 
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:<button
-#: label="${i18n:_('New label')}"
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:55
 msgid "New label"
 msgstr "Etiqueta nova"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java:201
-#: ./navalplanner-webapp/src/main/webapp/workreports/workReport.zul:save_button_label="${i18n:_('Save')}"
-#: cancel_button_label="${i18n:_('Cancel')}" />
-#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:save_button_label="${i18n:_('Save')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:label="${i18n:_('Save')}"/>
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul:<button
-#: label="${i18n:_('Save')}" id="saveList"></button>
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:save_button_label="${i18n:_('Save')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:save_button_label="${i18n:_('Save')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:save_button_label="${i18n:_('Save')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:label="${i18n:_('Save')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:<button
-#: onClick="controller.save();"
-#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:save_button_label="${i18n:_('Save')}"
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<button
-#: onClick="controller.saveAndExit()"
-#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:save_button_label="${i18n:_('Save')}"
-msgid "Save"
-msgstr "Gardar"
-
-#: ./navalplanner-webapp/src/main/webapp/common/layout/login_v01.zul:<n:td
-#: class="identificacion">${i18n:_('AUTHENTICATE')}</n:td>
-msgid "AUTHENTICATE"
-msgstr "AUTENTICAR"
-
-#: ./navalplanner-webapp/src/main/webapp/common/error.zul:<button
-#: id="quitSession" label="${i18n:_('Exit session')}"></button>
-#: ./navalplanner-webapp/src/main/webapp/common/event_error.zul:<button
-msgid "Exit session"
-msgstr "Saír da sesión"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:299
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:317
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java:305
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java:319
 msgid "The start date cannot be null"
 msgstr "A data de inicio non pode ser nula"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<listheader
-#: label="${i18n:_('Group')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<column
-#: sort="auto(criterion.name)" />
-msgid "Group"
-msgstr "Grupo"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul:<label
-#: value="${i18n:_('Enabled')}" />
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul:<column
-#: label="${i18n:_('Enabled')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:<newdatasortablecolumn
-#: width="60px" label="${i18n:_('Enabled')}"/>
-#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:<newdatasortablecolumn
-msgid "Enabled"
-msgstr "Activado"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: label="${i18n:_('Max value')}" tooltiptext="Maximum allowed value"/>
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:41
 msgid "Max value"
 msgstr "Valor máximo"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<treecol
-#: label="${i18n:_('Estimated end')}" class="estimated_end"/>
-msgid "Estimated end"
-msgstr "Fin estimada"
-
-#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:<button
-#: label="${i18n:_('No')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:<button
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:51
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:52
+#: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:58
 msgid "No"
 msgstr "Non"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:150
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:150
 msgid "The name is not valid, the name must not be null "
 msgstr "O nome non é válido, non debe ser nulo "
 
-#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:<edition
-#: top_id="editWindow" title="${i18n:_('Edit advance type data')}"
-msgid "Edit advance type data"
-msgstr "Editar datos do tipo de avance"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:111
+msgid "A category must be selected"
+msgstr "Debe seleccionar unha categoría"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:<listheader
-#: label="${i18n:_('Spread')}"/>
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45
 msgid "Spread"
 msgstr "Propagación"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:191
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:141
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:206
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:253
+#: navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:132
+msgid "Assignment Label Types"
+msgstr "Asignación de tipos de etiqueta"
+
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:224
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java:140
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:206
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:332
 msgid "Removed {0}"
 msgstr "{0} borrado"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<label
-#: value="${i18n:_('Assigned hours')}:" />
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<tab
-#: label="${i18n:_('Assigned hours')}"
-#: ./navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul:<tab
-#: hours')}"></tab>
-msgid "Assigned hours"
-msgstr "Horas asignadas"
+#: navalplanner-webapp/src/main/webapp/common/layout/login.zul:40
+msgid "Help on authentication (opens a new window)"
+msgstr "Axuda sobre a identificación (abre unha ventana nova)"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:<tab
-#: label="${i18n:_('Assigned criteria')}"></tab>
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:<panel
-#: id="criterionsContainer" title="${i18n:_('Assigned criteria')}"
-#: border="normal">
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:<panel
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:<tab
+#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:1
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:3
+#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29
 msgid "Assigned criteria"
 msgstr "Criterios asignados"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/_legendCompanyPlanner.zul:<n:label>${i18n:_('Assigned
-#: load')}</n:label>
-msgid "Assigned load"
-msgstr "Carga asignada"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:854
+msgid "The length must be greater than 0, and not null."
+msgstr "A lonxitude debe ser maior que cero e non nula."
 
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:<window
-#: id="listWindow" title="${i18n:_('Machines list')}">
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:21
 msgid "Machines list"
 msgstr "Lista de máquinas"
 
-#: ./navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul:<button
-#: label="${i18n:_('Filter')}" style="margin-top: -4px"
-msgid "Filter"
-msgstr "Filtro"
-
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:label="${i18n:_('Resources
-#: Per Day')}" />
-msgid "Resources Per Day"
-msgstr "Recursos por día"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:434
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java:456
 msgid "Could not save new calendar"
 msgstr "Non se puido gardar o calendario novo"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java:187
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java:167
-msgid "ResourceType must be not-null"
-msgstr "ResourceType non debe ser nulo"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java:296
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java:336
+msgid "h"
+msgstr "h"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java:172
-msgid "Order saved"
-msgstr "Pedido salvado"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:495
-msgid "Move down"
-msgstr "Mover abaixo"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:label="${i18n:_('Create
-#: &amp; Assign')}"
-msgid "Create &amp; Assign"
-msgstr "Crear e asignar"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkRelationshipsController.java:135
 msgid "Couldn't find criterion {0}"
 msgstr "Non se puido atopar o criterio {0}"
 
-#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul:<tab
-#: label="${i18n:_('Report structure')}"></tab>
-msgid "Report structure"
-msgstr "Estrutura do informe"
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:92
+msgid "Create &amp; Assign"
+msgstr "Crear e asignar"
 
-#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:<button
-#: label="${i18n:_('Yes')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/calendars/calendars.zul:<button
-msgid "Yes"
-msgstr "Si"
-
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:<label
-#: class="subtitulo" value="${i18n:_('Assigned locations')}" />
-msgid "Assigned locations"
-msgstr "Ubicacións asignadas"
-
-#: ./navalplanner-webapp/src/main/webapp/orders/_edition.zul:<tab
-#: id="tabGeneralData" label="${i18n:_('General data')}" />
-msgid "General data"
-msgstr "Datos xerais"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:80
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java:99
 msgid "Add Milestone"
 msgstr "Engadir fito"
 
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:328
-#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:id="confirmRemove"
-#: title="${i18n:_('Confirm')}" width="500px"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:id="confirmRemove"
-#: sizable="true"
-#: ./navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:id="confirmRemove"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:194
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java:328
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:40
+#: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:41
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: ./navalplanner-webapp/src/main/webapp/planner/order.zul:<button
-#: label="${i18n:_('Assign')}"
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:<button
-msgid "Assign"
-msgstr "Asignar"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:266
-msgid "Calculate Number of Hours"
-msgstr "Calcular número de horas"
-
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:label="${i18n:_('Create')}">
-#: ./navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:<edition
-#: top_id="createWindow" title="${i18n:_('Create')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:<edition
-#: top_id="createComponent"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:<edition
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:<button
-#: id="show_create_form" onClick="controller.goToCreateForm();"
-#: label="${i18n:_('Create')}">
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul:<button
-#: label="${i18n:_('Create')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:label="${i18n:_('Create')}">
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_calendar.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:label="${i18n:_('Create')}">
-#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:<button
-#: onClick="controller.goToCreateForm()"/>
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/calendars/_list.zul:label="${i18n:_('Create')}">
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:54
+#: navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul:35
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:35
+#: navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul:37
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:49
+#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:47
+#: navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul:47
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:54
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:45
+#: navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:49
+#: navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul:43
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:70
+#: navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul:31
+#: navalplanner-webapp/src/main/webapp/calendars/_list.zul:31
 msgid "Create"
 msgstr "Crear"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/criterions-V2.zul:<button
-#: label="${i18n:_('Ok')}"
-msgid "Ok"
-msgstr "Aceptar"
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:73
+msgid "Total price"
+msgstr "Prezo total"
 
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/worker.zul:<editWorkRelationship
-#: top_id="addWorkRelationshipWindow" title="${i18n:_('Add work
-#: relationship')}"
-msgid "Add work relationship"
-msgstr "Engadir relación de traballo"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:182
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:202
 msgid "Manage advance types"
 msgstr "Xestionar tipos de avance"
 
-#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:<n:td><n:a
-#: href="/navalplanner-webapp/"
-#: class="ruta"><n:strong>${i18n:_('START')}</n:strong></n:a></n:td>
-msgid "START"
-msgstr "INICIO"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java:164
-msgid "Advance type saved"
-msgstr "Tipo de avance gardado"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:332
-msgid "The line must have at least one {0} associated"
-msgstr "A liña debe ter alo menos un {0} asociado"
-
-#: ./navalplanner-webapp/src/main/webapp/common/layout/template.zul:<n:td><n:a
-#: href="/navalplanner-webapp/common/layout/login_v01.zul"
-#: class="cerrar_sesion">${i18n:_('SIGN OUT')}</n:a></n:td>
-msgid "SIGN OUT"
-msgstr "SAÍR"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:578
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:483
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:910
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:578
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:tooltiptext="${i18n:_('Delete')}"
-#: ./navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul:<button
-#: label="${i18n:_('Delete')}"
-#: ./navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:tooltiptext="${i18n:_('Delete')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:tooltiptext="${i18n:_('Delete')}"
-#: disabled="@{criterionType.immutable}"
-#: onClick="controller.confirmRemove(self.parent.parent.value);">
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:<button
-#: ./navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:tooltiptext="${i18n:_('Delete')}"
-#: ./navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:tooltiptext="${i18n:_('Delete')}"
-#: ./navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:tooltiptext="${i18n:_('Delete')}"
-#: disabled="@{advanceType.immutable}"
-#: ./navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:tooltiptext="${i18n:_('Delete')}"
-#: ./navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:tooltiptext="${i18n:_('Delete')}"
-#: ./navalplanner-webapp/src/main/webapp/orders/_list.zul:tooltiptext="${i18n:_('Delete')}"
-#: ./navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:tooltiptext="${i18n:_('Delete')}"
-msgid "Delete"
-msgstr "Borrar"
-
-#: ./navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:872
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:872
 msgid ""
 "The date is not valid, the date must be unique for this advanced assignment"
 msgstr "A data non é válida, debe ser única para esta asignación de avance"
 
-#~ msgid ""
-#~ "The Spread values are not valid, there are several true spread values"
-#~ msgstr ""
-#~ "Los valores de propagación no son válidos, hay varios valores activados"
-
-#, fuzzy
-#~ msgid "Filters:"
-#~ msgstr "Filtro"
-
-#~ msgid "Planification"
-#~ msgstr "Planificación"
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:939
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:951
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java:434
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java:289
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:184
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java:205
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:139
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/ResourcesCostCategoryAssignmentController.java:159
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:223
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java:388
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java:544
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/StretchesFunctionController.java:224
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java:410
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java:910
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java:675
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:683
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:893
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java:1106
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:41
+#: navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul:47
+#: navalplanner-webapp/src/main/webapp/resources/criterions/_list-V2.zul:40
+#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45
+#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:63
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:66
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116
+#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
+#: navalplanner-webapp/src/main/webapp/materials/materials.zul:102
+#: navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:44
+#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:74
+#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:39
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:73
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:181
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul:99
+#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:98
+#: navalplanner-webapp/src/main/webapp/orders/_list.zul:58
+#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul:63
+msgid "Delete"
+msgstr "Borrar"