From 0ed8b81d3adbd428bffca73b491a39ee4ba4f176 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Sat, 14 Jan 2012 18:10:00 +0100 Subject: [PATCH] i18n: Update Spanish and Galician translations FEA: ItEr76S03Community --- ganttzk/src/main/resources/i18n/es.po | 64 +- ganttzk/src/main/resources/i18n/gl.po | 66 +- .../timeLineRequiredMaterial_es.properties | 12 +- .../timeLineRequiredMaterial_gl.properties | 14 +- .../src/main/resources/i18n/es.po | 3756 +++++++++-------- .../src/main/resources/i18n/gl.po | 3756 +++++++++-------- 6 files changed, 3907 insertions(+), 3761 deletions(-) diff --git a/ganttzk/src/main/resources/i18n/es.po b/ganttzk/src/main/resources/i18n/es.po index afffe548f..3573626b7 100644 --- a/ganttzk/src/main/resources/i18n/es.po +++ b/ganttzk/src/main/resources/i18n/es.po @@ -1,33 +1,33 @@ -# Spanish translations for LibrePlan - GanttZK module -# Traducciones al español para LibrePlan - módulo GanttZK +# LibrePlan - GanttZK module. # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e # Desenvolvemento Tecnolóxico de Galicia -# Copyright (C) 2010-2011 Igalia, S.L. +# Copyright (C) 2010-2012 Igalia, S.L. # This file is distributed under the same license as the LibrePlan package. -# Diego Pino García , 2009. -# Jacobo Aragunde Pérez , 2009, 2010. -# Manuel Rego Casasnovas , 2010, 2011. # +# Translators: +# Diego Pino García , 2009. +# Jacobo Aragunde Pérez , 2009, 2010. +# Manuel Rego Casasnovas , 2010, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: 1.2.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-10 20:11+0100\n" -"PO-Revision-Date: 2011-11-10 20:18+0100\n" +"Project-Id-Version: 1.2.1\n" +"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" +"POT-Creation-Date: 2012-01-13 16:49+0100\n" +"PO-Revision-Date: 2012-01-13 16:00+0000\n" "Last-Translator: Manuel Rego Casasnovas \n" -"Language-Team: Spanish <>\n" -"Language: es\n" +"Language-Team: Español\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" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:215 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:234 msgid "Erase" msgstr "Borrar" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:300 msgid "Add Dependency" msgstr "Añadir dependencia" @@ -39,7 +39,7 @@ msgstr "Trabajador" msgid "Start" msgstr "Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:629 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:635 msgid "Show reported hours" msgstr "Mostrar horas reportadas" @@ -72,17 +72,17 @@ msgstr "Definir Fin-Fin" msgid "Show/Hide progress" msgstr "Mostrar/Ocultar progreso" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199 -msgid "available effort: {0}, assigned effort: {1}" -msgstr "esfuerzo disponible: {0}, esfuerzo asignado: {1}" +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 +msgid "Task" +msgstr "Tarea" #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89 msgid "by resources" msgstr "por recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 -msgid "Task" -msgstr "Tarea" +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199 +msgid "available effort: {0}, assigned effort: {1}" +msgstr "esfuerzo disponible: {0}, esfuerzo asignado: {1}" #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64 msgid "Criterion" @@ -104,6 +104,10 @@ msgstr "filtrando por nombre" msgid "See scheduling" msgstr "Ver planificación" +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 +msgid "Show" +msgstr "Mostrar" + #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30 msgid "End" msgstr "Fin" @@ -124,10 +128,6 @@ msgstr "Ninguno" msgid "Flatten/Unflatten tree" msgstr "Aplanar/Expandir árbol" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 -msgid "Filter" -msgstr "Filtro" - #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Project" msgstr "Proyecto" @@ -141,7 +141,7 @@ msgstr "Nombre" msgid "Name filter" msgstr "Filtro por nombres" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:609 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:615 msgid "Show progress" msgstr "Mostrar progreso" @@ -173,11 +173,11 @@ msgstr "Mostrar/Ocultar recursos" msgid "Set End-Start" msgstr "Definir Fin-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:298 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:297 msgid "decreasing zoom" msgstr "reduciendo zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:590 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:596 msgid "Hide critical path" msgstr "Ocultar camino crítico" @@ -185,7 +185,7 @@ msgstr "Ocultar camino crítico" msgid "Day" msgstr "Día" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:636 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:642 msgid "Hide reported hours" msgstr "Ocultar horas reportadas" @@ -218,7 +218,7 @@ msgstr "Definir Inicio-Inicio" msgid "See resource allocation" msgstr "Ver asignación de recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:281 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:280 msgid "increasing zoom" msgstr "aumentando zoom" @@ -234,10 +234,10 @@ msgstr "Todos" msgid "Refresh" msgstr "Actualizar" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:585 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:591 msgid "Show critical path" msgstr "Mostrar camino crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:614 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:620 msgid "Hide progress" msgstr "Ocultar progreso" diff --git a/ganttzk/src/main/resources/i18n/gl.po b/ganttzk/src/main/resources/i18n/gl.po index b284d0d42..1f90df997 100644 --- a/ganttzk/src/main/resources/i18n/gl.po +++ b/ganttzk/src/main/resources/i18n/gl.po @@ -1,33 +1,33 @@ -# Galician translations for LibrePlan - GanttZK module -# Traducciones al español para LibrePlan - módulo GanttZK +# LibrePlan - GanttZK module. # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e # Desenvolvemento Tecnolóxico de Galicia -# Copyright (C) 2010-2011 Igalia, S.L. +# Copyright (C) 2010-2012 Igalia, S.L. # This file is distributed under the same license as the LibrePlan package. -# Igalia , 2009. -# Jacobo Aragunde Pérez , 2010. -# Manuel Rego Casasnovas , 2010, 2011. # +# Translators: +# Diego Pino García , 2009. +# Jacobo Aragunde Pérez , 2010. +# Manuel Rego Casasnovas , 2010, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: 1.2.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-10 20:11+0100\n" -"PO-Revision-Date: 2011-11-10 20:20+0100\n" -"Last-Translator: Manuel Rego Casasnovas \n" -"Language-Team: Galician <>\n" -"Language: gl\n" +"Project-Id-Version: 1.2.1\n" +"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" +"POT-Creation-Date: 2012-01-13 16:49+0100\n" +"PO-Revision-Date: 2012-01-13 16:01+0000\n" +"Last-Translator: Manuel Rego Casasnovas\n" +"Language-Team: Galego\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" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:215 #: ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java:234 msgid "Erase" msgstr "Borrar" -#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:299 +#: ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java:300 msgid "Add Dependency" msgstr "Engadir dependencia" @@ -39,7 +39,7 @@ msgstr "Traballador" msgid "Start" msgstr "Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:629 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:635 msgid "Show reported hours" msgstr "Mostrar horas reportadas" @@ -72,17 +72,17 @@ msgstr "Definir Fin-Fin" msgid "Show/Hide progress" msgstr "Mostrar/Ocultar progreso" -#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199 -msgid "available effort: {0}, assigned effort: {1}" -msgstr "esforzo dispoñible: {0}, esforzo asignado: {1}" +#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 +msgid "Task" +msgstr "Tarefa" #: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:89 msgid "by resources" msgstr "por recursos" -#: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 -msgid "Task" -msgstr "Tarefa" +#: ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:199 +msgid "available effort: {0}, assigned effort: {1}" +msgstr "esforzo dispoñible: {0}, esforzo asignado: {1}" #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:64 msgid "Criterion" @@ -104,6 +104,10 @@ msgstr "filtrando por nome" msgid "See scheduling" msgstr "Ver planificación" +#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 +msgid "Show" +msgstr "Amosar" + #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30 msgid "End" msgstr "Fin" @@ -124,10 +128,6 @@ msgstr "Ningún" msgid "Flatten/Unflatten tree" msgstr "Aplanar/Expandir árbore" -#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:43 -msgid "Filter" -msgstr "Filtro" - #: ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58 msgid "Project" msgstr "Proxecto" @@ -141,7 +141,7 @@ msgstr "Nome" msgid "Name filter" msgstr "Filtro por nomes" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:609 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:615 msgid "Show progress" msgstr "Mostrar progreso" @@ -173,11 +173,11 @@ msgstr "Mostrar/Ocultar recursos" msgid "Set End-Start" msgstr "Definir Fin-Inicio" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:298 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:297 msgid "decreasing zoom" msgstr "reducindo zoom" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:590 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:596 msgid "Hide critical path" msgstr "Ocultar camiño crítico" @@ -185,7 +185,7 @@ msgstr "Ocultar camiño crítico" msgid "Day" msgstr "Día" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:636 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:642 msgid "Hide reported hours" msgstr "Ocultar horas reportadas" @@ -218,7 +218,7 @@ msgstr "Definir Inicio-Inicio" msgid "See resource allocation" msgstr "Ver asignación de recursoss" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:281 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:280 msgid "increasing zoom" msgstr "aumentando zoom" @@ -234,10 +234,10 @@ msgstr "Todos" msgid "Refresh" msgstr "Actualizar" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:585 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:591 msgid "Show critical path" msgstr "Mostrar camiño crítico" -#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:614 +#: ganttzk/src/main/java/org/zkoss/ganttz/Planner.java:620 msgid "Hide progress" msgstr "Ocultar progreso" diff --git a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_es.properties b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_es.properties index b8512ad37..c058e182d 100644 --- a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_es.properties +++ b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_es.properties @@ -1,17 +1,17 @@ # Locale for timeLineRequiredMaterial.jrxml title = Materiales -subtitle = L\u00EDnea temporal de los Materiales -date.start = Fecha de inicio: -date.end = Fecha de fin: -status = Estado: +subtitle = Lnea temporal de los Materiales +date.start = Fecha de inicio\: +date.end = Fecha de fin\: +status = Estado\: headers.title = Dia headers.column1 = Material headers.column2 = Proyecto - Tarea headers.column3 = Disponibilidad headers.column4 = Unidades headers.column5 = Precio unidad -headers.column6 = Precio Total +headers.column6 = Precio headers.column7 = Estado -headers.total = Cantidad total por: +headers.total = Precio total por da\: page = pgina of = de diff --git a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_gl.properties b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_gl.properties index 3aa972dc3..84abdeb25 100644 --- a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_gl.properties +++ b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/timeLineRequiredMaterial_gl.properties @@ -1,17 +1,17 @@ # Locale for timeLineRequiredMaterial.jrxml title = Materiais -subtitle = L\u00EDnea temporal dos Materiais -date.start = Data de inicio: -date.end = Data de fin: -status = Estado: +subtitle = Lnea temporal dos Materiais +date.start = Data de inicio\: +date.end = Data de fin\: +status = Estado\: headers.title = Dia headers.column1 = Material headers.column2 = Proxecto - Tarefa headers.column3 = Dispoibilidade headers.column4 = Unidades -headers.column5 = Precio unidade -headers.column6 = Precio Total +headers.column5 = Prezo unidade +headers.column6 = Prezo headers.column7 = Estado -headers.total = Cantidade total por: +headers.total = Prezo total por da\: page = pxina of = de diff --git a/libreplan-webapp/src/main/resources/i18n/es.po b/libreplan-webapp/src/main/resources/i18n/es.po index 6e7020d26..86160a6c3 100644 --- a/libreplan-webapp/src/main/resources/i18n/es.po +++ b/libreplan-webapp/src/main/resources/i18n/es.po @@ -1,32 +1,32 @@ -# Spanish translations for LibrePlan - Webapp module -# Traducciones al español para LibrePlan - módulo Webapp +# LibrePlan - GanttZK module. # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e # Desenvolvemento Tecnolóxico de Galicia -# Copyright (C) 2010-2011 Igalia, S.L. +# Copyright (C) 2010-2012 Igalia, S.L. # This file is distributed under the same license as the LibrePlan package. -# Diego Pino García , 2009. -# Jacobo Aragunde Pérez , 2009, 2010. -# Manuel Rego Casasnovas , 2010, 2011. # +# Translators: +# Diego Pino García , 2009. +# Jacobo Aragunde Pérez , 2009, 2010. +# Manuel Rego Casasnovas , 2010, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: 1.2.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-25 11:40+0100\n" -"PO-Revision-Date: 2011-11-25 11:49+0100\n" +"Project-Id-Version: 1.2.1\n" +"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" +"POT-Creation-Date: 2012-01-13 16:49+0100\n" +"PO-Revision-Date: 2012-01-14 12:09+0000\n" "Last-Translator: Manuel Rego Casasnovas \n" -"Language-Team: Spanish <>\n" -"Language: es\n" +"Language-Team: Epañol\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" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:373 msgid "The resource cannot be null" msgstr "El recurso no puede ser nulo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:341 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:354 msgid "Group path" msgstr "Path del grupo" @@ -39,16 +39,16 @@ msgid "No authorizations were added because you did not select any." msgstr "No se pueden añadir autorizaciones porque no se seleccionó ninguna." #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58 msgid "en" msgstr "es" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:192 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:200 msgid "Origin" msgstr "Origen" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:176 msgid "Create exception" msgstr "Crear excepción" @@ -66,67 +66,67 @@ msgstr "Crear trabajador virtual" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:830 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29 -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 -#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 +#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 #: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 -#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 -#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:36 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 #: libreplan-webapp/src/main/webapp/templates/_list.zul:34 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:229 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:254 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31 +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 +#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 +#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:36 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 msgid "Operations" msgstr "Operaciones" @@ -146,19 +146,19 @@ msgstr "Seleccionar" msgid "Work report removed successfully" msgstr "Parte de trabajo borrado con éxito" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1514 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1515 msgid "It can not be empty" msgstr "No puede estar vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 #: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 msgid "Materials" msgstr "Materiales" @@ -192,23 +192,23 @@ msgstr "Administrar campos y etiquetas" msgid "Please, select a calendar" msgstr "Por favor, seleccione un calendario" +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:252 +msgid "Summary" +msgstr "Resumen" + #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170 msgid "Predefined" msgstr "Predefinido" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244 -msgid "Summary" -msgstr "Resumen" - -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 msgid "Reports" msgstr "Informes" @@ -216,6 +216,10 @@ msgstr "Informes" msgid "LibrePlan: Advanced allocation" msgstr "LibrePlan: Asignación avanzada" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 +msgid "The {0} sequence prefixes can not be repeated" +msgstr "Los prefijos de secuencia de {0} no pueden repetirse" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340 msgid "" "The original workable days value {0}, is prevented because consolidated " @@ -224,10 +228,6 @@ msgstr "" "El valor original de días laborables {0}, se evita porque los valores " "consolidados non pueden ser modificados" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 -msgid "The {0} sequence prefixes can not be repeated" -msgstr "Los prefijos de secuencia de {0} no pueden repetirse" - #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:82 msgid "Criterion requirements" msgstr "Criterios requeridos" @@ -242,16 +242,16 @@ msgstr "" msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:689 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:716 -msgid "Progress that are reported by quality forms can not be modified" -msgstr "" -"El progreso notificado por formularios de calidad no pueden ser modificado" - #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:748 msgid "Not the same hours group, impossible to update" msgstr "No es el mismo grupo de horas, imposible actualizar" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:694 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:721 +msgid "Progress that are reported by quality forms can not be modified" +msgstr "" +"El progreso notificado por formularios de calidad no pueden ser modificado" + #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66 msgid "Own exception" msgstr "Excepción propia" @@ -260,16 +260,16 @@ msgstr "Excepción propia" msgid "Cannot delete that material because it is assigned to a project." msgstr "No se puede borrar ese material porque está asignado a un projecto." +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +msgid "Resource Usage" +msgstr "Uso de recursos" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479 msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 -msgid "Resource Usage" -msgstr "Uso de recursos" - #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 msgid "Active period from" msgstr "Período activo desde" @@ -278,28 +278,28 @@ msgstr "Período activo desde" msgid "Unassign" msgstr "Desasignar" +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:505 +msgid "Manual assignment" +msgstr "Asignación manual" + #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:302 msgid "Companies" msgstr "Empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:505 -msgid "Manual assignment" -msgstr "Asignación manual" - #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74 msgid "Quality form items list" msgstr "Lista de elementos del formulario de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:240 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:240 msgid "" "End date is not valid, the new end date must be later the current end date" msgstr "" "La fecha de fin no es válida, la nueva fecha de fin debe ser posterior a la " "actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:520 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:903 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128 msgid "Create {0}: {1}" @@ -309,8 +309,8 @@ msgstr "Crear {0}: {1}" msgid "generic workers allocation" msgstr "asignación genérica de trabajadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:895 msgid "The project has no scheduled elements" msgstr "El proyecto no tiene elementos planificados" @@ -318,9 +318,9 @@ msgstr "El proyecto no tiene elementos planificados" msgid "Hour start" msgstr "Hora de inicio" -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36 #: libreplan-webapp/src/main/webapp/planner/main.zul:53 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 msgid "Start" msgstr "Comienzo" @@ -332,6 +332,10 @@ msgstr "Informe de progreso" msgid "cost assignment's category not specified" msgstr "categoría de la asignación de coste no especificada" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:96 +msgid "Check for updates" +msgstr "Comprobar si hay actualizaciones" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:72 msgid "Delete Template element" msgstr "Borrar elemento de plantilla" @@ -349,15 +353,15 @@ msgstr "Usuario con login '{0}': no encontrado" msgid "Resources capability" msgstr "Capacidad de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108 -msgid "changing perspective" -msgstr "cambio de perspectiva" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proyectos entre escenarios" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108 +msgid "changing perspective" +msgstr "cambio de perspectiva" + #: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:124 msgid "" "Could not add those authorizations to profile {0} because they were already " @@ -370,17 +374,28 @@ msgstr "" msgid "Default calendar" msgstr "Calendario por defecto" +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156 +msgid "Click on this" +msgstr "Haz click en este" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Project Name" msgstr "Nombre del proyecto" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:967 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:966 msgid "Indent" msgstr "Indentar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:314 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:327 msgid "Save passwords in database" msgstr "Guardar contraseñas en la base de datos" @@ -396,17 +411,17 @@ msgstr "Plantilla nueva" msgid "Total estimated hours" msgstr "Horas estimadas totales" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 #: libreplan-webapp/src/main/webapp/common/error.zul:21 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 msgid "LibrePlan: Runtime Error" msgstr "LibrePlan: Error de ejecución" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:136 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:151 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:137 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:153 msgid "Base calendar \"{0}\" saved" msgstr "Calendario base \"{0}\" guardado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:177 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185 msgid "Exceptions list" msgstr "Lista de excepciones" @@ -422,7 +437,7 @@ msgstr "Nuevo elemento del formulario de calidad" msgid "LibrePlan: Labels" msgstr "LibrePlan: Etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:261 msgid "LDAP connection was successful" msgstr "La conexión con el LDAP se ha realizado con éxito" @@ -458,9 +473,9 @@ msgstr "" "existen criterios satisfechos que pertenecen a tipos de criterio no " "aplicables a este recurso" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/templates/templates.zul:65 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 msgid "Criterion Requirement" msgstr "Criterio requerido" @@ -476,7 +491,7 @@ msgstr "Minutos" msgid "You can not remove a scenario with derived scenarios" msgstr "No se puede eliminar un escenario con escenarios derivados" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:948 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:950 msgid "Work Report Types" msgstr "Tipos de partes de trabajo" @@ -501,20 +516,20 @@ msgstr "un recurso deshabilitado tiene subrecursos habilitados" msgid "Client" msgstr "Cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 msgid "" -"there are no resources for required criteria: {0}. So the generic allocation " -"can't be added" +"there are no resources for required criteria: {0}. So the generic allocation" +" can't be added" msgstr "" "no hay recursos con los criterios solicitados: {0}. Por tanto, no se puede " "añadir la asignación genérica" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:347 msgid "Role search strategy" msgstr "Estrategia para la búsqueda de roles" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:480 msgid "Error on showing warning message removing calendar: " msgstr "Error al mostrar mensaje de advertencia borrando calendario: " @@ -526,15 +541,16 @@ msgstr "" #: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java:153 msgid "material category name has to be unique. It is already used" -msgstr "el nombre de la categoría de materiales debe ser único. Ya está en uso" +msgstr "" +"el nombre de la categoría de materiales debe ser único. Ya está en uso" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 msgid "Imputed hours" msgstr "Horas imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "Costes de proyecto por recurso" @@ -569,14 +585,14 @@ msgid "" "The {0} is not valid, criterionType overlaps with other " "criterionSatisfaction from the same criterionType" msgstr "" -"{0} no es válido, criterionType se solapa con otro criterionSatisfaction del " -"mismo criterionType" +"{0} no es válido, criterionType se solapa con otro criterionSatisfaction del" +" mismo criterionType" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 msgid "Group strategy" msgstr "Estrategia de grupo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 msgid "Work Report Lines" msgstr "Líneas de parte de trabajo" @@ -589,9 +605,9 @@ msgid "October" msgstr "Octubre" #: libreplan-webapp/src/main/webapp/settings/settings.zul:58 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:51 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 msgid "First name" msgstr "Nombre" @@ -603,12 +619,12 @@ msgstr "No se pudo ejecutar el comando de impresión" msgid "Complementary text fields" msgstr "Campos de texto complementario" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:832 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar el borrado de {0}. ¿Está seguro?" @@ -616,25 +632,25 @@ msgstr "Confirmar el borrado de {0}. ¿Está seguro?" msgid "Work Reports List" msgstr "Lista de partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 msgid "Accounts" msgstr "Cuentas" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 -msgid "External code" -msgstr "Código externo" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50 msgid "Edit selected task" msgstr "Editar tarea seleccionada" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 +msgid "External code" +msgstr "Código externo" + #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:49 msgid "View" msgstr "Ver" -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:84 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 msgid "Limiting" msgstr "Limitante" @@ -642,37 +658,37 @@ msgstr "Limitante" msgid "Required materials" msgstr "Materiales requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677 -msgid "resources per day must be not empty and bigger than zero" -msgstr "los recursos por día deben ser no vacíos y mayores que cero" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 msgid "Backwards" msgstr "Atrás" -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67 -#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77 -msgid "Version" -msgstr "Versión" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677 +msgid "resources per day must be not empty and bigger than zero" +msgstr "los recursos por día deben ser no vacíos y mayores que cero" #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52 msgid "Apply filtering to resources satisfying required criteria" msgstr "" "Aplicar filtrado a los recursos que satisfacen los criterios requeridos" +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67 +#: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77 +msgid "Version" +msgstr "Versión" + #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 msgid "Up" msgstr "Arriba" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:184 msgid "" -"CriterionType is not valid, it overlaps other criterionSatisfaction with the " -"same criterionType" +"CriterionType is not valid, it overlaps other criterionSatisfaction with the" +" same criterionType" msgstr "" "El tipo de criterio no es válido, otro criterio satisfecho se solapa con el " "mismo tipo de criterio" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:138 msgid "Types of work hours" msgstr "Tipos de horas de trabajo" @@ -700,26 +716,26 @@ msgstr "Algún tramo tiene valores mayores o iguales que el tramo anterior" msgid "Please select a task" msgstr "Por favor, seleccione una tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 -msgid "" -"Value is not valid, the default max value must be greater than the precision " -"value " -msgstr "" -"El valor no es válido, el valor máximo por defecto debe ser mayor que el " -"valor de precisión" - #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 msgid "missing worker code in the work report" msgstr "falta código de trabajador en un parte de trabajo" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 +msgid "" +"Value is not valid, the default max value must be greater than the precision" +" value " +msgstr "" +"El valor no es válido, el valor máximo por defecto debe ser mayor que el " +"valor de precisión" + #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:58 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 msgid "End date" msgstr "Fecha de fin" @@ -732,9 +748,9 @@ msgstr "el nombre del perfil ya está siendo usado por otro perfil" msgid "E-mail" msgstr "Correo electrónico" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:112 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106 msgid "This project has already been added." msgstr "Este proyecto ya ha sido añadido." @@ -743,21 +759,21 @@ msgid "The task code cannot be null" msgstr "El código de la tarea no puede ser nulo" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 msgid "Criteria" msgstr "Criterios" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 -msgid "Resource / Criteria" -msgstr "Recursos / Criterios" - #: libreplan-webapp/src/main/webapp/users/_editUser.zul:27 msgid "User data" msgstr "Datos del usuario" +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 +msgid "Resource / Criteria" +msgstr "Recursos / Criterios" + #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "Líneas" @@ -770,7 +786,7 @@ msgstr "Añadir nueva asignación de progreso" msgid "Set Filter Options" msgstr "Establecer las opciones de filtrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:977 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:979 msgid "Error on showing warning message removing workReportType: " msgstr "" "Error al mostrar mensaje de advertencia borrando tipo de parte de trabajo: " @@ -792,31 +808,31 @@ msgstr "" msgid "Personal data" msgstr "Datos personales" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:720 -msgid "Calculated progress can not be removed" -msgstr "El progreso calculado no se puede borrar" - -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:202 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159 msgid "please, select a Criterion" msgstr "por favor, seleccione un criterio" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:725 +msgid "Calculated progress can not be removed" +msgstr "El progreso calculado no se puede borrar" + #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:112 msgid "Work reports" msgstr "Partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143 -msgid "{0} annotation required on {1}" -msgstr "{0} anotación obligatoria en {1}" - #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "June" msgstr "Junio" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1066 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143 +msgid "{0} annotation required on {1}" +msgstr "{0} anotación obligatoria en {1}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1067 msgid "Modified" msgstr "Modificado" @@ -828,7 +844,7 @@ msgstr "Añadir criterio" msgid "You can not remove the current scenario" msgstr "No se puede borrar el escenario actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:680 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:672 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" "formato de prefijo inválido. No puede estar vacío o contener espacios en " @@ -843,11 +859,11 @@ msgstr "Es necesario un MessagesContainer" msgid "Project element code" msgstr "Código de la tarea" -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:42 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:42 msgid "Ending date" msgstr "Fecha de fin" @@ -855,40 +871,40 @@ msgstr "Fecha de fin" msgid "LibrePlan: Page not found" msgstr "LibrePlan: Página no encontrada" -#: libreplan-webapp/src/main/webapp/templates/_list.zul:21 -msgid "Templates List" -msgstr "Lista de plantillas" - #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:29 msgid "Export options" msgstr "Opciones de exportación" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:227 -msgid "Last value" -msgstr "Último valor" +#: libreplan-webapp/src/main/webapp/templates/_list.zul:21 +msgid "Templates List" +msgstr "Lista de plantillas" #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:34 msgid "Subcontracted Tasks List" msgstr "Lista de tareas subcontratadas" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:240 +msgid "Last value" +msgstr "Último valor" + #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 msgid "Average of worked hours in finished applications" msgstr "Media de horas trabajadas en las aplicaciones finalizadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:693 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:698 msgid "Calculated progress can not be modified" msgstr "El progreso calculado no se puede modificar" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 -msgid "Statistics log" -msgstr "Histórico de estadísticas" - #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:58 msgid "Work done from starting date" msgstr "Trabajo realizado desde la fecha de inicio" -#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 +msgid "Statistics log" +msgstr "Histórico de estadísticas" + #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47 +#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40 msgid "Edit Calendar" msgstr "Editar calendario" @@ -896,12 +912,12 @@ msgstr "Editar calendario" msgid "Profile" msgstr "Perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "Necesidades de materiales en fecha" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 msgid "UserDn" msgstr "UserDn" @@ -911,14 +927,14 @@ msgstr "UserDn" msgid "Cannot be empty or null" msgstr "No puede ser vacío o nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300 -msgid "filtering" -msgstr "filtrado" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233 msgid "{0} \"{1}\" saved" msgstr "{0} \"{1}\" guardado" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300 +msgid "filtering" +msgstr "filtrado" + #: libreplan-webapp/src/main/webapp/orders/_list.zul:33 msgid "Total Budget" msgstr "Presupuesto total" @@ -956,23 +972,23 @@ msgstr "Tipos de horas" msgid "Time period saved" msgstr "Período de tiempo guardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208 -msgid "This Criterion has already been added." -msgstr "Este criterio ya ha sido añadido." - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252 msgid "" "Are you sure of changing the resource type? You will lose the criteria with " "different resource type." msgstr "" -"¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo " -"de recurso se perderán." +"¿Está seguro de cambiar el tipo de recurso? Los criterios con diferente tipo" +" de recurso se perderán." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165 +msgid "This Criterion has already been added." +msgstr "Este criterio ya ha sido añadido." + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:222 msgid "add" msgstr "añadir" @@ -990,7 +1006,8 @@ msgstr "Trabajadores" #: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeModel.java:102 msgid "Cannot remove {0}, since it is being used by some Exception Day" -msgstr "No se puede borrar {0} porque se está usando en algún día de excepción" +msgstr "" +"No se puede borrar {0} porque se está usando en algún día de excepción" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:45 msgid "August" @@ -1024,15 +1041,15 @@ msgstr "nombre del perfil no especificado" msgid "Date Start" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1279 msgid "Value is not valid, the current value must be less than max value" msgstr "" "El valor no es válido, el valor actual debe ser menor que el valor máximo" +#: libreplan-webapp/src/main/webapp/planner/order.zul:105 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:105 msgid "Value" msgstr "Valor" @@ -1049,15 +1066,15 @@ msgstr "no hay períodos válidos para este calendario" msgid "Add role" msgstr "Añadir rol" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:636 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1272 msgid "Exception end date should be greater or equals than start date" msgstr "" "La fecha de fin de una excepción debe ser mayor o igual que la fecha de " "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:444 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:454 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:469 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proyecto repetdio en proyecto {1}" @@ -1090,11 +1107,11 @@ msgid "Type data" msgstr "Datos del tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 msgid "Profiles" msgstr "Perfiles" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:271 msgid "Host" msgstr "Host" @@ -1102,11 +1119,11 @@ msgstr "Host" msgid "Hour finish" msgstr "Hora de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:165 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:178 msgid "Perspectives" msgstr "Perspectivas" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:107 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:115 msgid "Workable time" msgstr "Tiempo trabajable" @@ -1130,19 +1147,19 @@ msgstr "Asignación de recursos limitantes" msgid "Split new assignment" msgstr "Dividir nueva asignación" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57 -msgid "Pagination" -msgstr "Paginación" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:271 msgid "Expiry date" msgstr "Fecha de vencimiento" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 +msgid "Pagination" +msgstr "Paginación" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342 msgid "" -"The operation does not perform because the task has progress reports that is " -"spread associated with this quality form" +"The operation does not perform because the task has progress reports that is" +" spread associated with this quality form" msgstr "" "La operación no se puede llevar a cabo porque la tarea tiene marcado como " "progreso progagado el asociado con el formulario de calidad" @@ -1156,9 +1173,10 @@ msgstr "Cambiar escenario" msgid "Critical path" msgstr "Camino crítico" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:262 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:161 msgid "" -"Deleting this item, it will disable the report progress option. Are you sure?" +"Deleting this item, it will disable the report progress option. Are you " +"sure?" msgstr "" "Borrando este elemento, esto deshabilitará la opción de notificar progreso. " "¿Está seguro?" @@ -1169,22 +1187,11 @@ msgstr "" msgid "Categories" msgstr "Categorías" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:46 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180 msgid "Project Details" msgstr "Detalles de proyecto" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162 -msgid " to go to output directly" -msgstr " ir a la salida directamente" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:167 msgid "Add new hours group" msgstr "Añadir nuevo grupo de horas" @@ -1198,11 +1205,11 @@ msgid "Cancel changes and back to scheduling" msgstr "Cancelar cambios y volver a la planificación" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 +#: libreplan-webapp/src/main/webapp/planner/order.zul:106 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:106 msgid "Percentage" msgstr "Porcentaje" @@ -1214,12 +1221,12 @@ msgstr "Actualizado" msgid "Company logo URL" msgstr "URL del logo de la empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:129 msgid "No worker selected" msgstr "Ningún trabajador seleccionado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:207 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:225 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:220 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 msgid "Number of digits" msgstr "Número de dígitos" @@ -1236,8 +1243,8 @@ msgstr "Capacidad total" msgid "Problems connecting with client web service" msgstr "Problemas al conectar con el servicio web cliente" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:165 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:194 msgid "Exception Type" msgstr "Tipo de excepción" @@ -1245,29 +1252,29 @@ msgstr "Tipo de excepción" msgid "Profiles List" msgstr "Lista de Perfiles" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 -#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 -msgid "Labels" -msgstr "Etiquetas" - #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:278 msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "" "{0} de la categoría {1} y {2} de la categoría {3} tienen el mismo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:925 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:691 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 +#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 +msgid "Labels" +msgstr "Etiquetas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 msgid "Data Types" msgstr "Tipos de datos" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" msgstr "Total de horas" @@ -1275,7 +1282,7 @@ msgstr "Total de horas" msgid "Data" msgstr "Datos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:344 msgid "Reassigning {0} projects" msgstr "Reasignando {0} proyectos" @@ -1283,13 +1290,13 @@ msgstr "Reasignando {0} proyectos" msgid "Filter by task status" msgstr "Filtrar por estado de tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:498 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:420 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:500 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:418 msgid "Select date" msgstr "Seleccione fecha" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:629 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1265 msgid "You should select a end date for the exception" msgstr "Debe seleccionar una fecha de fin para la excepción" @@ -1314,7 +1321,13 @@ msgstr "RECURSO NO LIMITANTE" msgid "passwords can not be empty" msgstr "las conraseñas no pueden estar vacías" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:120 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 +msgid "already assigned" +msgstr "ya asignado" + +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:128 msgid "Activation periods" msgstr "Períodos de activación" @@ -1322,24 +1335,18 @@ msgstr "Períodos de activación" msgid "Passed" msgstr "Pasado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 -msgid "already assigned" -msgstr "ya asignado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:509 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:511 +#: libreplan-webapp/src/main/webapp/planner/order.zul:151 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:133 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:139 -#: libreplan-webapp/src/main/webapp/planner/order.zul:151 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:152 msgid "Calendar" msgstr "Calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:307 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:132 msgid "Resources" msgstr "Recursos" @@ -1372,7 +1379,7 @@ msgstr "a" msgid "worker's first name not specified" msgstr "nombre del trabajador no especificado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:337 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 msgid "Property strategy" msgstr "Estrategia de propiedad" @@ -1380,9 +1387,9 @@ msgstr "Estrategia de propiedad" msgid "date not specified" msgstr "fecha no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 msgid "Projects Planning" msgstr "Planificación de proyectos" @@ -1390,25 +1397,25 @@ msgstr "Planificación de proyectos" msgid "Shrink to fit page width" msgstr "Reducir para ajustar al ancho de página" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:760 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:770 msgid "The max value must be greater than 0" msgstr "El valor máximo debe ser mayor que 0" #: libreplan-webapp/src/main/webapp/settings/settings.zul:63 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:56 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 msgid "Last name" msgstr "Apellidos" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:380 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 -msgid "Remove" -msgstr "Borrar" - #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:254 msgid "cost category name not specified" msgstr "nombre de la categoría de coste no especificado" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:382 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 +msgid "Remove" +msgstr "Borrar" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41 msgid "Planned workable days" msgstr "Días laborables planificados" @@ -1427,12 +1434,20 @@ msgstr "" "La tarea contiene progreso consolidado. No se puede aplicar la función " "sigmoide." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:320 msgid "UserId" msgstr "UserId" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390 +msgid "the code must be not null or not empty" +msgstr "el código no puede ser nulo o vacío" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:509 +msgid "This date can not include the whole previous work week" +msgstr "Esta fecha no puede incluir a la semana de trabajo anterior completa" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:245 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:218 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" @@ -1440,14 +1455,6 @@ msgstr "" "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior " "a la fecha de inicio actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:516 -msgid "This date can not include the whole previous work week" -msgstr "Esta fecha no puede incluir a la semana de trabajo anterior completa" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390 -msgid "the code must be not null or not empty" -msgstr "el código no puede ser nulo o vacío" - #: libreplan-webapp/src/main/webapp/common/layout/template.zul:119 msgid "Create New Project" msgstr "Crear proyecto nuevo" @@ -1456,7 +1463,7 @@ msgstr "Crear proyecto nuevo" msgid "Stretches list" msgstr "Lista de tramos" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:180 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:193 msgid "Enable scenarios module" msgstr "Habilitar módulo de escenarios" @@ -1464,50 +1471,50 @@ msgstr "Habilitar módulo de escenarios" msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:833 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78 -#: libreplan-webapp/src/main/webapp/settings/settings.zul:124 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44 -#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 -#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 -#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:848 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 #: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:124 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 #: libreplan-webapp/src/main/webapp/templates/templates.zul:135 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:384 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 +#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 +#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 +#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:395 msgid "Save" msgstr "Guardar" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72 msgid "Standard Effort" msgstr "Esfuerzo estándar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:142 msgid "Material categories" msgstr "Categorías de materiales" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:300 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:603 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:595 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:693 msgid "number of digits must be between {0} and {1}" msgstr "el número de dígitos debe estar entre {0} y {1}" @@ -1519,10 +1526,18 @@ msgstr "Criterios requeridos" msgid "Pending update" msgstr "Actualización pendiente" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:160 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:158 msgid "Criterion previously selected" msgstr "Criterio seleccionado previamente" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:881 +msgid "" +"Spread progress cannot be changed if there is a consolidation in any " +"progress assignment from root task" +msgstr "" +"El progreso que propaga no se puede cambiar si hay alguna consolidación en " +"alguna asignación de progreso desde la tarea raíz" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:51 msgid "Users authorization" msgstr "Autorización de usuarios" @@ -1531,23 +1546,23 @@ msgstr "Autorización de usuarios" msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando con el servicio web subcontratista" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:219 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:232 msgid "Entity type" msgstr "Tipo de entidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1023 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1046 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:268 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Se perderán los cambios sin guardar. ¿Está seguro?" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 -#: libreplan-webapp/src/main/webapp/planner/order.zul:22 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/index.zul:22 #: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 #: libreplan-webapp/src/main/webapp/planner/main.zul:22 +#: libreplan-webapp/src/main/webapp/planner/index.zul:22 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: libreplan-webapp/src/main/webapp/planner/order.zul:22 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 #: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22 msgid "LibrePlan: Scheduling" msgstr "LibrePlan: Planificación" @@ -1556,14 +1571,14 @@ msgstr "LibrePlan: Planificación" msgid "Assigned load" msgstr "Carga asignada" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:142 -msgid "End Date" -msgstr "Fecha de fin" - #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:64 msgid "Filter by workers" msgstr "Filtrar por trabajadores" +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:150 +msgid "End Date" +msgstr "Fecha de fin" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 msgid "Some allocations needed" msgstr "Se necesitan algunas asignaciones" @@ -1592,17 +1607,17 @@ msgstr "Expandir/Plegar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido al proyecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:913 msgid "Name: {0}" msgstr "Nombre: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:902 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:903 msgid "Move down" msgstr "Mover abajo" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 msgid "Please, select a project" msgstr "Por favor, seleccione un proyecto" @@ -1619,8 +1634,8 @@ msgid "Report structure" msgstr "Estructura del parte" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:119 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42 #: libreplan-webapp/src/main/webapp/templates/templates.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42 msgid "General data" msgstr "Datos generales" @@ -1632,10 +1647,10 @@ msgstr "BAC" msgid "Calculate Number of Hours" msgstr "Calcular número de horas" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 msgid "Assign" msgstr "Asignar" @@ -1643,7 +1658,7 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código en un criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1278 msgid "Create Template" msgstr "Crear plantilla" @@ -1652,10 +1667,10 @@ msgstr "Crear plantilla" msgid "Advanced search" msgstr "Búsqueda avanzada" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:82 msgid "Filter by labels" msgstr "Filtrar por etiquetas" @@ -1676,7 +1691,7 @@ msgstr "Diagrama de Montecarlo" msgid "Schedule Variance" msgstr "Desviación en planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:496 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:395 msgid "Error on showing warning message removing qualityForm: " msgstr "" "Error al mostrar mensaje de advertencia borrando un formulario de calidad: " @@ -1685,25 +1700,25 @@ msgstr "" msgid "Service does not manage resource of type: {0}" msgstr "El servicio no gestiona recursos del tipo: {0}" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:39 #: libreplan-webapp/src/main/webapp/common/error.zul:44 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:39 msgid "Status code" msgstr "Código de estado" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:974 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:474 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:492 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:976 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:476 msgid "Warning" msgstr "Advertencia" -#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:30 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:30 msgid "Select parent calendar" msgstr "Seleccionar el calendario padre" @@ -1721,26 +1736,26 @@ msgstr "El tipo de horas no puede ser nulo" msgid "criterion satisfaction with end date less than start date" msgstr "el criterio satisfecho tiene fecha de fin anterior a la de inicio" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 msgid "Show" msgstr "Mostrar" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58 -msgid "Duration (days)" -msgstr "Duración (días)" - #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71 msgid "Assignment Type" msgstr "Tipo de asignación" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58 +msgid "Duration (days)" +msgstr "Duración (días)" + #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29 msgid "Back to log in" msgstr "Volver a iniciar sesión" @@ -1759,14 +1774,14 @@ msgstr "Nodo sin hijos" msgid "Company" msgstr "Empresa" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118 -msgid "There is no label with this code " -msgstr "No hay ninguna etiqueta con este código " - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212 msgid "Task: {0} " msgstr "Tarea: {0} " +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118 +msgid "There is no label with this code " +msgstr "No hay ninguna etiqueta con este código " + #: libreplan-webapp/src/main/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "Propiedades de la tarea" @@ -1779,8 +1794,8 @@ msgstr "No hay ningún parte de trabajo con este código" msgid "Sum of direct imputed hours" msgstr "Suma de horas imputadas directamente" -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:28 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:35 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:28 msgid "Surname" msgstr "Apellidos" @@ -1788,28 +1803,28 @@ msgstr "Apellidos" msgid "Exception Day Types List" msgstr "Lista de tipos de día de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:375 -msgid "the name must be not null or not empty" -msgstr "el nombre no puede ser nulo o vacío" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:750 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:394 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:68 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:131 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 +#: libreplan-webapp/src/main/webapp/planner/order.zul:107 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:107 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Date" msgstr "Fecha" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:375 +msgid "the name must be not null or not empty" +msgstr "el nombre no puede ser nulo o vacío" + #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42 msgid "Add From Template" msgstr "Añadir a partir de plantilla" @@ -1819,42 +1834,42 @@ msgstr "Añadir a partir de plantilla" msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Los recursos asignados para esta tarea serán borrados. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:678 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:670 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" -"formato de prefijo inválido. No puede estar vacío o contener '_' o espacios " -"en blanco." +"formato de prefijo inválido. No puede estar vacío o contener '_' o " +"espacios en blanco." #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 msgid "Filter by month" msgstr "Filtrar por mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322 -msgid "The criterion and its type cannot be null" -msgstr "El criterio y su tipo no pueden ser nulos" - -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:422 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:321 msgid "The quality form must have an item with 100% value to report progress" msgstr "" "El formulario de calidad debe tener un ítem con valor 100% para notificar " "progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -msgid "July" -msgstr "Julio" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322 +msgid "The criterion and its type cannot be null" +msgstr "El criterio y su tipo no pueden ser nulos" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156 msgid "The code is not valid. There is another unit type with the same code" msgstr "El código no es válido. Hay otro tipo de unidad con el mismo código" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +msgid "July" +msgstr "Julio" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:255 msgid "Enable LDAP authentication" msgstr "Habilitar la autenticación LDAP" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:493 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1866,16 +1881,16 @@ msgstr "Error al borrar elemento: " msgid "January" msgstr "Enero" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60 -msgid "Cannot calculate charts for current data" -msgstr "No se pueden calcular gráficos para los datos actuales" - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54 msgid "Select queue" msgstr "Seleccionar cola" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60 +msgid "Cannot calculate charts for current data" +msgstr "No se pueden calcular gráficos para los datos actuales" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1498 msgid "project name already being used" msgstr "el nombre de proyecto ya está siendo usado" @@ -1883,27 +1898,27 @@ msgstr "el nombre de proyecto ya está siendo usado" msgid "Work description" msgstr "Descripción del trabajo" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 msgid "Split assignment" msgstr "Dividir asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:519 -msgid "There are not any assigned progress to current task" -msgstr "No hay ningún progreso asignado a la tarea actual" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:118 msgid "You can not remove the default scenario called \"{0}\"" msgstr "No se puede borrar el escenario por defecto, llamado \"{0}\"" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:522 +msgid "There are not any assigned progress to current task" +msgstr "No hay ningún progreso asignado a la tarea actual" + #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158 msgid "direct link" msgstr "enlace directo" @@ -1911,17 +1926,17 @@ msgstr "enlace directo" msgid "Down" msgstr "Abajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:842 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:844 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:48 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:122 msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:869 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:870 msgid "Value is not valid, taking into account the current list of HoursGroup" msgstr "" "El valor no es válido, teniendo en cuenta la lista actual de grupos de horas" @@ -1939,8 +1954,8 @@ msgstr "falta el tipo de horas en una línea del parte de trabajo" msgid "Quality forms" msgstr "Formularios de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:467 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:477 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:482 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:492 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de grupo de horas repetido en proyecto {1}" @@ -1965,19 +1980,19 @@ msgstr "Estimación de coste total actual" msgid "cost assignment's start date not specified" msgstr "fecha de inicio de la asignación de coste no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1192 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1193 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45 msgid "Direct" msgstr "Directo" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:828 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:245 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:266 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:201 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:253 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:274 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 msgid "Op." msgstr "Op." @@ -1989,7 +2004,7 @@ msgstr "Pesimista" msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1260 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -1997,7 +2012,7 @@ msgstr "" "Este progreso no se puede eliminar porque es propagado. Es necesario " "seleccionar otro progreso como propagado." -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:119 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:127 msgid "Work week" msgstr "Semana de trabajo" @@ -2031,7 +2046,7 @@ msgstr "El recurso no puede ser nulo" msgid "Total Hours" msgstr "Horas totales" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:374 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:385 msgid "LibrePlan Role" msgstr "Rol LibrePlan" @@ -2043,12 +2058,12 @@ msgstr "Crear tipo de progreso" msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "Trabajo y progreso por tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1522 msgid "project code already being used" msgstr "el código del proyecto ya está siendo usado" @@ -2056,22 +2071,22 @@ msgstr "el código del proyecto ya está siendo usado" msgid "WBS (tasks)" msgstr "EDT (tareas)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:843 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:878 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 -msgid "Error on showing removing element: " -msgstr "Error al mostrar el elemento a borrar: " - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:728 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:720 msgid "Deleting sequence" msgstr "Borrando secuencia" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:457 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:875 +msgid "Error on showing removing element: " +msgstr "Error al mostrar el elemento a borrar: " + #: libreplan-webapp/src/main/webapp/common/layout/template.zul:88 msgid "Select scenario" msgstr "Seleccionar escenario" @@ -2092,7 +2107,7 @@ msgstr "Editar grupo de trabajadores virtuales: {0}" msgid "Criterion requirement" msgstr "Criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1404 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1405 msgid "Only the last activation period allows to delete end date." msgstr "Sólo el último periodo de activación permite borrar la fecha de fin." @@ -2106,8 +2121,8 @@ msgstr "Planificación guardada" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:192 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28 msgid "Add new row" msgstr "Añadir nueva fila" @@ -2128,20 +2143,20 @@ msgstr "falta código en un calendario de recursos" msgid "Overload" msgstr "Sobrecarga" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 msgid "Assignment log" msgstr "Histórico de asignación" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 +msgid "Work Report Models" +msgstr "Modelos de partes de trabajo" + #: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyCaptTimeout.java:45 msgid "CutycaptTimeout thread exception" msgstr "Excepción de thread CutycaptTimeout" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 -msgid "Work Report Models" -msgstr "Modelos de partes de trabajo" - #: libreplan-webapp/src/main/webapp/materials/materials.zul:73 msgid "New" msgstr "Nuevo" @@ -2162,7 +2177,7 @@ msgstr "LibrePlan: Empresas" msgid "LibrePlan: Progress Report" msgstr "LibrePlan: Informe de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419 msgid "" "Calendar cannot be removed because it still has children. Some other " "calendar is derived from this one." @@ -2170,7 +2185,7 @@ msgstr "" "El calendario no se puede borrar porque aún tiene hijos. Algún otro " "calendario deriva de este." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:925 msgid "Value is not valid, the type must be not empty" msgstr "El valor no es válido, el tipo no debe ser vacío" @@ -2182,7 +2197,7 @@ msgstr "el nombre de tipo de criterio está siendo usado" msgid "Task code cannot be null" msgstr "El código de la tarea no puede ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:520 msgid "It is not allowed to consolidate progress." msgstr "No se permite consolidar progreso." @@ -2197,17 +2212,17 @@ msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:101 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:131 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Actions" msgstr "Acciones" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:118 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:126 msgid "Exceptions" msgstr "Excepciones" @@ -2227,18 +2242,18 @@ msgstr "Asignar materiales" msgid "Over assignable" msgstr "Sobreasignable" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29 +msgid "ID" +msgstr "NIF" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:231 msgid "format filters are not valid" msgstr "los filtros de formato no son válidos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 -msgid "ID" -msgstr "NIF" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:351 msgid "Settings" msgstr "Preferencias" @@ -2251,16 +2266,16 @@ msgstr "La fecha de inicio no puede ser vacía" msgid "Our company password" msgstr "Contraseña de nuestra empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131 msgid "This label has already been added." msgstr "Esta etiqueta ya ha sido añadida." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80 msgid "Could not get code, please try again later" msgstr "No se pudo obtener el código, por favor inténtelo de nuevo más tarde" @@ -2276,11 +2291,11 @@ msgstr "" msgid "Hours Group" msgstr "Grupo de horas" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:823 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:825 msgid "Unallocated name" msgstr "Nombre no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:923 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:924 msgid "Move up" msgstr "Mover arriba" @@ -2292,11 +2307,11 @@ msgstr "BCWP" msgid "Subcontract communication date" msgstr "Fecha de comunicación de la subcontratación" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:367 msgid "Scheduling" msgstr "Planificación" @@ -2304,7 +2319,7 @@ msgstr "Planificación" msgid "Dependencies have priority" msgstr "Las dependencias tienen prioridad" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:516 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:901 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126 msgid "Create {0}" @@ -2322,21 +2337,21 @@ msgstr "Total coste planificado" msgid "Assign Label" msgstr "Asignar etiqueta" -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23 -msgid "Create new project" -msgstr "Crear nuevo proyecto" - #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73 msgid "Page up" msgstr "Página arriba" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23 +msgid "Create new project" +msgstr "Crear nuevo proyecto" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:921 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:910 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:35 msgid "State" msgstr "Estado" @@ -2348,14 +2363,10 @@ msgstr "Debe empezar después" msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:848 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:845 msgid "You don't have permissions to edit this project" msgstr "No tiene permisos para editar este proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192 -msgid "missing date in a calendar exception" -msgstr "falta la fecha de una excepción de calendario" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:440 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:145 msgid "" @@ -2364,6 +2375,10 @@ msgstr "" "El tipo de horas está vacío. Por favor, crear algún tipo de horas antes de " "proceder" +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192 +msgid "missing date in a calendar exception" +msgstr "falta la fecha de una excepción de calendario" + #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:108 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:172 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:437 @@ -2371,8 +2386,8 @@ msgstr "" msgid "There is no resource with this ID" msgstr "No hay otro recurso con este NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:195 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:195 msgid "Send" msgstr "Enviar" @@ -2401,17 +2416,17 @@ msgstr "Usuario asociado" msgid "Type name" msgstr "Nombre del tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:687 -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27 -msgid "All" -msgstr "Todo" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 msgid "Progress assignment" msgstr "Asignación de progreso" +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:689 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27 +msgid "All" +msgstr "Todo" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77 msgid "Manual" @@ -2429,28 +2444,28 @@ msgstr "Fecha de recepción" msgid "Cannot be higher than Ending date" msgstr "No puede ser mayor que la fecha de fin" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:277 msgid "Create activation period" msgstr "Crear período de activación" -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:22 -msgid "Workers List" -msgstr "Lista de trabajadores" - #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31 msgid "Personal details" msgstr "Detalles personales" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1190 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:217 -msgid "Inherited" -msgstr "Heredado" +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:22 +msgid "Workers List" +msgstr "Lista de trabajadores" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:355 msgid "Delete project template. Are you sure?" msgstr "Borrar plantilla de proyecto. ¿Está seguro?" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1191 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225 +msgid "Inherited" +msgstr "Heredado" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599 msgid "" @@ -2461,8 +2476,8 @@ msgstr "" "coincida con los criterios de asignación de recursos en ningún intervalo de " "tiempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890 msgid "Worker" msgstr "Trabajador" @@ -2479,7 +2494,7 @@ msgstr "nombre del criterio no especificado" msgid "Value is not valid, the default max value must not be empty " msgstr "El valor no es válido, el valor máximo por defecto no debe ser nulo " -#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 msgid "Role property" msgstr "Propiedad del rol" @@ -2500,7 +2515,7 @@ msgstr "Autorizar" msgid "Recommended allocation" msgstr "Asignación recomendada" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:254 msgid "Activation" msgstr "Activación" @@ -2512,15 +2527,7 @@ msgstr "Escenarios" msgid "Materials saved" msgstr "Materiales guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 -msgid "" -"This progress measurement can not be in current date, because it is " -"consolidated. it is necessary to select other date." -msgstr "" -"Esta medida de progreso no puede estar en la fecha actual, porque está " -"consolidada. Debe seleccionar otra fecha." - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 msgid "Total Worked Hours By Resource In A Month" msgstr "Total horas trabajadas por recurso en un mes" @@ -2537,8 +2544,8 @@ msgstr "Buffer de tareas de entrada" msgid "At least one {0} sequence must be active" msgstr "Al menos una secuencia de {0} debe estar activa" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 msgid "Profile name" @@ -2560,7 +2567,7 @@ msgstr "Debe seleccionar un escenario de origen" msgid "At least one {0} sequence is needed" msgstr "Se necesita al menos una secuencia de {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "Horas por tarea estimadas/planificadas" @@ -2573,7 +2580,7 @@ msgstr "LibrePlan: Categorías de coste" msgid "Assigned" msgstr "Asignado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:257 msgid "Use LDAP roles" msgstr "Usar roles del LDAP" @@ -2585,14 +2592,22 @@ msgstr "Detalles" msgid "LibrePlan: Units" msgstr "LibrePlan: Unidades" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 -msgid "Communication" -msgstr "Comunicación" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:104 +msgid "" +"Check this option to send this information to LibrePlan developers in order " +"to generate usage statistics" +msgstr "" +"Marca esta opción para enviar información a los desarroladores de LibrePlan " +"para generar estadísticas de uso" #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 msgid "More options" msgstr "Más opciones" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 +msgid "Communication" +msgstr "Comunicación" + #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:219 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:179 msgid "Error: {0}" @@ -2602,7 +2617,7 @@ msgstr "Error: {0}" msgid "Confirm create template" msgstr "Confirmar la creación de la plantilla" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:238 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246 msgid "Parent" msgstr "Padre" @@ -2610,27 +2625,27 @@ msgstr "Padre" msgid "Earliest date" msgstr "Fecha más temprana" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:352 +msgid "Change Password" +msgstr "Cambiar la contraseña" + #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 msgid "LibrePlan: Work And Progress Per Task" msgstr "LibrePlan: trabajo y progreso por tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 -msgid "Change Password" -msgstr "Cambiar la contraseña" - #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48 msgid "Projects" msgstr "Proyectos" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1047 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:269 +msgid "Confirm exit dialog" +msgstr "Diálogo para confirmar la salida" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "No se encontró un conversor para {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:272 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1024 -msgid "Confirm exit dialog" -msgstr "Diálogo para confirmar la salida" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "Asignaciones de materiales" @@ -2643,10 +2658,6 @@ msgstr "Diciembre" msgid "Change password" msgstr "Cambiar la contraseña" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:830 -msgid "Text field" -msgstr "Campo de texto" - #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81 msgid "" "Value is not valid, the Precision value must be less than the defalt max " @@ -2655,20 +2666,16 @@ msgstr "" "El valor no es válido, el valor de precisión debe ser menor que el valor " "máximo por defecto." +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:832 +msgid "Text field" +msgstr "Campo de texto" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97 msgid "Question" msgstr "Pregunta" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 -msgid "" -"This progress measurement can not be changed or removed, because it is " -"consolidated. It is needed to remove its consolidation." -msgstr "" -"Esta medida de progreso no se puede cambiar o borrar, porque está " -"consolidada. Se requiere borrar su consolidación." - #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:233 msgid "Create new work week" msgstr "Crear nueva semana de trabajo" @@ -2707,14 +2714,14 @@ msgstr "Vista expandida" msgid "Work record" msgstr "Registro de trabajo" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:204 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:166 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:204 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:147 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145 msgid "Output format" msgstr "Formato de salida" @@ -2738,40 +2745,40 @@ msgstr "el tipo de recurso no permite criterios habilitados" msgid "Effort cannot be null" msgstr "El esfuerzo no puede ser nulo" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1038 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1015 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 +#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:191 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 +#: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94 #: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45 -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:387 -#: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:131 -#: libreplan-webapp/src/main/webapp/planner/order.zul:166 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:398 msgid "Cancel" msgstr "Cancelar" @@ -2795,16 +2802,16 @@ msgstr "Gráfico de horas acumuladas" msgid "Machines List" msgstr "Lista de máquinas" +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:692 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:904 +msgid "You don't have read access to this project" +msgstr "No tiene acceso de lectura a este proyecto" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130 msgid "CPI" msgstr "CPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 -msgid "You don't have read access to this project" -msgstr "No tiene acceso de lectura a este proyecto" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:96 msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" @@ -2812,18 +2819,18 @@ msgstr "" "Desactivar jerarquía provocará que se aplane el árbol de criterios. ¿Está " "seguro?" -#: libreplan-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 -msgid "Units" -msgstr "Unidades" - -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:48 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:43 msgid "Dates" msgstr "Fechas" +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +#: libreplan-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38 +msgid "Units" +msgstr "Unidades" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168 msgid "At least one stretch is needed" msgstr "Se necesita al menos un tramo" @@ -2832,14 +2839,14 @@ msgstr "Se necesita al menos un tramo" msgid "a day is not valid" msgstr "un día no es válido" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:87 -msgid "Autocomplete login form" -msgstr "Autocompletar el formulario de inicio de sesión" - #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 msgid "LibrePlan: Project Costs Per Resource" msgstr "LibrePlan: costes de proyecto por recurso" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:87 +msgid "Autocomplete login form" +msgstr "Autocompletar el formulario de inicio de sesión" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61 msgid "Task Properties" msgstr "Propiedades de la tarea" @@ -2852,9 +2859,9 @@ msgstr "tipo de horas" msgid "LibrePlan: Task Scheduling Status In Project" msgstr "LibrePlan: Estado de planificación en proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:229 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:222 msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" @@ -2865,23 +2872,30 @@ msgstr "" msgid "name" msgstr "nombre" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1283 +msgid "" +"Value must be a multiple of the precision value of the progress type: {0}" +msgstr "" +"El valor debe ser un múltiplo del valor de precisión del tipo de progreso: " +"{0}" + #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:75 msgid "Delete selected task" msgstr "Borrar tarea seleccionada" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:126 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:129 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 -msgid "end" -msgstr "fin" - #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:529 msgid "Cost Category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:357 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 +msgid "end" +msgstr "fin" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 msgid "Role search query" msgstr "Consulta para la búsqueda de roles" @@ -2893,8 +2907,8 @@ msgstr "Diario" msgid "Authorizations" msgstr "Autorizaciones" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:49 #: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:36 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:49 msgid "Continue" msgstr "Continuar" @@ -2902,8 +2916,8 @@ msgstr "Continuar" msgid "Edit task {0}" msgstr "Editar tarea {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:236 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:210 msgid "Start date cannot be null" msgstr "La fecha de inicio no puede ser nula" @@ -2915,10 +2929,6 @@ msgstr "Subcontratación" msgid "references" msgstr "referencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1264 -msgid "Value is not valid, the Precision value must be exact " -msgstr "El valor no es válido, el valor de precisión debe ser exacto " - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/GenericAllocationRow.java:55 msgid "Generic" msgstr "Genérico" @@ -2935,7 +2945,7 @@ msgstr "Valor máximo por defecto" msgid "Add criterion requirement" msgstr "Añadir criterio requerido" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:860 msgid "" "You can not remove the project \"{0}\" because of any of its tasks are " "already in use in some work reports and the project just exists in the " @@ -2949,18 +2959,18 @@ msgstr "" msgid "Percentage of estimated budget hours / hours consumed" msgstr "Porcentaje de horas de presupuesto estimadas / horas consumidas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44 -msgid "Criterion Name" -msgstr "Nombre del criterio" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502 msgid "Automatic" msgstr "Automático" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44 +msgid "Criterion Name" +msgstr "Nombre del criterio" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 msgid "Task" msgstr "Tarea" @@ -2969,12 +2979,12 @@ msgstr "Tarea" msgid "LibrePlan: Change password" msgstr "LibrePlan: Cambiar la contraseña" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:169 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85 msgid "please, select a label" msgstr "por favor, seleccione una etiqueta" @@ -2986,21 +2996,21 @@ msgstr "Añadir perfil" msgid "LibrePlan: Scenarios Management" msgstr "LibrePlan: Gestión de Escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220 -msgid "filter already exists" -msgstr "el filtro ya existe" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:225 msgid "missing code in a calendar data version" msgstr "falta el código en los datos de versión de un calendario" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220 +msgid "filter already exists" +msgstr "el filtro ya existe" + #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:40 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 msgid "Criterion name" msgstr "Nombre del criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:126 msgid "values are not valid, the values must not be null" msgstr "los valores no son válidos, no deben ser nulos" @@ -3009,8 +3019,8 @@ msgid "Apply changes and go back to scheduling" msgstr "Aplicar cambios y volver a la planificación" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 msgid "Task name" msgstr "Nombre de la tarea" @@ -3018,11 +3028,11 @@ msgstr "Nombre de la tarea" msgid "cost assignment's resource not specified" msgstr "recurso de la asignación de coste no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:129 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:73 msgid "Project" msgstr "Proyecto" @@ -3043,7 +3053,7 @@ msgstr "Coste presupuestado del trabajo realizado" msgid "Change the password" msgstr "Cambiar la contraseña" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:128 msgid "Work report" msgstr "Parte de trabajo" @@ -3052,28 +3062,28 @@ msgid "the name must be not empty" msgstr "el nombre no puede ser vacío" #: libreplan-webapp/src/main/webapp/materials/materials.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 msgid "Disabled" msgstr "Deshabilitado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:701 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:707 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324 msgid "Earned value" msgstr "Valor ganado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:159 msgid "Overtime Effort" msgstr "Esfuerzo extra" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:219 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:227 msgid "Inherited from parent calendar" msgstr "Heredado del calendario padre" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:187 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:213 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:195 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:221 msgid "Normal Effort" msgstr "Esfuerzo normal" @@ -3083,16 +3093,14 @@ msgstr "Finalizadas {0} reasignaciones" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:250 msgid "" -"Templates can only be created out of existent tasks.You are trying to create " -"a template out of a new task.\n" +"Templates can only be created out of existent tasks.You are trying to create a template out of a new task.\n" "Please save your project before proceeding." msgstr "" -"Las plantillas sólo pueden ser creadas a partir de tareas existentes. Está " -"intentando crear unha plantilla a partir de una tarea nueva.\n" +"Las plantillas sólo pueden ser creadas a partir de tareas existentes. Está intentando crear unha plantilla a partir de una tarea nueva.\n" "Por favor guarde su proyecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1109 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1120 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1135 msgid "{0} not supported yet" msgstr "{0} aún no soportado" @@ -3100,20 +3108,27 @@ msgstr "{0} aún no soportado" msgid "is not supported for its use with LibrePlan." msgstr "no está soportado para su uso con LibrePlan." +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1320 +msgid "" +"Date is not valid, it must be greater than the last progress consolidation" +msgstr "" +"La fecha no es válida, debe ser mayor que la última consolidación de " +"progreso" + #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53 msgid "New entry" msgstr "Entrada nueva" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 -msgid "Some sequences to remove not existed" -msgstr "Algunas secuencias para borrar no existen" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:100 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:109 msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:241 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 +msgid "Some sequences to remove not existed" +msgstr "Algunas secuencias para borrar no existen" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:233 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -3121,7 +3136,7 @@ msgstr "Cambios cancelados" msgid "LibrePlan: Hours Worked Per Worker In A Month" msgstr "LibrePlan: Horas trabajadas por trabajador en un mes" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 msgid "Authentication" msgstr "Autenticación" @@ -3141,16 +3156,16 @@ msgstr "Asignación apropiativa" msgid "Assigned criterion requirements" msgstr "Criterios requeridos asignados" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:115 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:123 msgid "Filter by criteria" msgstr "Filtrar por criterios" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:37 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 msgid "Max value" msgstr "Valor máximo" @@ -3170,12 +3185,12 @@ msgstr "Horas para asignar" msgid "A category must be selected" msgstr "Debe seleccionar una categoría" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:137 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:145 msgid "Period" msgstr "Periodo" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:38 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 msgid "Spread" msgstr "Propagación" @@ -3183,16 +3198,16 @@ msgstr "Propagación" msgid "Select start date" msgstr "Seleccionar fecha de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 -msgid "Removed {0}" -msgstr "{0} borrado" - #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106 #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "" "Error al mostrar mensaje de advertencia borrando tipo de horas de trabajo: " +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882 +msgid "Removed {0}" +msgstr "{0} borrado" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 msgid "Confirm deleting this worker. Are you sure?" msgstr "Confirmar el borrado de este trabajador. ¿Está seguro?" @@ -3210,11 +3225,6 @@ msgstr "Nombre del rol" msgid "This worker was already removed by other user" msgstr "Este trabajador ya ha sido borrado por otro usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:791 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:474 -msgid "h" -msgstr "h" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:620 msgid "Create Work Report" msgstr "Crear parte de trabajo" @@ -3223,6 +3233,11 @@ msgstr "Crear parte de trabajo" msgid "Value is not valid, the precision value must not be empty" msgstr "El valor no es válido, el valor de precisión no debe ser vacío" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:814 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:472 +msgid "h" +msgstr "h" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363 msgid "Workable capacity for this period " msgstr "Capacidad de trabajo para este período " @@ -3232,7 +3247,7 @@ msgstr "Capacidad de trabajo para este período " msgid "Cannot be null or empty" msgstr "No puede ser nulo o vacío" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:440 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:339 msgid "Quality Form" msgstr "Formulario de calidad" @@ -3248,7 +3263,7 @@ msgstr "Asignar elementos seleccionados" msgid "init" msgstr "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1201 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1237 msgid "Add new progress measurement" msgstr "Añadir nueva medida de progreso" @@ -3256,14 +3271,14 @@ msgstr "Añadir nueva medida de progreso" msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 -msgid "Scenarios Management" -msgstr "Administración de escenarios" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersController.java:192 msgid "Project {0} transfered" msgstr "Proyecto {0} transferido" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +msgid "Scenarios Management" +msgstr "Administración de escenarios" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:96 msgid "Create & Assign" msgstr "Crear y asignar" @@ -3276,21 +3291,21 @@ msgstr "No configurable" msgid "Advanced allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/webapp/planner/order.zul:108 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 msgid "Consolidated" msgstr "Consolidado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:145 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:158 msgid "Work report types" msgstr "Tipos de partes de trabajo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:174 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 msgid "MonteCarlo method" msgstr "Método de Montecarlo" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1220 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1221 msgid "derived exception can not be removed" msgstr "la excepción derivada no se puede borrar" @@ -3307,11 +3322,11 @@ msgstr "falta el código en un material" msgid "LibrePlan: User access" msgstr "LibrePlan: Acceso de usuarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:32 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:111 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:32 msgid "Customer" msgstr "Cliente" @@ -3326,7 +3341,7 @@ msgstr "Tipo de horas" msgid "criterion type name not specified" msgstr "nombre del tipo de criterio no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:265 msgid "Cannot connect to LDAP server" msgstr "No se puede conectar al servidor de LDAP" @@ -3334,11 +3349,11 @@ msgstr "No se puede conectar al servidor de LDAP" msgid "Add Exception" msgstr "Añadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:303 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:324 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:202 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:219 msgid "cannot be empty" msgstr "no puede ser vacío" @@ -3367,18 +3382,18 @@ msgstr "Tipo de progreso" msgid "Task {0} : Project is incompatible type with {1}" msgstr "Tarea {0} : El proyecto tiene un tipo incompatible con {1}" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:35 -msgid "Expand taskgroups" -msgstr "Expandir grupos de tareas" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:155 msgid "" -"Time period contains non valid data. Ending data must be older than starting " -"date" +"Time period contains non valid data. Ending data must be older than starting" +" date" msgstr "" "El período de tiempo contiene datos inválidos. La fecha de fin debe ser " "mayor que la de inicio" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:35 +msgid "Expand taskgroups" +msgstr "Expandir grupos de tareas" + #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Save Project" msgstr "Guardar proyecto" @@ -3388,8 +3403,8 @@ msgstr "Guardar proyecto" msgid "Day is not valid" msgstr "El día no es válido" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:619 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1256 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:621 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1257 msgid "You should select a start date for the exception" msgstr "Debe seleccionar una fecha de inicio para la excepción" @@ -3401,98 +3416,98 @@ msgstr "Ayuda" msgid "Variance At Completion" msgstr "Desviación al coste final" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:64 -msgid "Exportation options" -msgstr "Opciones de exportación" - #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:92 msgid "Settings saved" msgstr "Preferencias guardadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160 -msgid "" -"Could not save time period. Time period overlaps with another non-compatible " -"time period" -msgstr "" -"No se pudo guardar el período de tiempo. El período se solapa con otro " -"período de tiempo incompatible" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:64 +msgid "Exportation options" +msgstr "Opciones de exportación" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:376 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/BaseCalendarBandboxFinder.java:46 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:58 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39 -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:58 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 -#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76 -#: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 +#: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:28 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:80 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:27 -#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 #: libreplan-webapp/src/main/webapp/planner/main.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:90 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:134 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:175 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:104 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:80 +#: libreplan-webapp/src/main/webapp/templates/_list.zul:27 +#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:28 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90 msgid "Name" msgstr "Nombre" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160 +msgid "" +"Could not save time period. Time period overlaps with another non-compatible" +" time period" +msgstr "" +"No se pudo guardar el período de tiempo. El período se solapa con otro " +"período de tiempo incompatible" + #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168 msgid "Delete task" msgstr "Borrar tarea" @@ -3505,14 +3520,14 @@ msgstr "Segundos" msgid "please, select an item" msgstr "por favor, seleccione un elemento" +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:220 +msgid "Day of week" +msgstr "Día de la semana" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:397 msgid "Time Start cannot be null" msgstr "La hora de inicio no puede ser nula" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212 -msgid "Day of week" -msgstr "Día de la semana" - #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22 msgid "Companies List" msgstr "Lista de empresas" @@ -3521,7 +3536,7 @@ msgstr "Lista de empresas" msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "Horas trabajadas por recurso" @@ -3536,15 +3551,15 @@ msgstr "la asignación de coste tiene fecha de fin anterior a la de inicio" #: libreplan-webapp/src/main/webapp/common/configuration.zul:91 msgid "" -"Enable/Disable autocomplete property in login form, if the admin password is " -"still in default" +"Enable/Disable autocomplete property in login form, if the admin password is" +" still in default" msgstr "" "Habilitar/Deshabilitar la propiedad de autocompletado en el formulario de " "inicio de sesión, si la contraseña de admin tovadía es la contraseña por " "defecto" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 msgid "Category name" msgstr "Nombre de la categoría" @@ -3557,6 +3572,11 @@ msgstr "No es el mismo material, imposible actualizar" msgid "Filter work report by" msgstr "Filtrar parte de trabajo por" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:99 +msgid "Show a notification when new LibrePlan versions are released" +msgstr "" +"Mostrar una notificación cuando una nueva versión de LibrePlan sea publicada" + #: libreplan-webapp/src/main/webapp/common/layout/template.zul:65 msgid "Main menu" msgstr "Menú principal" @@ -3569,7 +3589,7 @@ msgstr "Montecarlo" msgid "Duration" msgstr "Duración" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:585 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587 msgid "Exception: {0}" msgstr "Excepción: {0}" @@ -3594,8 +3614,8 @@ msgstr "Planificar" msgid "Unexpected: {0}" msgstr "Inesperado: {0}" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50 #: libreplan-webapp/src/main/webapp/planner/main.zul:61 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50 msgid "Notes" msgstr "Notas" @@ -3611,25 +3631,34 @@ msgstr "Asignación: [{0},{1}]" msgid "Virtual Workers Group" msgstr "Grupo de trabajadores virtuales" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:217 msgid "Changes saved" msgstr "Cambios guardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1266 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1263 msgid "See scheduling" msgstr "Ver planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:328 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:329 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:332 msgid "Progress measurements" msgstr "Medidas de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1200 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1236 msgid "Add measure" msgstr "Añadir medida" +#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 +msgid "Found resources" +msgstr "Recursos encontrados" + +#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27 +#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 +msgid "Relationship" +msgstr "Relación" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:258 msgid "Work report saved" msgstr "Parte de trabajo guardado" @@ -3640,22 +3669,13 @@ msgstr "Parte de trabajo guardado" msgid "Subcontract" msgstr "Subcontratar" -#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 -msgid "Found resources" -msgstr "Recursos encontrados" - -#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27 -#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 -msgid "Relationship" -msgstr "Relación" - -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41 #: libreplan-webapp/src/main/webapp/planner/main.zul:57 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121 msgid "End" msgstr "Fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1346 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1378 msgid "The date is not valid, the date must be not empty" msgstr "La fecha no es válida, no debe ser vacía" @@ -3664,7 +3684,7 @@ msgid "User login name" msgstr "Nombre de usuario" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 msgid "Cost Categories" msgstr "Categorías de coste" @@ -3689,12 +3709,12 @@ msgid "Users List" msgstr "Lista de usuarios" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 msgid "Task quality forms" msgstr "Formularios de calidad de tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:595 msgid "Not working day" msgstr "Día no laborable" @@ -3703,11 +3723,11 @@ msgid "Progress Types" msgstr "Tipos de progreso" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:155 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:168 msgid "Cost category" msgstr "Categoría de coste" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:727 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:719 msgid "It can not be deleted. At least one sequence is necessary." msgstr "No se puede borrar. Al menos una secuencia es necesaria." @@ -3723,7 +3743,7 @@ msgstr "Cantidad de trabajo" msgid "please, select a quality form" msgstr "por favor, seleccione un formulario de calidad" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:524 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:907 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:132 msgid "Edit {0}: {1}" @@ -3741,14 +3761,14 @@ msgstr "Filtrar formularios de calidad por" msgid "Unindent selected task" msgstr "Desindentar tarea seleccionada" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 -msgid "Customer reference code" -msgstr "Código de referencia del cliente" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 msgid "Constraint" msgstr "Restricción" +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +msgid "Customer reference code" +msgstr "Código de referencia del cliente" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Añadir nuevo campo de tipo de etiqueta" @@ -3761,22 +3781,22 @@ msgstr "La hora de fin no puede ser nula" msgid "Customer reference" msgstr "Referencia de cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:320 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:693 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:846 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:896 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:905 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:932 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931 msgid "Sorry, you do not have permissions to access this project" msgstr "Lo sentimos, no tiene permisos para acceder a este proyecto" @@ -3796,27 +3816,27 @@ msgstr "no se puede pasar mientras el elemento no anterior sea pasado." msgid "New hours group " msgstr "Nuevo grupo de horas " -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 -msgid "Please remember that only saved changes will be printed" -msgstr "Por favor recuerda que sólo los cambios guardados serán impresos" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "Asignar elemento a cola manualmente" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:55 -msgid "Edit Template" -msgstr "Editar Plantilla" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +msgid "Please remember that only saved changes will be printed" +msgstr "Por favor recuerda que sólo los cambios guardados serán impresos" + +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:259 +msgid "percentage cannot be duplicated" +msgstr "el porcentaje no puede estar duplicado" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:218 msgid "Resource: {0} " msgstr "Recurso: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:360 -msgid "percentage cannot be duplicated" -msgstr "el porcentaje no puede estar duplicado" +#: libreplan-webapp/src/main/webapp/templates/templates.zul:55 +msgid "Edit Template" +msgstr "Editar Plantilla" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 msgid "Work Hours" msgstr "Horas de trabajo" @@ -3824,7 +3844,7 @@ msgstr "Horas de trabajo" msgid "Heading" msgstr "Cabecera" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:165 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:166 msgid "Company ID already used. It has to be be unique" msgstr "NIF de la empresa ya está siendo usado. Debe ser único" @@ -3840,8 +3860,8 @@ msgstr "Los porcentajes debería sumar 100" msgid "The calendar exception type not found" msgstr "Tipo de excepción de calendario no encontrado" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:106 +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81 msgid "Unable to convert value to {0} type" msgstr "No se pudo convertir el valor a tipo {0}" @@ -3853,26 +3873,26 @@ msgstr "El trabajador no debe ser nulo" msgid "Some criterion satisfactions overlap in time" msgstr "Algunos criterios satisfechos se solapan en el tiempo" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 -msgid "Value last progress measurement" -msgstr "Valor última medida de progreso" - #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 msgid "LibrePlan: Materials Needs At Date" msgstr "LibrePlan: Necesidad de materiales en fecha" +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 +msgid "Value last progress measurement" +msgstr "Valor última medida de progreso" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 msgid "Worker assignments" msgstr "Asignaciones de trabajador" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:610 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:307 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:328 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:206 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:227 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:603 msgid "{0} already exists" msgstr "{0} ya existe" @@ -3880,14 +3900,14 @@ msgstr "{0} ya existe" msgid "Create Worker" msgstr "Crear trabajador" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587 -msgid "Exception: {0} (Inh)" -msgstr "Excepción: {0} (Her)" - #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 msgid "Code " msgstr "Código" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:589 +msgid "Exception: {0} (Inh)" +msgstr "Excepción: {0} (Her)" + #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:66 msgid "Password confirmation" @@ -3902,13 +3922,13 @@ msgid "Work Report" msgstr "Parte de trabajo" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:135 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:148 msgid "Unit Measures" msgstr "Unidades de medida" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 msgid "Show progress" msgstr "Mostrar progreso" @@ -3916,7 +3936,7 @@ msgstr "Mostrar progreso" msgid "Work" msgstr "Trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 msgid "" "Error saving the project\n" "{0}" @@ -3936,11 +3956,11 @@ msgstr "" msgid "LibrePlan: Machines" msgstr "LibrePlan: Máquinas" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:300 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 msgid "Error" msgstr "Error" @@ -3948,6 +3968,10 @@ msgstr "Error" msgid "Cost Performance Index" msgstr "Eficiencia en coste" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:129 +msgid "ETC" +msgstr "ETC" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:182 msgid "" "Criterion is not valid, the criterion overlap other criterionSatisfaction " @@ -3956,10 +3980,6 @@ msgstr "" "Criterion no es válido, otro criterionSatisfaction se solapa con el mismo " "criterion" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:129 -msgid "ETC" -msgstr "ETC" - #: libreplan-webapp/src/main/webapp/common/layout/template.zul:105 msgid "Log out" msgstr "Salir" @@ -3972,6 +3992,11 @@ msgstr "Añadir nueva unidad de configuración" msgid "Main preferences" msgstr "Preferencias principales" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 +#: libreplan-webapp/src/main/webapp/planner/order.zul:80 +msgid "Progress consolidation" +msgstr "Consolidación de progreso" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:180 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " @@ -3980,21 +4005,16 @@ msgstr "" "Criterion no válido, otro criterionSatisfaction se solapa con el mismo " "criterionType" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:80 -msgid "Progress consolidation" -msgstr "Consolidación de progreso" +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47 +msgid "Add new worker assignment" +msgstr "Añadir nueva asignación de trabajador" #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:406 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:556 msgid "missing field name in a description value" msgstr "falta nombre de campo en un valor de descripción" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47 -msgid "Add new worker assignment" -msgstr "Añadir nueva asignación de trabajador" - -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:688 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:690 msgid "Show all elements" msgstr "Mostrar todos los elementos" @@ -4010,7 +4030,7 @@ msgstr "Recurso limitante" msgid "Task Information" msgstr "Información de la tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:145 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:142 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -4020,23 +4040,23 @@ msgstr "" "Su sesión ha expirado tras un tiempo de inactividad. Por favor, inicie " "sesión de nuevo." +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:309 +msgid "a day is empty" +msgstr "un día está vacío" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:190 msgid "SPREAD" msgstr "PROPAGACIÓN" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:309 -msgid "a day is empty" -msgstr "un día está vacío" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 +msgid "Changes applied" +msgstr "Cambios aplicados" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:122 msgid "Budgeted Cost Work Scheduled" msgstr "Coste de trabajo presupuestado planificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 -msgid "Changes applied" -msgstr "Cambios aplicados" - #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58 msgid "Name cannot be null or empty" msgstr "El nombre no puede ser nulo o vacío" @@ -4049,7 +4069,7 @@ msgstr "Configuración del LDAP" msgid "Queue Element Information" msgstr "Información de elemento de cola" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:147 msgid "Start Date" msgstr "Fecha de inicio" @@ -4065,9 +4085,9 @@ msgstr "Desviación en coste" msgid "criterion type does not allow resource hierarchy" msgstr "el tipo de criterio no permite jerarquía de recursos" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 msgid "Total" msgstr "Total" @@ -4088,30 +4108,30 @@ msgstr "Editar tarea: {0}" msgid "Select destination" msgstr "Seleccionar destino" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274 +msgid "must be greater than the previous date." +msgstr "debe ser mayor que la fecha anterior" + #: libreplan-webapp/src/main/webapp/planner/order.zul:89 #: libreplan-webapp/src/main/webapp/planner/order.zul:95 msgid "Check consolidated progresses" msgstr "Marcar progresos consolidados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530 -msgid "must be greater than the previous date." -msgstr "debe ser mayor que la fecha anterior" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585 msgid "Show all" msgstr "Mostrar todo" -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 -msgid "Estimated hours" -msgstr "Horas estimadas" - #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:59 msgid "Default price" msgstr "Precio por defecto" +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +msgid "Estimated hours" +msgstr "Horas estimadas" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121 msgid "Apply tab changes" msgstr "Aplicar cambios de la pestaña" @@ -4121,7 +4141,7 @@ msgstr "Aplicar cambios de la pestaña" msgid "passwords don't match" msgstr "las contraseñas no conciden" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:88 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:96 msgid "Day properties" msgstr "Propiedades del día" @@ -4133,6 +4153,14 @@ msgstr "Grupos de horas" msgid "Transfer" msgstr "Transferir" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:903 +msgid "" +"Spread progress cannot be changed if there is a consolidation in any " +"progress assignment" +msgstr "" +"El progreso que propaga no se puede cambiar si hay alguna consolidación en " +"alguna asignación de progreso" + #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:22 msgid "Work Hours Types List" msgstr "Lista de tipos de horas de trabajo" @@ -4145,6 +4173,14 @@ msgstr "nuevo hito" msgid "Value last progress reported" msgstr "Valor último progreso notificado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:103 +msgid "" +"Help project developers to collect information about which LibrePlan version" +" you are using" +msgstr "" +"Ayude a los desarrolladores del proyecto a recoger información sobre que " +"versión de LibrePlan está usando" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 msgid "Report Progress" msgstr "Notificar progreso" @@ -4153,7 +4189,7 @@ msgstr "Notificar progreso" msgid "Show dependencies" msgstr "Mostrar dependencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:344 msgid "Schedule from start to deadline" msgstr "Planificar desde el principio a la fecha límite" @@ -4163,8 +4199,8 @@ msgstr "Planificar desde el principio a la fecha límite" msgid "Estimated days" msgstr "Días estimados" -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:51 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:61 msgid "Reference date" msgstr "Fecha de referencia" @@ -4173,14 +4209,14 @@ msgstr "Fecha de referencia" msgid "LibrePlan: Estimated/Planned Hours Per Task" msgstr "LibrePlan: Horas por tarea estimadas/planificadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 -msgid "From chosen date" -msgstr "A partir de la fecha elegida" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81 msgid "Progress Evolution" msgstr "Evolución del progreso" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 +msgid "From chosen date" +msgstr "A partir de la fecha elegida" + #: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 msgid "LibrePlan: Exception Days" msgstr "LibrePlan: Días de excepción" @@ -4189,24 +4225,32 @@ msgstr "LibrePlan: Días de excepción" msgid "LibrePlan: Work Hours" msgstr "LibrePlan: Horas de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 -msgid "LibrePlan Configuration" -msgstr "LibrePlan: Configuración" - #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)" msgstr "" "Completa, parcialmente o no planificada. (Pinche y arrastre para mover " "tareas)" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 -msgid "Original" -msgstr "Original" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +msgid "LibrePlan Configuration" +msgstr "LibrePlan: Configuración" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:125 msgid "CV" msgstr "CV" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 +msgid "Original" +msgstr "Original" + +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:163 +msgid "" +"A new version of LibrePlan is available. Please check next link for more " +"information:" +msgstr "" +"Una nueva versión de LibrePlan está disponible. Por favor compruebe el " +"siguiente enlace para más información:" + #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:31 msgid "Stretches function configuration" msgstr "Configuración de la función de tramos" @@ -4216,22 +4260,22 @@ msgstr "Configuración de la función de tramos" msgid "Not indentable" msgstr "No indentable" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 -msgid "Resource allocation type" -msgstr "Tipo de asignación de recursos" - #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:493 #: libreplan-webapp/src/main/webapp/materials/materials.zul:71 msgid "List of materials for all categories (select one to filter)" msgstr "" "Lista de materiales para todas las categorías (seleccione una para filtrar)" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 +msgid "Resource allocation type" +msgstr "Tipo de asignación de recursos" + #: libreplan-webapp/src/main/webapp/common/layout/login.zul:103 msgid "User disabled" msgstr "Usuario deshabilitado" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:35 #: libreplan-webapp/src/main/webapp/common/error.zul:40 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:35 msgid "Exception type" msgstr "Tipo de excepción" @@ -4247,8 +4291,8 @@ msgstr "Asociación con perfiles" msgid "Task {0} : Duplicate code in DB" msgstr "Tarea {0} : Código duplicado en BD" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:25 #: libreplan-webapp/src/main/webapp/common/error.zul:30 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:25 msgid "Message - {0}" msgstr "Mensaje - {0}" @@ -4260,8 +4304,8 @@ msgstr "LibrePlan: Preferencias" msgid "worker's surname not specified" msgstr "apellidos del trabajador no especificados" -#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:48 +#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41 msgid "Save changes" msgstr "Guardar cambios" @@ -4273,10 +4317,14 @@ msgstr "Preferencias de la aplicación" msgid "Average of estimated hours" msgstr "Media de horas estimadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:285 msgid "Base" msgstr "Base" +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203 +msgid "Total dedication" +msgstr "Dedicación total" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " @@ -4285,10 +4333,6 @@ msgstr "" "No puede borrar la tarea \"{0}\" porque alguno de sus hijos ya se está " "usando en algún parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203 -msgid "Total dedication" -msgstr "Dedicación total" - #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44 msgid "Select source" msgstr "Seleccionar origen" @@ -4297,7 +4341,7 @@ msgstr "Seleccionar origen" msgid "Worker deleted" msgstr "Trabajador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:760 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:752 msgid "Select entity, please" msgstr "Seleccionar entidad, por favor" @@ -4315,15 +4359,15 @@ msgstr "LibrePlan: Perfiles" msgid "Subcontratation date" msgstr "Fecha de subcontratación" +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193 +msgid "Day" +msgstr "Día" + #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 msgid "LibrePlan: Subcontracted Tasks" msgstr "LibrePlan: Tareas subcontratadas" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:96 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185 -msgid "Day" -msgstr "Día" - #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:54 msgid "Current password" msgstr "Contraseña actual" @@ -4338,20 +4382,20 @@ msgstr "Por favor, seleccione un elemento" msgid "Cannot be higher than finish hour" msgstr "No puede ser mayor que la fecha de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:204 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:223 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:217 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:236 msgid "Prefix" msgstr "Prefijo" +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:64 +msgid "New Template element" +msgstr "Nuevo elemento de plantilla" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 msgid "Subcontracted code" msgstr "Código subcontratado" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:64 -msgid "New Template element" -msgstr "Nuevo elemento de plantilla" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:251 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:325 msgid "The base calendar parent not found" @@ -4378,11 +4422,7 @@ msgstr "LibrePlan: Grupos de trabajadores virtuales" msgid "{0} \"{1}\" can not be deleted because of it is being used" msgstr "{0} \"{1}\" no se puede borrar porque está siendo usado" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445 -msgid "Edit limiting resource element" -msgstr "Editar elemento de recurso limitante" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:770 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:772 msgid "The field name must be unique, not null and not empty" msgstr "El nombre del campo debe ser único, no nulo y no vacío" @@ -4393,34 +4433,38 @@ msgstr "El nombre del campo debe ser único, no nulo y no vacío" msgid "Position" msgstr "Posición" +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445 +msgid "Edit limiting resource element" +msgstr "Editar elemento de recurso limitante" + #: libreplan-webapp/src/main/webapp/common/layout/login.zul:108 msgid "Incorrect authentication" msgstr "Identificación incorrecta" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:35 -#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42 -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:53 -msgid "Edit task" -msgstr "Editar tarea" - #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:112 msgid "Edit work report" msgstr "Editar parte de trabajo" +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:53 +#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:35 +msgid "Edit task" +msgstr "Editar tarea" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:44 msgid "Limiting resources (project)" msgstr "Recursos limitantes (proyecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:672 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:674 msgid "A description field of the same name already exists." msgstr "Ya existe un campo de descripción con el mismo nombre." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1163 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1189 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" -"Las medidas de progreso notificadas por formularios de calidad no pueden ser " -"modificadas" +"Las medidas de progreso notificadas por formularios de calidad no pueden ser" +" modificadas" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:44 msgid "Current value" @@ -4430,8 +4474,8 @@ msgstr "Valor actual" msgid "Duplicate progress assignment for task " msgstr "Asignación de progreso duplicada para la tarea " -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 msgid "Save and Continue" msgstr "Guardar y continuar" @@ -4462,12 +4506,12 @@ msgstr "Datos del perfil" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 #: libreplan-webapp/src/main/webapp/common/configuration.zul:35 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:250 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 msgid "Configuration" msgstr "Configuración" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:496 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:528 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:489 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:521 msgid "This date can not be empty" msgstr "La fecha no puede ser vacía" @@ -4479,29 +4523,35 @@ msgstr "LibrePlan: Trabajadores" msgid "Create Virtual Workers Group" msgstr "Crear grupo de trabajadores virtuales" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:100 +msgid "Enable/Disable warning about new LibrePlan versions available" +msgstr "" +"Habilitar/Deshabilitar la advertencia sobre nuevas versiones de " +"LibrePlan disponibles" + #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:95 msgid "Select type" msgstr "Seleccione tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:906 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:917 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:680 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:326 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 msgid "Authorization" msgstr "Autorización" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:320 +msgid "Project saved" +msgstr "Proyecto guardado" + #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:119 msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "" "El nombre no es válido, ya hay otro tipo de progreso con el mismo nombre. " -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 -msgid "Project saved" -msgstr "Proyecto guardado" - #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44 msgid "task" msgstr "tarea" @@ -4526,7 +4576,7 @@ msgstr "Máquinas" msgid "Unit Measures List" msgstr "Lista de unidades de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:149 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:148 msgid "Couldn't find element: {0}" msgstr "No se pudo encontrar el elemento: {0}" @@ -4539,7 +4589,7 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidad no encontrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 msgid "My account" msgstr "Mi cuenta" @@ -4555,7 +4605,7 @@ msgstr "Vista de la compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:764 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:765 msgid "Not editable for containing more that an hours group." msgstr "No editable por contener más de un grupo de horas." @@ -4563,8 +4613,8 @@ msgstr "No editable por contener más de un grupo de horas." msgid "Filter by" msgstr "Filtrar por" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:80 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 msgid "Limiting resource" msgstr "Recurso limitante" @@ -4584,9 +4634,9 @@ msgstr "" "la tarea" #: libreplan-webapp/src/main/webapp/materials/materials.zul:84 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "Categoría" @@ -4607,7 +4657,7 @@ msgstr "Datos de categoría" msgid "Search" msgstr "Buscar" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:242 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:250 msgid "Valid until" msgstr "Válido hasta" @@ -4615,7 +4665,7 @@ msgstr "Válido hasta" msgid "Add New Complementary Field" msgstr "Añadir nuevo campo complementario" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240 msgid "Work weeks list" msgstr "Lista de las semanas de trabajo" @@ -4635,33 +4685,33 @@ msgstr "LibrePlan: transferir proyectos entre escenarios" msgid "%" msgstr "%" -#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:43 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:50 +#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:43 msgid "Remove calendar" msgstr "Borrar calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:251 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:271 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1328 msgid "must be lower than finish date" msgstr "debe ser menor que la fecha de fin" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:766 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:41 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:70 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:135 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "Recurso" @@ -4670,23 +4720,23 @@ msgstr "Recurso" msgid "Total task hours" msgstr "Total de horas de tarea" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 -msgid "Date last progress reported" -msgstr "Fecha último progreso notificado" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 msgid "Could not load any resource" msgstr "No se pudo cargar un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +msgid "Date last progress reported" +msgstr "Fecha último progreso notificado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "Trabajo y progreso por proyecto" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:386 msgid "" -"You must allow multiple active criteria for this type to use this assignment " -"strategy" +"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 " "estrategia de asignación" @@ -4710,41 +4760,41 @@ msgid "Specific Allocations" msgstr "Asignaciones específicas" #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:119 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:120 msgid "error doing reassignation: {0}" msgstr "Error realizando la reasignación: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:423 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:425 msgid "Time filter" msgstr "Filtro de tiempo" +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 +msgid "Move selected task up" +msgstr "Mover tarea seleccionada hacia arriba" + #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27 msgid "Select criteria set or specific resources for allocation" msgstr "" "Seleccione conjunto de criterios o recursos específicos para la asignación" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 -msgid "Move selected task up" -msgstr "Mover tarea seleccionada hacia arriba" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:350 msgid "Create copy" msgstr "Crear copia" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33 -msgid "Work Report Lines List" -msgstr "Lista de líneas de parte de trabajo" - #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28 msgid "Company data" msgstr "Datos de la empresa" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33 +msgid "Work Report Lines List" +msgstr "Lista de líneas de parte de trabajo" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151 msgid "Unit type code cannot be empty" msgstr "El código del tipo de unidad no puede ser vacío" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Users" msgstr "Usuarios" @@ -4768,7 +4818,7 @@ msgstr "" msgid "specific allocation" msgstr "asignación específica" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:148 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:149 msgid "company name has to be unique. It is already used" msgstr "el nombre de la empresa debe ser único. Ya está siendo usado" @@ -4814,8 +4864,8 @@ msgstr "Cálculo de horas imputadas" msgid ": code not found" msgstr ": código no encontrado" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:51 #: libreplan-webapp/src/main/webapp/common/error.zul:55 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:51 msgid "Exit session" msgstr "Salir de la sesión" @@ -4826,6 +4876,20 @@ msgstr "Salir de la sesión" msgid "Group" msgstr "Grupo" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116 +msgid "Please, enter a valid effort" +msgstr "Por favor, introduzca un esfuerzo válido" + +#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58 +#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 +#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28 +msgid "Enabled" +msgstr "Activado" + #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 msgid "Apply filter to" msgstr "Aplicar filtro a" @@ -4834,25 +4898,11 @@ msgstr "Aplicar filtro a" msgid "Statistics list " msgstr "Lista de estadísticas " -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116 -msgid "Please, enter a valid effort" -msgstr "Por favor, introduzca un esfuerzo válido" - -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61 -#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 -#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58 -msgid "Enabled" -msgstr "Activado" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222 msgid "All resources must be limiting. " msgstr "Todos los recursos deben ser limitantes. " -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:525 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:527 msgid "Filter by worker" msgstr "Filtrar por trabajadores" @@ -4864,56 +4914,56 @@ msgstr "Carga debido al proyecto actual" msgid "You are going to change the assignment function. Are you sure?" msgstr "Va a cambiar la función de asignación. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 -msgid "Exception Days" -msgstr "Días de excepción" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:183 msgid "There must be at least 2 stretches for doing interpolation" msgstr "Debe haber al menos dos tramos para hacer interpolación" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 +msgid "Exception Days" +msgstr "Días de excepción" + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:296 msgid "Incompatible update: stored resource is not of type: {0}" msgstr "Actualización incompatible: el recurso almacenado no es de tipo: {0}" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 #: libreplan-webapp/src/main/webapp/templates/templates.zul:137 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 msgid "Save & Continue" msgstr "Guardar y continuar" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 -msgid "LibrePlan: Work And Progress Per Project" -msgstr "LibrePlan: Trabajo y Progreso por Proyecto" - #: libreplan-webapp/src/main/webapp/orders/_edition.zul:92 msgid "Scheduling mode" msgstr "Modo de planificación" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:53 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54 -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23 msgid "Filter" msgstr "Filtrar" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:943 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 +msgid "LibrePlan: Work And Progress Per Project" +msgstr "LibrePlan: Trabajo y Progreso por Proyecto" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:945 msgid "Work Report Type" msgstr "Tipo de parte de trabajo" @@ -4940,8 +4990,8 @@ msgstr "ACWP" msgid "The periods available depend on the resource's calendar." msgstr "Los períodos de disponibilidad dependen del calendario del recurso." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 msgid "Authentication type" msgstr "Tipo de autenticación" @@ -4949,7 +4999,7 @@ msgstr "Tipo de autenticación" msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:350 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Schedule from the deadline to start" msgstr "Planificar desde la fecha límite al principio" @@ -4961,10 +5011,10 @@ msgstr "asignación genérica de máquinas" msgid "Non limiting resource assignation" msgstr "Asignación de recursos no limitantes" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 -#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 -#: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 +#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 msgid "Back" msgstr "Atrás" @@ -4980,13 +5030,13 @@ msgstr "Administración" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:234 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1311 msgid "must be greater than start date" msgstr "debe ser mayor que la fecha de inicio" @@ -4994,8 +5044,8 @@ msgstr "debe ser mayor que la fecha de inicio" msgid "Cancel and return" msgstr "Cancelar y volver" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31 msgid "Assign quality form" msgstr "Asignar formulario de calidad" @@ -5003,15 +5053,15 @@ msgstr "Asignar formulario de calidad" msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 -msgid "worked hours" -msgstr "horas trabajadas" - #: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:51 msgid "Unit measure name" msgstr "Nombre de la unidad de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:140 +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 +msgid "worked hours" +msgstr "horas trabajadas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:139 msgid "cannot include a progress of the same progress type twice" msgstr "no se puede asignar un progreso del mismo tipo dos veces" @@ -5024,6 +5074,11 @@ msgstr "una línea de parte de trabajo no tiene este tipo de etiqueta asignada" msgid "Allocations" msgstr "Asignaciones" +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 +msgid "Capacity" +msgstr "Capacidad" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 msgid "Task code" msgstr "Código de la tarea" @@ -5033,13 +5088,8 @@ msgstr "Código de la tarea" msgid "Length" msgstr "Longitud" -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 -msgid "Capacity" -msgstr "Capacidad" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:333 msgid "Create derived" msgstr "Crear derivado" @@ -5055,24 +5105,24 @@ msgstr "debe ser mayor que cero" msgid "must be a real positive number" msgstr "debe ser un número real positivo" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33 -msgid "No Allocations have been done" -msgstr "No se han hecho asignaciones" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122 msgid "Total hours task" msgstr "Total de horas de tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:441 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33 +msgid "No Allocations have been done" +msgstr "No se han hecho asignaciones" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:443 msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1071 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1068 msgid "Create project" msgstr "Crear proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:542 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:535 msgid "This date can not include the whole next work week" msgstr "Esta fecha no puede incluir a la próxima semana de trabajo completa" @@ -5080,13 +5130,18 @@ msgstr "Esta fecha no puede incluir a la próxima semana de trabajo completa" msgid "" "Allow multiple values of this type of criterion in the same period of time" msgstr "" -"Permitir valores múltiples para este tipo de criterio en el mismo período de " -"tiempo" +"Permitir valores múltiples para este tipo de criterio en el mismo período de" +" tiempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1280 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1198 +msgid "Consolidated progress measurement can not be removed" +msgstr "La medida de progreso consolidada no se puede borrar" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300 msgid "" "The date is not valid, the date must be unique for this progress assignment" -msgstr "La fecha no es válida, debe ser única para esta asignación de progreso" +msgstr "" +"La fecha no es válida, debe ser única para esta asignación de progreso" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:453 msgid "The code cannot be empty." @@ -5111,8 +5166,8 @@ msgstr "" msgid "New work report" msgstr "Nuevo parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "yes" msgstr "sí" @@ -5120,11 +5175,15 @@ msgstr "sí" msgid "Root calendar" msgstr "Calendario raíz" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 msgid "Port" msgstr "Puerto" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 +msgid "Select gap" +msgstr "Seleccionar intervalo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:867 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5132,10 +5191,6 @@ msgstr "" "Borrando este proyecto subcontratado, perderá la relación para notificar " "progresos. ¿Está seguro?" -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 -msgid "Select gap" -msgstr "Seleccionar intervalo" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Finish" msgstr "Fecha de fin" @@ -5149,13 +5204,13 @@ msgstr "Validar" msgid "This resource has already been added." msgstr "Este recurso ya ha sido añadido." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:149 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:162 msgid "Calendar exception types" msgstr "Tipos de excepciones de calendario" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34 msgid "Cost category assignment" msgstr "Asignación de categoría de coste" @@ -5163,7 +5218,7 @@ msgstr "Asignación de categoría de coste" msgid "missing code in a hour cost" msgstr "falta código en un coste por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:869 msgid "All workers" msgstr "Todos los trabajadores" @@ -5178,58 +5233,58 @@ msgid "Select required criteria set and press filter button" msgstr "" "Seleccione conjunto de criterios requeridos y pulse el botón de filtrar" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:990 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1181 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1438 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:632 +msgid "Hours Group {0} : Duplicate code in DB" +msgstr "Grupo de horas {0} : Código duplicado en BD" + #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:992 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1182 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1439 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:765 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1491 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1515 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:757 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:94 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:92 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:94 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:92 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:94 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:44 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:55 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 msgid "cannot be null or empty" msgstr "no puede ser nulo o vacío" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:632 -msgid "Hours Group {0} : Duplicate code in DB" -msgstr "Grupo de horas {0} : Código duplicado en BD" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:52 msgid "New code" @@ -5243,7 +5298,7 @@ msgstr "El tipo de progreso no puede ser modificado" msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:904 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:906 msgid "The index fields and labels must be uniques and consecutives" msgstr "Los campos de índice y las etiquetas deben ser únicas y consecutivas" @@ -5252,9 +5307,9 @@ msgid "Estimate To Complete" msgstr "Estimación del coste pendiente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidad" @@ -5294,27 +5349,27 @@ msgstr "Lista de etiquetas" msgid "Criterion Requirements" msgstr "Criterios requeridos" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:215 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:196 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:223 msgid "Extra Effort" msgstr "Esfuerzo extra" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59 -msgid "Move selected task down" -msgstr "Mover tarea seleccoinada hacia abajo" - #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269 msgid "Already exists other label with the same name" msgstr "Ya existe otra etiqueta con el mismo nombre" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:32 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59 +msgid "Move selected task down" +msgstr "Mover tarea seleccoinada hacia abajo" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:32 msgid "Customer Reference" msgstr "Referencia de cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:130 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:129 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:142 msgid "spread values are not valid, at least one value should be true" msgstr "" "los valores de propagación no son válidos, al menos uno debe ser verdadero" @@ -5339,34 +5394,43 @@ msgstr "Nombre de usuario de nuestra empresa" msgid "Filter work reports" msgstr "Filtrar partes de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:427 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:679 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:63 +#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 +msgid "Progress" +msgstr "Progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:429 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "the Configuration window before." msgstr "" -"El calendario por defecto no se puede. Por favor, cambie antes el calendario " -"por defecto en la ventana de configuración." - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:903 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:63 -#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 -msgid "Progress" -msgstr "Progreso" +"El calendario por defecto no se puede. Por favor, cambie antes el calendario" +" por defecto en la ventana de configuración." #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:257 msgid "" -"This criterion type cannot be deleted because it has assignments to projects " -"or resources" +"This criterion type cannot be deleted because it has assignments to projects" +" or resources" msgstr "" "Este tipo de criterio no se puede borrar porque tiene asignaciones a " "proyectos o recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1210 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1068 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1128 +msgid "" +"This progress measurement cannot be deleted or changed because it is " +"consolidated" +msgstr "" +"Esta medida de progreso no se puede borrar o cambiar porque está consolidada" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 msgid "All progress types have already been assigned." msgstr "Todos los tipos de progreso ya han sido asignados." @@ -5374,14 +5438,14 @@ msgstr "Todos los tipos de progreso ya han sido asignados." msgid "Price per hour" msgstr "Precio por hora" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 +msgid "Calendars" +msgstr "Calendarios" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 msgid "Project: {0} " msgstr "Proyecto: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 -msgid "Calendars" -msgstr "Calendarios" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:360 msgid "The date cannot be null" msgstr "La fecha no puede ser nula" @@ -5398,24 +5462,24 @@ msgstr "" msgid "options" msgstr "opciones" -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 -msgid "Latest date" -msgstr "Fecha más tardía" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 +msgid "LibrePlan: Work Reports" +msgstr "LibrePlan: Partes de trabajo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 +msgid "Error on showing delete confirm" +msgstr "Error al mostrar la confirmación de borrado" #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:32 msgid "Show only current satisfied criteria" msgstr "Mostrar solo los criterios satisfechos actualmente" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 -msgid "LibrePlan: Work Reports" -msgstr "LibrePlan: Partes de trabajo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 -msgid "Error on showing delete confirm" -msgstr "Error al mostrar la confirmación de borrado" +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 +msgid "Latest date" +msgstr "Fecha más tardía" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" @@ -5445,30 +5509,43 @@ msgstr "" "El último tramo debe tener 100% de porcentajes de longitud y cantidad de " "trabajo" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:60 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75 msgid "Filter by projects" msgstr "Filtrar por proyectos" -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:23 -msgid "Criteria of selected type " -msgstr "Criterios del tipo seleccionado " +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:494 +msgid "" +"This progress assignment cannot be deleted or changed because it has some " +"progress consolidation" +msgstr "" +"Está asignación de progreso no se puede borrar o cambiar porque tiene alguna" +" consolidación de progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:730 +msgid "Consolidated progress can not be removed" +msgstr "La consolidación de progreso no se puede borrar" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 msgid "Each worker configuration unit name" msgstr "Nombre de la unidad de configuración de cada trabajador" -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:23 +msgid "Criteria of selected type " +msgstr "Criterios del tipo seleccionado " + #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:234 msgid "Active" msgstr "Activo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1247 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1265 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso no puede estar en " @@ -5476,22 +5553,13 @@ msgstr "Esta medida de progreso no puede estar en " msgid "Inherited labels" msgstr "Etiquetas heredadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1232 -msgid "" -"This progress can not be changed or removed, because it has got consolidated " -"progress. It is needed to remove the consolidation on all its progress." -msgstr "" -"Este progreso no puede ser cambiado o borrado, porque tiene progreso " -"consolidado. Se requiere borrar la consolidación de todas sus medidas de " -"progreso." - +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:946 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:945 msgid "Unindent" msgstr "Desindentar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1370 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:939 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1405 msgid "Value is not valid, the current value must be not empty" msgstr "El valor no es válido, el valor actual no debe ser vacío" @@ -5519,37 +5587,41 @@ msgstr "Precisión" msgid "missing code in a work report line" msgstr "falta código en una línea de parte de trabajo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 -msgid "Efforts" -msgstr "Esfuerzos" - #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:41 msgid "Show all reported hours" msgstr "Mostrar todas las horas notificadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 +msgid "Efforts" +msgstr "Esfuerzos" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 msgid "Projects List" msgstr "Lista de proyectos" +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:60 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:60 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:82 msgid "Generate code" msgstr "Generar código" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:505 +msgid "The code sequence is already in use and it can not be updated." +msgstr "El código de secuencia ya está en uso y no se puede actualizar." + #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:116 msgid "Scheduling state" msgstr "Estado de planificación" @@ -5558,10 +5630,6 @@ msgstr "Estado de planificación" msgid "This template can not be removed because it has applications." msgstr "Esta plantilla no se puede borrar porque tiene aplicaciones." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:513 -msgid "The code sequence is already in use and it can not be updated." -msgstr "El código de secuencia ya está en uso y no se puede actualizar." - #: libreplan-webapp/src/main/webapp/settings/settings.zul:43 msgid "Personal Data" msgstr "Datos personales" @@ -5578,14 +5646,14 @@ msgstr "LibrePlan: Horas Trabajadas Por Recurso" msgid "Number of iterations should be between 1 and " msgstr "El número de iteraciones debería estar entre 1 y " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:149 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:145 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Los escenarios deben estar habilitados ya que existen más elementos que " "master" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:50 #: libreplan-webapp/src/main/webapp/common/error.zul:54 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:50 msgid "Reload" msgstr "Recargar" @@ -5594,30 +5662,30 @@ msgstr "Recargar" msgid "Task {0} : Task group is incompatible type with {1}" msgstr "Tarea {0} : El grupo de tareas tiene un tipo incompatible con {1}" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 -msgid "Profiles authorization" -msgstr "Autorización de perfiles" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "Grupos de trabajadores virtuales" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:95 -msgid "Planning charts expanded" -msgstr "Gráficos de planificación expandidos" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 +msgid "Profiles authorization" +msgstr "Autorización de perfiles" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 msgid "Assignation" msgstr "Asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:694 -msgid "Inh" -msgstr "Her" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:95 +msgid "Planning charts expanded" +msgstr "Gráficos de planificación expandidos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:341 msgid "Not deletable" msgstr "Imborrable" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:696 +msgid "Inh" +msgstr "Her" + #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28 msgid "Administrator" msgstr "Administrador" @@ -5626,7 +5694,7 @@ msgstr "Administrador" msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignaciones" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:195 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:208 msgid "Select entity" msgstr "Seleccione entidad" @@ -5638,7 +5706,18 @@ msgstr "código no especificado" msgid "Projects list" msgstr "Lista de proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:973 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159 +msgid "if the report is not opened automatically" +msgstr "si el informe no se abre de forma automática" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:975 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" @@ -5649,7 +5728,7 @@ msgstr "" msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:702 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:708 msgid "Overall progress" msgstr "Progreso global" @@ -5664,7 +5743,7 @@ msgstr "Todos los proyectos" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:61 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:286 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 msgid "Password" msgstr "Contraseña" @@ -5673,20 +5752,24 @@ msgstr "Contraseña" msgid "Observations" msgstr "Observaciones" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947 msgid "Edit project" msgstr "Editar proyecto" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:27 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25 msgid "Progress assignments" msgstr "Asignaciones de progreso" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:262 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:248 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:270 msgid "Valid from" msgstr "Válido desde" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53 +msgid "Month" +msgstr "Mes" + #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:206 msgid "exception date already exists" msgstr "la fecha de excepción ya existe" @@ -5695,16 +5778,12 @@ msgstr "la fecha de excepción ya existe" msgid "There exists other template with the same name." msgstr "Ya existe otra plantilla con el mismo nombre." -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53 -msgid "Month" -msgstr "Mes" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:911 msgid "{0} could not be allocated. Cannot allocate more than one resource" msgstr "No se pudo asignar {0}. No se puede asignar más que un recurso" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58 msgid "Color" msgstr "Color" @@ -5715,43 +5794,43 @@ msgstr "La contraseña actual es incorrecta" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:366 msgid "Cannot insert material in general view. Please, select a category" msgstr "" -"No se puede insertar material en la vista general. Por favor, seleccione una " -"categoría" +"No se puede insertar material en la vista general. Por favor, seleccione una" +" categoría" #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java:193 msgid "criterion satisfaction's start date not specified" msgstr "fecha de inicio del criterio satisfecho no especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405 -msgid "Only {0} resources per day were achieved for current allocation" -msgstr "Sólo se han logrado {0} recursos por día para la asignación actual" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311 msgid "Delete {0} \"{1}\". Are you sure?" msgstr "Borrar {0} \"{1}\". ¿Está seguro?" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405 +msgid "Only {0} resources per day were achieved for current allocation" +msgstr "Sólo se han logrado {0} recursos por día para la asignación actual" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 +#: libreplan-webapp/src/main/webapp/planner/main.zul:66 #: libreplan-webapp/src/main/webapp/planner/order.zul:128 #: libreplan-webapp/src/main/webapp/planner/order.zul:163 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 -#: libreplan-webapp/src/main/webapp/planner/main.zul:66 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 msgid "Accept" msgstr "Aceptar" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:310 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:345 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:361 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:274 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:281 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:288 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:295 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:323 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:358 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:365 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:372 msgid "Example: {0}" msgstr "Ejemplo: {0}" @@ -5775,7 +5854,7 @@ msgstr "Calculado" msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1167 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 msgid "Calculated progress measurement can not be removed" msgstr "Las medidas de progreso calculadas no se pueden borrar" @@ -5792,17 +5871,6 @@ msgstr "Acceso al sistema" msgid "Probability" msgstr "Probabilidad" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159 -msgid "Click on " -msgstr "Click en" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:112 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:115 msgid "Report data" @@ -5816,23 +5884,23 @@ msgstr "Carga externa" msgid "Progress sent successfully" msgstr "El progreso se envió con éxito" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73 +msgid "Priority" +msgstr "Prioridad" + #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46 msgid "instance not found" msgstr "instancia no encontrada" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73 -msgid "Priority" -msgstr "Prioridad" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 +msgid "Apply changes and continue edition" +msgstr "Aplicar cambios y continuar la edición" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:219 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Infinitely Over Assignable" msgstr "Sobreasignable infinitamente" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" -msgstr "Aplicar cambios y continuar la edición" - #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426 msgid "criterion names must be unique inside a criterion type" msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio" @@ -5846,48 +5914,48 @@ msgstr "" "recursos y sus calendarios." #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:59 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:80 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:131 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:264 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71 -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:59 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:80 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:51 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 +#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:197 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:272 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:29 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 msgid "Code" msgstr "Código" @@ -5895,49 +5963,49 @@ msgstr "Código" msgid "Add stretch" msgstr "Añadir tramo" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:33 -msgid "Show resource assignments" -msgstr "Mostrar las asignaciones de recursos" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70 msgid "Assignation type" msgstr "Tipo de asignación" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:33 +msgid "Show resource assignments" +msgstr "Mostrar las asignaciones de recursos" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369 msgid "Calculate Workable Days" msgstr "Calcular días laborables" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:214 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:241 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:214 msgid "" "Start date is not valid, the new start date must be lower than the end date" msgstr "" "La fecha de inicio no es válida, la fecha de inicio nueva debe ser anterior " "a la fecha de fin" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:53 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 msgid "Start date" msgstr "Fecha de inicio" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:171 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:179 msgid "Update exception" msgstr "Actualizar excepción" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +msgid "Budget" +msgstr "Presupuesto" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "No se puede efectuar la operación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 -msgid "Budget" -msgstr "Presupuesto" - #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "May" msgstr "Mayo" @@ -5950,27 +6018,27 @@ msgstr "Ya existe otro criterio con el mismo nombre" msgid "Unit name" msgstr "Nombre de la unidad" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44 +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 +msgid "Project code" +msgstr "Código del proyecto" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 msgid "Write" msgstr "Escribir" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 -msgid "Project code" -msgstr "Código del proyecto" +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:39 +msgid "Number of applications" +msgstr "Número de aplicaciones" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503 msgid "Assign element to queue automatically" msgstr "Asignar elemento a la cola automáticamente" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:39 -msgid "Number of applications" -msgstr "Número de aplicaciones" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:82 msgid "" "Date which the task must start after (press enter in textbox to open " @@ -5979,7 +6047,7 @@ msgstr "" "Fecha después de la cual la tarea debe empezar (presione enter en el cuadro " "de texto para abrir el calendario o escriba la fecha directamente)" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:598 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "Normal" @@ -5999,7 +6067,7 @@ msgstr "Vista de proyecto" msgid "Task Code" msgstr "Código de la tarea" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:655 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:657 msgid "This label type already is assigned to the work report type." msgstr "Este tipo de etiqueta ya está asignado al tipo de parte de trabajo." @@ -6009,31 +6077,31 @@ msgstr "Este tipo de etiqueta ya está asignado al tipo de parte de trabajo." msgid "Probability %" msgstr "Probabilidad %" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:815 +#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 +msgid "Load" +msgstr "Carga" + #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:27 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28 msgid "New criterion" msgstr "Criterio nuevo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:700 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:813 -#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 -msgid "Load" -msgstr "Carga" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:682 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:684 #: libreplan-webapp/src/main/webapp/materials/materials.zul:81 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 #: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 msgid "Description" msgstr "Descripción" @@ -6055,24 +6123,28 @@ msgstr "ya existe una asignación para los criterios {0}" msgid "Project Templates" msgstr "Plantillas de proyectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:344 msgid "Forward" msgstr "Adelante" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469 -msgid "Invalid queue element" -msgstr "elemento de cola inválido" - #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:43 msgid "Number of finished applications" msgstr "Número de aplicaciones finalizadas" +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469 +msgid "Invalid queue element" +msgstr "elemento de cola inválido" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:575 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:584 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:592 msgid "Unnasigned" msgstr "No asignado" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 +msgid "At least one HoursGroup is needed" +msgstr "Es necesario al menos un grupo de horas" + #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 @@ -6080,10 +6152,6 @@ msgstr "No asignado" msgid "User" msgstr "Usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -msgid "At least one HoursGroup is needed" -msgstr "Es necesario al menos un grupo de horas" - #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71 msgid "Interacts with applications" msgstr "Interactúa con aplicaciones" @@ -6100,14 +6168,14 @@ msgstr "El porcentaje de duración debería estar entre 0 y 100" msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 msgid "Split" msgstr "Dividir" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:107 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100 msgid "please, select a project" msgstr "por favor, seleccione un proyecto" @@ -6115,16 +6183,16 @@ msgstr "por favor, seleccione un proyecto" msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany" -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:33 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:68 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:41 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:30 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:96 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:30 msgid "Starting date" msgstr "Fecha de inicio" @@ -6141,56 +6209,56 @@ msgstr "Carga 100%" msgid "Function" msgstr "Función" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:745 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:768 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:362 msgid "date in future" msgstr "fecha en el futuro" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:855 -msgid "New project version" -msgstr "Nueva versión de proyecto" - -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:156 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:137 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135 msgid "Format" msgstr "Formato" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1234 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:870 +msgid "New project version" +msgstr "Nueva versión de proyecto" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1231 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28 -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 -#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:41 +#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35 #: libreplan-webapp/src/main/webapp/templates/_list.zul:48 +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 +#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33 msgid "Edit" msgstr "Editar" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 msgid "Init date" msgstr "Fecha de inicio" @@ -6202,7 +6270,7 @@ msgstr "Responsable" msgid "New password" msgstr "Nueva contraseña" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:354 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:253 msgid "percentage must be in range (0,100]" msgstr "el porcentaje debe pertenecer al rango (0,100]" @@ -6218,8 +6286,8 @@ msgstr "" "los códigos de las asignaciones de recursos a una categoría de coste deben " "ser únicos dentro de un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:161 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:161 msgid "XML" msgstr "XML" @@ -6231,8 +6299,8 @@ msgstr "" "El tipo de criterio no es válido, el tipo se solapa con otro criterio " "satisfecho con el mismo tipo" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:85 +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61 msgid "Unable to convert {0} value to {1} type" msgstr "No se pudo convertir el valor {0} al tipo {1}" @@ -6241,21 +6309,21 @@ msgid "Tree {0} sucessfully flattened" msgstr "Árbol {0} aplanado satisfactoriamente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:82 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "Precio de la unidad" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 +msgid "Communication date" +msgstr "Fecha de comunicación" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Project Code" msgstr "Código del proyecto" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 -msgid "Communication date" -msgstr "Fecha de comunicación" - #: libreplan-webapp/src/main/webapp/planner/reassign.zul:30 msgid "Reassigning" msgstr "Reasignando" @@ -6273,44 +6341,44 @@ msgstr "Unidad de medida" msgid "Label Types List" msgstr "Lista de Tipos de Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:127 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:101 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 -#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:25 -#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: libreplan-webapp/src/main/webapp/templates/_advances.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:83 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:123 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:103 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:144 +#: libreplan-webapp/src/main/webapp/templates/_list.zul:25 +#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: libreplan-webapp/src/main/webapp/templates/_advances.zul:36 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:109 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27 +#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 msgid "Type" msgstr "Tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:348 msgid "{0} projects reassignation remaining" msgstr "quedan {0} proyectos por reasignar" @@ -6330,11 +6398,11 @@ msgstr "Noviembre" msgid "Enable/Disable" msgstr "Habilitar/Deshabilitar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1268 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1290 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1310 msgid "" -"Value is not valid, the value must be greater than the value of the previous " -"progress." +"Value is not valid, the value must be greater than the value of the previous" +" progress." msgstr "" "El valor no es válido, el valor debe ser mayor que el valor del progreso " "anterior." @@ -6351,8 +6419,8 @@ msgstr " en el directorio especificado." msgid "criterion satisfaction codes must be unique inside a resource" msgstr "el código del criterio debe ser único dentro de un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "no" msgstr "no" @@ -6360,13 +6428,13 @@ msgstr "no" msgid "missing code in a work report." msgstr "falta el código en un parte de trabajo." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:118 msgid "Criterion" msgstr "Criterio" @@ -6374,17 +6442,17 @@ msgstr "Criterio" msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 msgid "Test LDAP connection" msgstr "Probar la conexión con el LDAP" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:96 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 msgid "Generate code for" msgstr "Generar código para" +#: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:468 -#: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103 msgid "missing code in a label" msgstr "falta el código en una etiqueta" @@ -6392,7 +6460,7 @@ msgstr "falta el código en una etiqueta" msgid "Actual Cost Work Performed" msgstr "Coste de trabajo realizado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:177 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:174 msgid "Create project from Template" msgstr "Crear proyecto a partir de plantilla" @@ -6414,7 +6482,7 @@ msgstr "debe seleccionar un tipo de autorización" msgid "Must start after (days since beginning project)" msgstr "Debe empezar después de (días desde el inicio del proyecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:854 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:869 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" @@ -6423,53 +6491,53 @@ msgstr "" "y sus derivados. ¿Está seguro?" #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156 -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29 -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 #: libreplan-webapp/src/main/webapp/materials/materials.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:80 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:163 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:92 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:133 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 msgid "Add" msgstr "Añadir" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:43 #: libreplan-webapp/src/main/webapp/common/error.zul:48 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:43 msgid "Stacktrace" msgstr "Stacktrace" #: libreplan-webapp/src/main/webapp/materials/materials.zul:48 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:82 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120 msgid "Unselect" msgstr "Deseleccionar" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:609 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:611 msgid "You should select the type of exception" msgstr "Debe seleccionar el tipo de excepción" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:31 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:31 msgid "Deadline" msgstr "Fecha límite" @@ -6477,14 +6545,14 @@ msgstr "Fecha límite" msgid "Tasks" msgstr "Tareas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 -msgid "Subcontracted Tasks" -msgstr "Tareas subcontratadas" - #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:118 msgid "Filter by categories or materials" msgstr "Filtrar por categorías o materiales" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 +msgid "Subcontracted Tasks" +msgstr "Tareas subcontratadas" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:389 msgid "Amount work percentage should be between 0 and 100" msgstr "El porcentaje de cantidad de trabajo debe estar entre 0 y 100" @@ -6503,15 +6571,15 @@ msgstr "VAC" msgid "Label type" msgstr "Tipo de etiqueta" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +msgid "Administration / Management" +msgstr "Administración / Gestión" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236 msgid "Advanced Allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 -msgid "Administration / Management" -msgstr "Administración / Gestión" - #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:93 msgid "Number of iterations" msgstr "Número de iteraciones" @@ -6538,8 +6606,8 @@ msgstr "código padre inconsistente." msgid "effort is not properly calculated based on clock" msgstr "el esfuerzo no está bien calculado basándose en el reloj" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:63 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 msgid "Status" msgstr "Estado" @@ -6547,33 +6615,41 @@ msgstr "Estado" msgid "Resource load view" msgstr "Vista de carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:84 -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:34 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 -msgid "Hours" -msgstr "Horas" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:756 msgid "the date must be inside the visualization area" msgstr "la fecha debe estar dentro del área de visualización" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:84 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:34 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37 +msgid "Hours" +msgstr "Horas" + #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56 msgid "Quality form type" msgstr "Tipo de formulario de calidad" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318 +msgid "{0} \"{1}\" deleted" +msgstr "{0} \"{1}\" borrado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523 +msgid "date not specified." +msgstr "fecha no especificada." + #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:392 msgid "work report has not this label type assigned" msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta" @@ -6582,28 +6658,20 @@ msgstr "el parte de trabajo no tiene asignado este tipo de etiqueta" msgid "Limiting assignment" msgstr "Asignación limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523 -msgid "date not specified." -msgstr "fecha no especificada." - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318 -msgid "{0} \"{1}\" deleted" -msgstr "{0} \"{1}\" borrado" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364 msgid " hours" msgstr " horas" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 +msgid "Limiting Resources Planning" +msgstr "Asignación de recursos limitantes" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeModel.java:344 msgid "The name of the criterion is empty." msgstr "El nombre del criterio está vacío." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 -msgid "Limiting Resources Planning" -msgstr "Asignación de recursos limitantes" - #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69 msgid "New label" msgstr "Nueva etiqueta" @@ -6612,22 +6680,22 @@ msgstr "Nueva etiqueta" msgid "Worker ID cannot be empty" msgstr "NIF del trabajador no especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352 -msgid "The start date cannot be null" -msgstr "La fecha de inicio no puede ser nula" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:188 msgid "All project tasks" msgstr "Todas las tareas del proyecto" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343 +msgid "The start date cannot be null" +msgstr "La fecha de inicio no puede ser nula" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:386 msgid "LDAP Roles (separated by ;)" msgstr "Roles del LDAP (separados por ;)" -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 msgid "Allocation configuration" msgstr "Configuración de asignación" @@ -6644,8 +6712,8 @@ msgstr "Precio de subcontratación" msgid "Resources per day are zero" msgstr "Hay cero recursos por día" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 msgid "Assigned criteria" msgstr "Criterios asignados" @@ -6653,14 +6721,14 @@ msgstr "Criterios asignados" msgid "Help on authentication (opens a new window)" msgstr "Ayuda sobre la identificación (abre una ventana nueva)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:778 -msgid "The length must be greater than 0, and not null." -msgstr "La longitud debe ser mayor que cero y no nula." - #: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Not a valid effort duration" msgstr "No es una duración de esfuerzo válida" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:780 +msgid "The length must be greater than 0, and not null." +msgstr "La longitud debe ser mayor que cero y no nula." + #: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:199 msgid "Cannot remove the predefined Exception Day Type \"{0}\"" msgstr "No se puede el tipo de día de excepción predefinido \"{0}\"" @@ -6669,7 +6737,7 @@ msgstr "No se puede el tipo de día de excepción predefinido \"{0}\"" msgid "Base calendar type" msgstr "Tipo de calendario base" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:613 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:606 msgid "Could not save new calendar" msgstr "No se pudo guardar el calendario nuevo" @@ -6691,47 +6759,47 @@ msgstr "No se pudo encontrar el criterio {0}" msgid "Apply filtering to tasks satisfying required criteria" msgstr "Aplicar filtrado a las tareas que satisfacen los criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:347 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tareas en un proyecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:162 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:868 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmar" -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 -#: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 +#: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:54 +#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52 msgid "Create" msgstr "Crear" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 -msgid "Permissions" -msgstr "Permisos" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1716 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1722 msgid "please, select a work report type" msgstr "por favor, seleccione un tipo de parte de trabajo" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 +msgid "Permissions" +msgstr "Permisos" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:487 msgid "List of materials for category: {0}" msgstr "Lista de materiales para la categoría {0}" @@ -6740,86 +6808,114 @@ msgstr "Lista de materiales para la categoría {0}" msgid "Cancel edition" msgstr "Cancelar la edición" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 msgid "Total price" msgstr "Precio total" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:984 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:990 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:888 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1208 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1455 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1229 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1247 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:104 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 +#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 +#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 +#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 +#: libreplan-webapp/src/main/webapp/templates/_list.zul:53 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 +#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45 +#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 +msgid "Delete" +msgstr "Borrar" + #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46 msgid "Labels without inheritance" msgstr "Etiquetas sin herencia" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:344 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:886 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1207 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1454 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1250 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:983 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:989 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133 -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45 -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 -#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 -#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 -#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:53 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127 -msgid "Delete" -msgstr "Borrar" +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32 +msgid "RECEIVED" +msgstr "RECIBIDO" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:33 +msgid "PENDING" +msgstr "PENDIENTE" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:34 +msgid "ORDERED" +msgstr "SOLICITADO" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:35 +msgid "PROCESSING" +msgstr "PROCESANDO" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:36 +msgid "CANCELED" +msgstr "CANCELADO" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34 +msgid "heading" +msgstr "cabecera" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34 +msgid "line" +msgstr "línea" #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:31 msgid "Number of assigned hours" @@ -6833,13 +6929,25 @@ msgstr "Número de horas calculado por reloj" msgid "Number of assigned hours and the time" msgstr "Número de horas asignadas y la hora" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34 -msgid "heading" -msgstr "cabecera" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109 +msgid "Hours cost type cannot be empty or null" +msgstr "Tipo de coste de horas no puede ser vacío o nulo" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34 -msgid "line" -msgstr "línea" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118 +msgid "Init date cannot be empty or null" +msgstr "La fecha de inicio no puede ser vacía o nula" + +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123 +msgid "End date cannot be empty or null" +msgstr "La fecha de fin no puede ser vacía o nula" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29 +msgid "by percentage" +msgstr "por porcentaje" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29 +msgid "by items" +msgstr "por items" #: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34 msgid "Use browser language configuration" @@ -6865,37 +6973,155 @@ msgstr "Ruso" msgid "Portuguese" msgstr "Portugués" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 -msgid "unlimited" -msgstr "ilimitado" +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:40 +msgid "Italian" +msgstr "Italiano" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 -msgid "Monday" -msgstr "Lunes" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:410 +msgid "Stretches must sum 100%" +msgstr "Los tramos deben sumar 100%" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 -msgid "Tuesday" -msgstr "Martes" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76 +msgid "Flat" +msgstr "Plano" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 -msgid "Wednesday" -msgstr "Miércoles" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78 +msgid "Stretches" +msgstr "Tramos" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 -msgid "Thursday" -msgstr "Jueves" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 +msgid "Interporlation" +msgstr "Interpolación" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 -msgid "Friday" -msgstr "Viernes" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 +msgid "Sigmoid" +msgstr "Sigmoide" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 -msgid "Saturday" -msgstr "Sábado" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30 +msgid "Pending" +msgstr "Pendiente" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101 -msgid "Sunday" -msgstr "Domingo" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 +msgid "Failed sent" +msgstr "Envío fallido" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:33 +msgid "Success sent" +msgstr "Envío exitoso" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:95 +msgid "There are no days available due to not satisfying the criteria." +msgstr "No hay días disponibles debido a que no se satisfacen los criterios." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96 +msgid "" +"Another possibility is that the resources don't have days available due to " +"their calendars." +msgstr "" +"Otra posibilidad es que los recursos no tengan días disponibles debido a sus" +" calendarios." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:102 +msgid "" +"There are no days available in the days marked available by the task " +"calendar." +msgstr "" +"No hay días disponibles en los días marcados como disponibles por el " +"calendario de la tarea." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103 +msgid "Maybe the criteria are not satisfied in those days." +msgstr "Puede que los criterios no se satisfagan en esos días." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 +msgid "" +"The resource's calendar has no available days starting from the start of the" +" task." +msgstr "" +"El calendario del recurso no tiene días disponibles empezando desde el " +"principio de la tarea." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 +msgid "" +"There are no days available at resource's calendar in the days marked " +"available by the task's calendar." +msgstr "" +"No hay días disponibles en el calendario del recurso en los días marcados " +"como disponibles por el clanedario de la tarea." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28 +msgid "Finished" +msgstr "Finalizado" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29 +msgid "In progress" +msgstr "En progreso" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31 +msgid "Blocked" +msgstr "Bloqueado" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:29 +msgid "as soon as possible" +msgstr "tan pronto como sea posible" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:41 +msgid "start not earlier than" +msgstr "empezar no antes de" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:53 +msgid "start in fixed date" +msgstr "comenzar en fecha fija" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:65 +msgid "as late as possible" +msgstr "tan tarde como sea posible" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:77 +msgid "finish not later than" +msgstr "acabar no después de" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java:53 +msgid "Hour should be a value between 0 and 23" +msgstr "La hora debería tener un valor entre 0 y 23" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java:170 +msgid "A queue dependency has to have an origin different from destiny" +msgstr "" +"Una dependencia de la cola tiene que ter un origen diferente de su destino" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33 +msgid "Read authorization" +msgstr "Autorización de lectura" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34 +msgid "Write authorization" +msgstr "Autorización de escritura" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:34 +msgid "Web service reader" +msgstr "Lector de servicio web" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35 +msgid "Web service writer" +msgstr "Escritor de servicio web" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:36 +msgid "All projects read allowed" +msgstr "Permiso de lectura para todos los proyectos" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37 +msgid "All projects edition allowed" +msgstr "Permiso de edición para todos los proyectos" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:38 +msgid "Project creation allowed" +msgstr "Permiso de creación de proyectos" + +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:122 +msgid "Line" +msgstr "Línea" #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31 msgid "red (default)" @@ -6933,6 +7159,38 @@ msgstr "naranja" msgid "purple" msgstr "púrpura" +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 +msgid "unlimited" +msgstr "ilimitado" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 +msgid "Monday" +msgstr "Lunes" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 +msgid "Tuesday" +msgstr "Martes" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 +msgid "Wednesday" +msgstr "Miércoles" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 +msgid "Thursday" +msgstr "Jueves" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 +msgid "Friday" +msgstr "Viernes" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 +msgid "Saturday" +msgstr "Sábado" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101 +msgid "Sunday" +msgstr "Domingo" + #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "Yes" msgstr "Sí" @@ -6941,6 +7199,10 @@ msgstr "Sí" msgid "No" msgstr "No" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207 +msgid "[generic all machines]" +msgstr "[genérico todas las máquinas]" + #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:35 msgid "STRATEGIC RESOURCE" msgstr "RECURSO ESTRATÉGICO" @@ -6957,10 +7219,6 @@ msgstr "CATEGORÍA" msgid "SKILL" msgstr "HABILIDAD" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207 -msgid "[generic all machines]" -msgstr "[genérico todas las máquinas]" - #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:32 msgid "WORKER" msgstr "TRABAJADOR" @@ -6969,136 +7227,6 @@ msgstr "TRABAJADOR" msgid "MACHINE" msgstr "MÁQUINA" -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32 -msgid "RECEIVED" -msgstr "RECIBIDO" - -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:33 -msgid "PENDING" -msgstr "PENDIENTE" - -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:34 -msgid "ORDERED" -msgstr "SOLICITADO" - -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:35 -msgid "PROCESSING" -msgstr "PROCESANDO" - -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:36 -msgid "CANCELED" -msgstr "CANCELADO" - -#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29 -msgid "by percentage" -msgstr "por porcentaje" - -#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29 -msgid "by items" -msgstr "por items" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109 -msgid "Hours cost type cannot be empty or null" -msgstr "Tipo de coste de horas no puede ser vacío o nulo" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118 -msgid "Init date cannot be empty or null" -msgstr "La fecha de inicio no puede ser vacía o nula" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123 -msgid "End date cannot be empty or null" -msgstr "La fecha de fin no puede ser vacía o nula" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:34 -msgid "Web service reader" -msgstr "Lector de servicio web" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35 -msgid "Web service writer" -msgstr "Escritor de servicio web" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:36 -msgid "All projects read allowed" -msgstr "Permiso de lectura para todos los proyectos" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37 -msgid "All projects edition allowed" -msgstr "Permiso de edición para todos los proyectos" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:38 -msgid "Project creation allowed" -msgstr "Permiso de creación de proyectos" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33 -msgid "Read authorization" -msgstr "Autorización de lectura" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34 -msgid "Write authorization" -msgstr "Autorización de escritura" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java:260 -msgid "workHours should be greater or equals to 0" -msgstr "Las horas de trabajo deberían ser mayor o igual que 0" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java:272 -msgid "" -"\"workHours\" value is not valid, taking into account the current list of " -"HoursGroup" -msgstr "" -"El valor de las horas de trabajo no es válido, teniendo en cuenta la lista " -"actual de grupos de horas" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 -msgid "" -"Some ancestor has the same label assigned, so this element is already " -"inheriting this label" -msgstr "" -"Algún ancestro tiene la misma etiqueta asignada, por lo que este elemento ya " -"está heredando esa etiqueta" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 -msgid "Cannot spread two progress in the same task" -msgstr "No pueden propagar dos progresos en la misma tarea" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 -msgid "Duplicate Progress Assignment For Task" -msgstr "Asignación de progreso duplicada para la tarea" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 -msgid "Quality form already exists" -msgstr "El formulario de calidad ya existe" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:180 -msgid "Working hours shouldn't be negative" -msgstr "Las horas de trabajo no deberían ser negativas" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:209 -msgid "Total percentage should be less than 100%" -msgstr "El porcentaje total debería ser menor que el 100%" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:257 -msgid "" -"The criterion can not be assigned to this hoursGroup because its resource " -"type is diferent" -msgstr "" -"El criterio no se puede asignar a este grupo de horas porque su tipo de " -"recurso es diferente." - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:261 -msgid "" -"The criterion can not be assigned to this hoursGroup because it already " -"exist into the hoursGroup" -msgstr "" -"El criterio no se puede asignar a este grupo de horas porque ya existe en el " -"grupo de horas." - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539 -msgid "The criterion already exist into other task" -msgstr "El criterio ya existe en otra tarea" - #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33 msgid "OFFERED" msgstr "OFERTADO" @@ -7159,14 +7287,67 @@ msgstr "P" msgid "U" msgstr "D" -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:122 -msgid "Line" -msgstr "Línea" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 +msgid "" +"Some ancestor has the same label assigned, so this element is already " +"inheriting this label" +msgstr "" +"Algún ancestro tiene la misma etiqueta asignada, por lo que este elemento ya" +" está heredando esa etiqueta" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:90 -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:131 -msgid "You can not modifiy this entity sequence, it is already in use" -msgstr "No puede modificar esta secuencia de entidade, ya está en uso" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 +msgid "Cannot spread two progress in the same task" +msgstr "No pueden propagar dos progresos en la misma tarea" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 +msgid "Duplicate Progress Assignment For Task" +msgstr "Asignación de progreso duplicada para la tarea" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 +msgid "Quality form already exists" +msgstr "El formulario de calidad ya existe" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java:260 +msgid "workHours should be greater or equals to 0" +msgstr "Las horas de trabajo deberían ser mayor o igual que 0" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java:272 +msgid "" +"\"workHours\" value is not valid, taking into account the current list of " +"HoursGroup" +msgstr "" +"El valor de las horas de trabajo no es válido, teniendo en cuenta la lista " +"actual de grupos de horas" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:180 +msgid "Working hours shouldn't be negative" +msgstr "Las horas de trabajo no deberían ser negativas" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:209 +msgid "Total percentage should be less than 100%" +msgstr "El porcentaje total debería ser menor que el 100%" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:257 +msgid "" +"The criterion can not be assigned to this hoursGroup because its resource " +"type is diferent" +msgstr "" +"El criterio no se puede asignar a este grupo de horas porque su tipo de " +"recurso es diferente." + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:261 +msgid "" +"The criterion can not be assigned to this hoursGroup because it already " +"exist into the hoursGroup" +msgstr "" +"El criterio no se puede asignar a este grupo de horas porque ya existe en el" +" grupo de horas." + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539 +msgid "The criterion already exist into other task" +msgstr "El criterio ya existe en otra tarea" #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36 msgid "Spreading progress" @@ -7184,120 +7365,11 @@ msgstr "Progreso con las tareas en el camino crítico por horas" msgid "Progress with critical path tasks by duration" msgstr "Progreso con las tareas del camino crítico por duración" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:90 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:131 +msgid "You can not modifiy this entity sequence, it is already in use" +msgstr "No puede modificar esta secuencia de entidade, ya está en uso" + #: libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java:82 msgid "You can not remove this entity sequence, it is already in use" msgstr "No puede borrar está secuencia de entidad, ya está en uso" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30 -msgid "Pending" -msgstr "Pendiente" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 -msgid "Failed sent" -msgstr "Envío fallido" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:33 -msgid "Success sent" -msgstr "Envío exitoso" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76 -msgid "Flat" -msgstr "Plano" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78 -msgid "Stretches" -msgstr "Tramos" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 -msgid "Interporlation" -msgstr "Interpolación" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 -msgid "Sigmoid" -msgstr "Sigmoide" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:95 -msgid "There are no days available due to not satisfying the criteria." -msgstr "No hay días disponibles debido a que no se satisfacen los criterios." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96 -msgid "" -"Another possibility is that the resources don't have days available due to " -"their calendars." -msgstr "" -"Otra posibilidad es que los recursos no tengan días disponibles debido a sus " -"calendarios." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:102 -msgid "" -"There are no days available in the days marked available by the task " -"calendar." -msgstr "" -"No hay días disponibles en los días marcados como disponibles por el " -"calendario de la tarea." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103 -msgid "Maybe the criteria are not satisfied in those days." -msgstr "Puede que los criterios no se satisfagan en esos días." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 -msgid "" -"The resource's calendar has no available days starting from the start of the " -"task." -msgstr "" -"El calendario del recurso no tiene días disponibles empezando desde el " -"principio de la tarea." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 -msgid "" -"There are no days available at resource's calendar in the days marked " -"available by the task's calendar." -msgstr "" -"No hay días disponibles en el calendario del recurso en los días marcados " -"como disponibles por el clanedario de la tarea." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28 -msgid "Finished" -msgstr "Finalizado" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29 -msgid "In progress" -msgstr "En progreso" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31 -msgid "Blocked" -msgstr "Bloqueado" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:29 -msgid "as soon as possible" -msgstr "tan pronto como sea posible" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:41 -msgid "start not earlier than" -msgstr "empezar no antes de" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:53 -msgid "start in fixed date" -msgstr "comenzar en fecha fija" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:65 -msgid "as late as possible" -msgstr "tan tarde como sea posible" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:77 -msgid "finish not later than" -msgstr "acabar no después de" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:416 -msgid "Stretches must sum 100%" -msgstr "Los tramos deben sumar 100%" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java:53 -msgid "Hour should be a value between 0 and 23" -msgstr "La hora debería tener un valor entre 0 y 23" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java:170 -msgid "A queue dependency has to have an origin different from destiny" -msgstr "" -"Una dependencia de la cola tiene que ter un origen diferente de su destino" diff --git a/libreplan-webapp/src/main/resources/i18n/gl.po b/libreplan-webapp/src/main/resources/i18n/gl.po index 9ee03057c..34c27c09d 100644 --- a/libreplan-webapp/src/main/resources/i18n/gl.po +++ b/libreplan-webapp/src/main/resources/i18n/gl.po @@ -1,31 +1,31 @@ -# Galician translations for LibrePlan - Webapp module -# Traducciones al español para Libreplan - módulo Webapp +# LibrePlan - Webapp module. # Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e # Desenvolvemento Tecnolóxico de Galicia -# Copyright (C) 2010-2011 Igalia, S.L. +# Copyright (C) 2010-2012 Igalia, S.L. # This file is distributed under the same license as the LibrePlan package. -# Jacobo Aragunde Pérez , 2009, 2010. -# Manuel Rego Casasnovas , 2010, 2011. # +# Translators: +# Jacobo Aragunde Pérez , 2009, 2010. +# Manuel Rego Casasnovas , 2010, 2011, 2012. msgid "" msgstr "" -"Project-Id-Version: 1.2.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-25 11:40+0100\n" -"PO-Revision-Date: 2011-11-25 11:47+0100\n" +"Project-Id-Version: 1.2.1\n" +"Report-Msgid-Bugs-To: http://bugs.libreplan.org/\n" +"POT-Creation-Date: 2012-01-13 16:49+0100\n" +"PO-Revision-Date: 2012-01-14 17:17+0000\n" "Last-Translator: Manuel Rego Casasnovas \n" -"Language-Team: Galician <>\n" -"Language: gl\n" +"Language-Team: Galego\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" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:373 msgid "The resource cannot be null" msgstr "O recurso non pode ser nulo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:341 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:354 msgid "Group path" msgstr "Path do grupo" @@ -38,16 +38,16 @@ msgid "No authorizations were added because you did not select any." msgstr "Non se engadiron actualizacións porque non se seleccionou ningunha." #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:88 -#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58 #: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:71 +#: libreplan-webapp/src/main/webapp/common/layout/login.zul:58 msgid "en" msgstr "gl" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:192 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:200 msgid "Origin" msgstr "Orixe" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:168 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:176 msgid "Create exception" msgstr "Crear excepción" @@ -65,67 +65,67 @@ msgstr "Crear traballador virtual" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:830 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:105 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29 -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 -#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:81 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:28 +#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:32 #: libreplan-webapp/src/main/webapp/materials/materials.zul:61 #: libreplan-webapp/src/main/webapp/materials/materials.zul:86 #: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:29 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 -#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:30 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:137 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:159 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:28 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:52 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:68 #: libreplan-webapp/src/main/webapp/scenarios/_list.zul:28 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:36 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:83 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 -#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:36 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:38 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:87 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:40 #: libreplan-webapp/src/main/webapp/templates/_list.zul:34 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:50 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:39 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:229 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:87 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:125 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:167 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:93 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:135 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:176 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:97 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:138 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:97 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:97 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:138 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:105 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:146 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:118 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:54 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:51 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:254 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:31 +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:37 +#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:31 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:40 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:39 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:44 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:37 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:56 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:109 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:39 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:29 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:26 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:44 +#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:29 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:48 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:36 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:70 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:57 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:137 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 msgid "Operations" msgstr "Operacións" @@ -145,19 +145,19 @@ msgstr "Seleccionar" msgid "Work report removed successfully" msgstr "Parte de traballo borrado con éxito" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1514 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1515 msgid "It can not be empty" msgstr "Non pode estar baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 #: libreplan-webapp/src/main/webapp/materials/materials.zul:33 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 #: libreplan-webapp/src/main/webapp/templates/templates.zul:66 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:52 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:22 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:54 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:53 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:147 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:96 msgid "Materials" msgstr "Materiais" @@ -191,23 +191,23 @@ msgstr "Administrar campos e etiquetas" msgid "Please, select a calendar" msgstr "Por favor, seleccione un calendario" +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:252 +msgid "Summary" +msgstr "Resumo" + #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:29 #: libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java:170 msgid "Predefined" msgstr "Predefinido" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:244 -msgid "Summary" -msgstr "Resumo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:445 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 #: libreplan-webapp/src/main/webapp/templates/templates.zul:67 #: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:53 msgid "Quality Forms" msgstr "Formularios de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 msgid "Reports" msgstr "Informes" @@ -215,6 +215,10 @@ msgstr "Informes" msgid "LibrePlan: Advanced allocation" msgstr "LibrePlan: Asignación avanzada" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 +msgid "The {0} sequence prefixes can not be repeated" +msgstr "Os prefixos da secuencia de {0} non poden repetirse" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:340 msgid "" "The original workable days value {0}, is prevented because consolidated " @@ -223,10 +227,6 @@ msgstr "" "O valor orixinal de días laborais {0}, evíatase porque os valores " "consolidados non poden ser modificados" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:172 -msgid "The {0} sequence prefixes can not be repeated" -msgstr "Os prefixos da secuencia de {0} non poden repetirse" - #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:82 msgid "Criterion requirements" msgstr "Criterios requiridos" @@ -239,16 +239,16 @@ msgstr "A data do tramo debe ser maior ou igual cá data de inicio da tarefa: " msgid "Dedication chart" msgstr "Gráfico de dedicación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:689 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:716 -msgid "Progress that are reported by quality forms can not be modified" -msgstr "" -"O progreso notificado por formularios de calidade non se pode modificar" - #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:748 msgid "Not the same hours group, impossible to update" msgstr "Non están no mesmo grupo de horas, imposible actualizar" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:694 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:721 +msgid "Progress that are reported by quality forms can not be modified" +msgstr "" +"O progreso notificado por formularios de calidade non se pode modificar" + #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:66 msgid "Own exception" msgstr "Excepción propia" @@ -257,16 +257,16 @@ msgstr "Excepción propia" msgid "Cannot delete that material because it is assigned to a project." msgstr "Non se pode borrar ese material porque está asignado a un proxecto." +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 +msgid "Resource Usage" +msgstr "Uso de recursos" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:479 msgid "Remove limiting resource element" msgstr "Borrar elemento de recurso limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:282 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:136 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:150 -msgid "Resource Usage" -msgstr "Uso de recursos" - #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:40 msgid "Active period from" msgstr "Período activo desde" @@ -275,27 +275,27 @@ msgstr "Período activo desde" msgid "Unassign" msgstr "Desasignar" +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:505 +msgid "Manual assignment" +msgstr "Asignación manual" + #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:157 #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:302 msgid "Companies" msgstr "Empresas" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:505 -msgid "Manual assignment" -msgstr "Asignación manual" - #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:74 msgid "Quality form items list" msgstr "Lista de elementos do formulario de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:240 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:240 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" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:520 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:903 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:128 msgid "Create {0}: {1}" @@ -305,8 +305,8 @@ msgstr "Crear {0}: {1}" msgid "generic workers allocation" msgstr "Asignación xenérica de traballadores" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:898 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:308 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:310 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:895 msgid "The project has no scheduled elements" msgstr "O proxecto no ten elementos planificados" @@ -314,9 +314,9 @@ msgstr "O proxecto no ten elementos planificados" msgid "Hour start" msgstr "Hora de inicio" -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36 #: libreplan-webapp/src/main/webapp/planner/main.zul:53 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:36 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:120 msgid "Start" msgstr "Comezo" @@ -328,6 +328,10 @@ msgstr "Informe de progreso" msgid "cost assignment's category not specified" msgstr "categoría da asignación de custo non especificada" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:96 +msgid "Check for updates" +msgstr "Comprobar se hai actualizacións" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:72 msgid "Delete Template element" msgstr "Borrar elemento de modelo" @@ -345,15 +349,15 @@ msgstr "Usuario con login '{0}': non atopado" msgid "Resources capability" msgstr "Capacidade de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108 -msgid "changing perspective" -msgstr "cambio de perspectiva" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:312 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:31 msgid "Transfer Projects Between Scenarios" msgstr "Transferir proxectos entre escenarios" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:108 +msgid "changing perspective" +msgstr "cambio de perspectiva" + #: libreplan-webapp/src/main/java/org/libreplan/web/users/OrderAuthorizationController.java:124 msgid "" "Could not add those authorizations to profile {0} because they were already " @@ -366,17 +370,28 @@ msgstr "" msgid "Default calendar" msgstr "Calendario por defecto" +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156 +msgid "Click on this" +msgstr "Fai clic neste" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:74 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:36 msgid "Project Name" msgstr "Nome do proxecto" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:967 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:306 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:966 msgid "Indent" msgstr "Indentar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:314 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:327 msgid "Save passwords in database" msgstr "Gardar contrasinais na base de datos" @@ -392,17 +407,17 @@ msgstr "Novo modelo" msgid "Total estimated hours" msgstr "Horas estimadas totais" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 #: libreplan-webapp/src/main/webapp/common/error.zul:21 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:22 msgid "LibrePlan: Runtime Error" msgstr "LibrePlan: Erro de execución" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:136 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:151 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:137 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:153 msgid "Base calendar \"{0}\" saved" msgstr "Calendario base \"{0}\" gardado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:177 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185 msgid "Exceptions list" msgstr "Lista de excepcións" @@ -418,7 +433,7 @@ msgstr "Novo elemento de formulario de calidade" msgid "LibrePlan: Labels" msgstr "LibrePlan: Etiquetas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:261 msgid "LDAP connection was successful" msgstr "A conexión co LDAP foi realizada con éxito" @@ -454,9 +469,9 @@ msgstr "" "existen criterios satisfeitos que pertencen a tipos de criterio non " "aplicables a este recurso" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 #: libreplan-webapp/src/main/webapp/templates/templates.zul:65 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:50 msgid "Criterion Requirement" msgstr "Criterio requirido" @@ -472,7 +487,7 @@ msgstr "Minutos" msgid "You can not remove a scenario with derived scenarios" msgstr "Non se pode borrar un escenario con escenarios derivados" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:948 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:950 msgid "Work Report Types" msgstr "Tipos de partes de traballo" @@ -497,20 +512,20 @@ msgstr "un recurso deshabilitado ten subrecursos habilitados" msgid "Client" msgstr "Cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:153 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:662 msgid "" -"there are no resources for required criteria: {0}. So the generic allocation " -"can't be added" +"there are no resources for required criteria: {0}. So the generic allocation" +" can't be added" msgstr "" "non hai recursos cos criterios solicitados: {0}. Por tanto, non se pode " "engadir a asignación xenérica" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:334 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:347 msgid "Role search strategy" msgstr "Estratexia para a búsqueda de roles" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:478 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:480 msgid "Error on showing warning message removing calendar: " msgstr "Erro ao mostrar mensaxe de advertencia borrando un calendario: " @@ -523,13 +538,13 @@ msgstr "" 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" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:46 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:44 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:109 msgid "Imputed hours" msgstr "Horas imputadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:37 msgid "Project Costs Per Resource" msgstr "Custos do proxecto por recurso" @@ -567,11 +582,11 @@ msgstr "" "{0} non é válido, criterionType solápase con outro criterionSatisfaction do " "mesmo criterionType" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:336 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 msgid "Group strategy" msgstr "Estratexia de grupo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:338 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 msgid "Work Report Lines" msgstr "Liñas do parte de traballo" @@ -584,9 +599,9 @@ msgid "October" msgstr "Outubro" #: libreplan-webapp/src/main/webapp/settings/settings.zul:58 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:51 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:36 msgid "First name" msgstr "Nome" @@ -598,12 +613,12 @@ msgstr "Non se puido executar o comando de impresión" msgid "Complementary text fields" msgstr "Campos de texto complementario" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:450 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:291 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:835 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:452 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:200 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:832 msgid "Confirm deleting {0}. Are you sure?" msgstr "Confirmar o borrado de {0}. ¿Está seguro?" @@ -611,25 +626,25 @@ msgstr "Confirmar o borrado de {0}. ¿Está seguro?" msgid "Work Reports List" msgstr "Lista de partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 msgid "Accounts" msgstr "Contas" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 -msgid "External code" -msgstr "Código externo" - #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:50 msgid "Edit selected task" msgstr "Editar tarefa seleccionada" +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:87 +msgid "External code" +msgstr "Código externo" + #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:49 msgid "View" msgstr "Ver" -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:84 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:39 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:38 msgid "Limiting" msgstr "Limitante" @@ -637,36 +652,36 @@ msgstr "Limitante" msgid "Required materials" msgstr "Materiales requiridos" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:346 +msgid "Backwards" +msgstr "Atrás" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:677 msgid "resources per day must be not empty and bigger than zero" msgstr "os recursos por día deben ser non baleiros e maiores que cero" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:349 -msgid "Backwards" -msgstr "Atrás" +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52 +msgid "Apply filtering to resources satisfying required criteria" +msgstr "Aplicar filtrado aos recursos que satisfán os criterios requeridos" #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:67 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:77 msgid "Version" msgstr "Versión" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:52 -msgid "Apply filtering to resources satisfying required criteria" -msgstr "Aplicar filtrado aos recursos que satisfán os criterios requeridos" - #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:105 msgid "Up" msgstr "Arriba" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:184 msgid "" -"CriterionType is not valid, it overlaps other criterionSatisfaction with the " -"same criterionType" +"CriterionType is not valid, it overlaps other criterionSatisfaction with the" +" same criterionType" msgstr "" "CriterionType non válido, outro criterionSatisfaction solápase co mesmo " "criterionType" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:125 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:138 msgid "Types of work hours" msgstr "Tipos de horas de traballo" @@ -694,26 +709,26 @@ msgstr "Algún tramo ten valores maiores ou iguais có tramo anterior" msgid "Please select a task" msgstr "Por favor, seleccione unha tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 -msgid "" -"Value is not valid, the default max value must be greater than the precision " -"value " -msgstr "" -"O valor non é válido, o valor máximo por defecto debe ser maior có valor de " -"precisión " - #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:245 msgid "missing worker code in the work report" msgstr "falta código de traballador nun parte de traballo" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:101 +msgid "" +"Value is not valid, the default max value must be greater than the precision" +" value " +msgstr "" +"O valor non é válido, o valor máximo por defecto debe ser maior có valor de " +"precisión " + #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:82 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:45 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:61 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:60 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:55 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:58 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:38 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:55 msgid "End date" msgstr "Data de fin" @@ -726,9 +741,9 @@ msgstr "o nome do perfil xa está a ser usado por outro perfil" msgid "E-mail" msgstr "Correo electrónico" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:112 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:112 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:106 msgid "This project has already been added." msgstr "Este proxecto xa fora engadido." @@ -737,21 +752,21 @@ msgid "The task code cannot be null" msgstr "O código da tarefa non pode ser nulo" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:594 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:39 #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:36 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:32 msgid "Criteria" msgstr "Criterios" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 -msgid "Resource / Criteria" -msgstr "Recurso / Criterios" - #: libreplan-webapp/src/main/webapp/users/_editUser.zul:27 msgid "User data" msgstr "Datos do usuario" +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:134 +msgid "Resource / Criteria" +msgstr "Recurso / Criterios" + #: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:44 msgid "Lines" msgstr "Liñas" @@ -764,7 +779,7 @@ msgstr "Engadir nova asignación de progreso" msgid "Set Filter Options" msgstr "Establecer as opcións de filtrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:977 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:979 msgid "Error on showing warning message removing workReportType: " msgstr "" "Erro ao mostrar mensaxe de advertencia borrando tipo de parte de traballo: " @@ -785,31 +800,31 @@ msgstr "A versión do proxecto é a mesma nos escenarios de orixe e destino" msgid "Personal data" msgstr "Datos persoais" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:720 -msgid "Calculated progress can not be removed" -msgstr "O progreso calculado non se pode borrar" - -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:164 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:202 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:202 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:159 msgid "please, select a Criterion" msgstr "por favor, seleccione un criterio" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:725 +msgid "Calculated progress can not be removed" +msgstr "O progreso calculado non se pode borrar" + #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:112 msgid "Work reports" msgstr "Partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143 -msgid "{0} annotation required on {1}" -msgstr "{0} anotación obrigatoria en {1}" - #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "June" msgstr "Xuño" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1066 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/EntryPointsHandler.java:143 +msgid "{0} annotation required on {1}" +msgstr "{0} anotación obrigatoria en {1}" + +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:1067 msgid "Modified" msgstr "Modificado" @@ -821,7 +836,7 @@ msgstr "Engadir criterio" msgid "You can not remove the current scenario" msgstr "Non se pode borrar o escenario actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:680 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:672 msgid "format prefix invalid. It cannot be empty or contain whitespaces." msgstr "" "formato de prefixo inválido. Non pode estar baleiro ou conter espazos en " @@ -836,11 +851,11 @@ msgstr "É necesario un MessagesContainer" msgid "Project element code" msgstr "Código da tarefa" -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:42 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:69 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:26 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:29 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:56 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:42 msgid "Ending date" msgstr "Data de fin" @@ -848,40 +863,40 @@ msgstr "Data de fin" msgid "LibrePlan: Page not found" msgstr "LibrePlan: Páxina non atopada" -#: libreplan-webapp/src/main/webapp/templates/_list.zul:21 -msgid "Templates List" -msgstr "Lista de modelos" - #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:29 msgid "Export options" msgstr "Opcións de exportación" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:227 -msgid "Last value" -msgstr "Último valor" +#: libreplan-webapp/src/main/webapp/templates/_list.zul:21 +msgid "Templates List" +msgstr "Lista de modelos" #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:34 msgid "Subcontracted Tasks List" msgstr "Lista de tarefas subcontratadas" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:240 +msgid "Last value" +msgstr "Último valor" + #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:51 msgid "Average of worked hours in finished applications" msgstr "Media de horas traballadas nas aplicacións finalizadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:693 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:698 msgid "Calculated progress can not be modified" msgstr "O progreso calculado non se pode modificar" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 -msgid "Statistics log" -msgstr "Histórico de estadísticas" - #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:58 msgid "Work done from starting date" msgstr "Traballo realizado desde a data de inicio" -#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:69 +msgid "Statistics log" +msgstr "Histórico de estadísticas" + #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:47 +#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:40 msgid "Edit Calendar" msgstr "Editar calendario" @@ -889,12 +904,12 @@ msgstr "Editar calendario" msgid "Profile" msgstr "Perfil" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:37 msgid "Materials Needs At Date" msgstr "Necesidades de materiais en data" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:279 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 msgid "UserDn" msgstr "UserDn" @@ -904,14 +919,14 @@ msgstr "UserDn" msgid "Cannot be empty or null" msgstr "Non pode ser baleiro ou nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300 -msgid "filtering" -msgstr "filtrado" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:233 msgid "{0} \"{1}\" saved" msgstr "{0} \"{1}\" gardado" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:300 +msgid "filtering" +msgstr "filtrado" + #: libreplan-webapp/src/main/webapp/orders/_list.zul:33 msgid "Total Budget" msgstr "Presuposto total" @@ -949,14 +964,6 @@ msgstr "Tipos de horas" msgid "Time period saved" msgstr "Período de tiempo gardado" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208 -msgid "This Criterion has already been added." -msgstr "Este criterio xa fora engadido." - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:252 msgid "" "Are you sure of changing the resource type? You will lose the criteria with " @@ -965,7 +972,15 @@ msgstr "" "¿Está seguro de cambiar o tipo de recurso? Os criterios con diferente tipo " "de recurso perderanse." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:209 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:170 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:337 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:165 +msgid "This Criterion has already been added." +msgstr "Este criterio xa fora engadido." + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:222 msgid "add" msgstr "engadir" @@ -1018,14 +1033,15 @@ msgstr "nome do perfil non especificado" msgid "Date Start" msgstr "Data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1261 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1279 msgid "Value is not valid, the current value must be less than max value" -msgstr "O valor non é válido, o valor actual debe ser menor que o valor máximo" +msgstr "" +"O valor non é válido, o valor actual debe ser menor que o valor máximo" +#: libreplan-webapp/src/main/webapp/planner/order.zul:105 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:67 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:35 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:56 -#: libreplan-webapp/src/main/webapp/planner/order.zul:105 msgid "Value" msgstr "Valor" @@ -1042,14 +1058,14 @@ msgstr "non hai períodos válidos para este calendario" msgid "Add role" msgstr "Engadir rol" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1271 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:636 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1272 msgid "Exception end date should be greater or equals than start date" msgstr "" "A data de fin dunha excepción debe ser maior ou igual cá data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:444 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:454 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:459 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:469 msgid "Repeated Project code {0} in Project {1}" msgstr "Código {0} de proxecto repetedio no proxecto {1}" @@ -1066,8 +1082,8 @@ msgid "" "The {0} can not be assigned to this resource. Its interval overlaps with " "other criterion" msgstr "" -"O {0} non se pode asignar a este recurso. O seu intervalo solápase con outro " -"criterio" +"O {0} non se pode asignar a este recurso. O seu intervalo solápase con outro" +" criterio" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:132 msgid "Schedule Performance Index" @@ -1082,11 +1098,11 @@ msgid "Type data" msgstr "Datos do tipo" #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:117 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:322 msgid "Profiles" msgstr "Perfís" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:258 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:271 msgid "Host" msgstr "Host" @@ -1094,11 +1110,11 @@ msgstr "Host" msgid "Hour finish" msgstr "Hora de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:165 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:178 msgid "Perspectives" msgstr "Perspectivas" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:107 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:115 msgid "Workable time" msgstr "Tempo traballable" @@ -1122,19 +1138,19 @@ msgstr "Asignación de recursos limitantes" msgid "Split new assignment" msgstr "Dividir nova asignación" -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57 -msgid "Pagination" -msgstr "Paxinación" - -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:263 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:271 msgid "Expiry date" msgstr "Data de vencemento" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:57 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:67 +msgid "Pagination" +msgstr "Paxinación" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:342 msgid "" -"The operation does not perform because the task has progress reports that is " -"spread associated with this quality form" +"The operation does not perform because the task has progress reports that is" +" spread associated with this quality form" msgstr "" "A operación non se pode levar a cabo porque a tarefa ten marcado como " "progreso progagado o asociado co formulario de calidade" @@ -1148,12 +1164,13 @@ msgstr "Cambiar escenario" msgid "Critical path" msgstr "Camiño crítico" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:262 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:161 msgid "" -"Deleting this item, it will disable the report progress option. Are you sure?" +"Deleting this item, it will disable the report progress option. Are you " +"sure?" msgstr "" -"Borrando este elemento, isto deshabilitará a opción de notificar progreso. " -"¿Está seguro?" +"Borrando este elemento, isto deshabilitará a opción de notificar progreso." +" ¿Está seguro?" #: libreplan-webapp/src/main/webapp/materials/materials.zul:41 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:41 @@ -1161,22 +1178,11 @@ msgstr "" msgid "Categories" msgstr "Categorías" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:46 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:180 msgid "Project Details" msgstr "Detalles do proxecto" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162 -msgid " to go to output directly" -msgstr " ir á saída directamente" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:167 msgid "Add new hours group" msgstr "Engadir novo grupo de horas" @@ -1190,11 +1196,11 @@ msgid "Cancel changes and back to scheduling" msgstr "Cancelar cambios e volver á planificación" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:386 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:65 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:86 +#: libreplan-webapp/src/main/webapp/planner/order.zul:106 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:45 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:68 -#: libreplan-webapp/src/main/webapp/planner/order.zul:106 msgid "Percentage" msgstr "Porcentaxe" @@ -1206,12 +1212,12 @@ msgstr "Actualizado" msgid "Company logo URL" msgstr "URL do logo da empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:131 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:129 msgid "No worker selected" msgstr "Ningún traballador seleccionado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:207 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:225 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:220 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:238 msgid "Number of digits" msgstr "Número de díxitos" @@ -1228,8 +1234,8 @@ msgstr "Capacidade total" msgid "Problems connecting with client web service" msgstr "Problemas conectando co servizo web cliente" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:186 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:165 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:194 msgid "Exception Type" msgstr "Tipo de excepción" @@ -1237,28 +1243,28 @@ msgstr "Tipo de excepción" msgid "Profiles List" msgstr "Listado de perfís" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:689 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:329 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 -#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 -msgid "Labels" -msgstr "Etiquetas" - #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:278 msgid "both {0} of category {1} and {2} of category {3} have the same code" msgstr "{0} da categoría {1} e {2} da categoría {3} teñen o mesmo código" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:325 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:925 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:236 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:691 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:581 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:68 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:64 +#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:50 +msgid "Labels" +msgstr "Etiquetas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:327 msgid "Data Types" msgstr "Tipos de datos" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:68 msgid "Total hours" msgstr "Total de horas" @@ -1266,7 +1272,7 @@ msgstr "Total de horas" msgid "Data" msgstr "Datos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:344 msgid "Reassigning {0} projects" msgstr "Reasignando {0} proxectos" @@ -1274,13 +1280,13 @@ msgstr "Reasignando {0} proxectos" msgid "Filter by task status" msgstr "Filtrar por estado da tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:498 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:420 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:500 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:418 msgid "Select date" msgstr "Seleccione data" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:627 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1264 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:629 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1265 msgid "You should select a end date for the exception" msgstr "Debe seleccionar unha data de fin para a excepción" @@ -1305,7 +1311,13 @@ msgstr "RECURSO NON LIMITANTE" msgid "passwords can not be empty" msgstr "os contrasinais non poden estar baleiros" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:120 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 +msgid "already assigned" +msgstr "xa asignado" + +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:128 msgid "Activation periods" msgstr "Períodos de activación" @@ -1313,24 +1325,18 @@ msgstr "Períodos de activación" msgid "Passed" msgstr "Pasado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:88 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:128 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:176 -msgid "already assigned" -msgstr "xa asignado" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:509 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:511 +#: libreplan-webapp/src/main/webapp/planner/order.zul:151 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:32 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:74 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:133 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:139 -#: libreplan-webapp/src/main/webapp/planner/order.zul:151 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:152 msgid "Calendar" msgstr "Calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:307 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:119 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:132 msgid "Resources" msgstr "Recursos" @@ -1363,7 +1369,7 @@ msgstr "a" msgid "worker's first name not specified" msgstr "nome do traballador non especificado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:337 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:350 msgid "Property strategy" msgstr "Stratexia de propiedade" @@ -1371,9 +1377,9 @@ msgstr "Stratexia de propiedade" msgid "date not specified" msgstr "data non especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:196 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/PlanningTabCreator.java:206 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:270 msgid "Projects Planning" msgstr "Planificación de proxectos" @@ -1381,25 +1387,25 @@ msgstr "Planificación de proxectos" msgid "Shrink to fit page width" msgstr "Reducir para axustar ao ancho de páxina" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:760 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:770 msgid "The max value must be greater than 0" msgstr "O valor máximo debe ser maior que 0" #: libreplan-webapp/src/main/webapp/settings/settings.zul:63 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:56 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:70 msgid "Last name" msgstr "Apelidos" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:380 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 -msgid "Remove" -msgstr "Borrar" - #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:254 msgid "cost category name not specified" msgstr "nome da categoría de custo non especificado" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:382 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:556 +msgid "Remove" +msgstr "Borrar" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:41 msgid "Planned workable days" msgstr "Días laborais planificados" @@ -1415,14 +1421,23 @@ msgstr "Tipo de progreso" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1304 msgid "Task contains consolidated progress. Cannot apply sigmoid function." msgstr "" -"A tarefa contén progreso consolidado. Non se pode aplicar a función sigmoide." +"A tarefa contén progreso consolidado. Non se pode aplicar a función " +"sigmoide." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:307 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:320 msgid "UserId" msgstr "UserId" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:218 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390 +msgid "the code must be not null or not empty" +msgstr "o código non pode ser nulo ou baleiro" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:509 +msgid "This date can not include the whole previous work week" +msgstr "Esta data non pode incluír á semana de traballo anterior completa" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:245 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:218 msgid "" "Start date is not valid, the new start date must be previous the current " "start date" @@ -1430,14 +1445,6 @@ msgstr "" "A data de inicio non é válida, a data de inicio nova debe ser anterior data " "de inicio actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:516 -msgid "This date can not include the whole previous work week" -msgstr "Esta data non pode incluír á semana de traballo anterior completa" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:390 -msgid "the code must be not null or not empty" -msgstr "o código non pode ser nulo ou baleiro" - #: libreplan-webapp/src/main/webapp/common/layout/template.zul:119 msgid "Create New Project" msgstr "Crear proxecto novo" @@ -1446,7 +1453,7 @@ msgstr "Crear proxecto novo" msgid "Stretches list" msgstr "Lista de tramos" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:180 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:193 msgid "Enable scenarios module" msgstr "Habilitar módulo de escenarios" @@ -1454,50 +1461,50 @@ msgstr "Habilitar módulo de escenarios" msgid "Zoom" msgstr "Zoom" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:833 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 -#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78 -#: libreplan-webapp/src/main/webapp/settings/settings.zul:124 -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 -#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44 -#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 -#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 -#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:848 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:112 +#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:102 #: libreplan-webapp/src/main/webapp/materials/materials.zul:115 #: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:39 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 -#: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:37 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:205 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:36 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:185 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:64 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:91 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:94 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:76 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:131 +#: libreplan-webapp/src/main/webapp/settings/changePassword.zul:78 +#: libreplan-webapp/src/main/webapp/settings/settings.zul:124 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:81 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:153 #: libreplan-webapp/src/main/webapp/templates/templates.zul:135 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:384 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:44 +#: libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul:40 +#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:41 +#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:45 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:97 +#: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:44 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:90 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:48 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:53 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:395 msgid "Save" msgstr "Gardar" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:34 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:72 msgid "Standard Effort" msgstr "Esforzo estándar" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:129 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:142 msgid "Material categories" msgstr "Categorías de materiais" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:300 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:603 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:701 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:595 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:693 msgid "number of digits must be between {0} and {1}" msgstr "o número de díxitos debe estar entre {0} e {1}" @@ -1509,10 +1516,18 @@ msgstr "Criterios requiridos" msgid "Pending update" msgstr "Actualización pendente" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:160 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:158 msgid "Criterion previously selected" msgstr "Criterio seleccionado previamente" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:881 +msgid "" +"Spread progress cannot be changed if there is a consolidation in any " +"progress assignment from root task" +msgstr "" +"O progreso que propaga non se pode cambiar se hai algunha consolidación en " +"algunha asignación de progreso dende a tarefa raíz" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:51 msgid "Users authorization" msgstr "Autorización de usuarios" @@ -1521,23 +1536,23 @@ msgstr "Autorización de usuarios" msgid "Problems connecting with subcontractor web service" msgstr "Problemas conectando co servizo web subcontratista" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:219 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:232 msgid "Entity type" msgstr "Tipo de entidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:271 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1023 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1046 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:268 msgid "Unsaved changes will be lost. Are you sure?" msgstr "Perderánse os cambios sen gardar. Está seguro?" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 -#: libreplan-webapp/src/main/webapp/planner/order.zul:22 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/index.zul:22 #: libreplan-webapp/src/main/webapp/planner/resources_use.zul:22 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:22 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 #: libreplan-webapp/src/main/webapp/planner/main.zul:22 +#: libreplan-webapp/src/main/webapp/planner/index.zul:22 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:22 +#: libreplan-webapp/src/main/webapp/planner/order.zul:22 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:22 #: libreplan-webapp/src/main/webapp/resourceload/resourceload.zul:22 msgid "LibrePlan: Scheduling" msgstr "LibrePlan: planificación" @@ -1546,14 +1561,14 @@ msgstr "LibrePlan: planificación" msgid "Assigned load" msgstr "Carga asignada" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:142 -msgid "End Date" -msgstr "Data de fin" - #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:64 msgid "Filter by workers" msgstr "Filtrar por traballadores" +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:150 +msgid "End Date" +msgstr "Data de fin" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 msgid "Some allocations needed" msgstr "Precísanse algunas asignacións" @@ -1582,17 +1597,17 @@ msgstr "Expandir/Pregar todo" msgid "Overload due to current project" msgstr "Sobrecarga debido ao proxecto actual" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:902 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:913 msgid "Name: {0}" msgstr "Nome: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:902 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:903 msgid "Move down" msgstr "Mover abaixo" #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:118 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:139 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:113 msgid "Please, select a project" msgstr "Por favor, seleccione un proxecto" @@ -1609,8 +1624,8 @@ msgid "Report structure" msgstr "Estrutura do parte" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:119 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42 #: libreplan-webapp/src/main/webapp/templates/templates.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:42 msgid "General data" msgstr "Datos xerais" @@ -1622,10 +1637,10 @@ msgstr "BAC" msgid "Calculate Number of Hours" msgstr "Calcular número de horas" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:38 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:35 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:81 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:104 msgid "Assign" msgstr "Asignar" @@ -1633,7 +1648,7 @@ msgstr "Asignar" msgid "missing code in a criterion" msgstr "falta código nun criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1281 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1278 msgid "Create Template" msgstr "Crear modelo" @@ -1642,10 +1657,10 @@ msgstr "Crear modelo" msgid "Advanced search" msgstr "Búsqueda avanzada" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:74 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:74 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:112 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:95 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:82 msgid "Filter by labels" msgstr "Filtrar por etiquetas" @@ -1666,7 +1681,7 @@ msgstr "Diagrama de Montecarlo" msgid "Schedule Variance" msgstr "Desviación en planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:496 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:395 msgid "Error on showing warning message removing qualityForm: " msgstr "" "Erro ao mostrar mensaxe de advertencia borrando un formulario de calidade: " @@ -1675,25 +1690,25 @@ msgstr "" msgid "Service does not manage resource of type: {0}" msgstr "O servizo non xestiona recursos de tipo: {0}" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:39 #: libreplan-webapp/src/main/webapp/common/error.zul:44 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:39 msgid "Status code" msgstr "Código de estado" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:974 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:474 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:492 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:976 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:103 -#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:391 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:509 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:547 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java:578 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java:73 +#: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:148 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:476 msgid "Warning" msgstr "Advertencia" -#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:30 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:30 msgid "Select parent calendar" msgstr "Seleccionar o calendario pai" @@ -1711,26 +1726,26 @@ msgstr "O tipo de horas no pode ser nulo" msgid "criterion satisfaction with end date less than start date" msgstr "o criterio satisfeito ten data de fin anterior á de inicio" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:185 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:186 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:226 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:214 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:94 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:193 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:163 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:49 msgid "Show" msgstr "Mostrar" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58 -msgid "Duration (days)" -msgstr "Duración (días)" - #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:71 msgid "Assignment Type" msgstr "Tipo de asignación" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:58 +msgid "Duration (days)" +msgstr "Duración (días)" + #: libreplan-webapp/src/main/webapp/common/layout/timeout.zul:29 msgid "Back to log in" msgstr "Volver a iniciar sesión" @@ -1749,14 +1764,14 @@ msgstr "Nodo sen fillos" msgid "Company" msgstr "Empresa" -#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118 -msgid "There is no label with this code " -msgstr "Non hai ningunha etiqueta con este código" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:212 msgid "Task: {0} " msgstr "Tarefa: {0} " +#: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:118 +msgid "There is no label with this code " +msgstr "Non hai ningunha etiqueta con este código" + #: libreplan-webapp/src/main/webapp/planner/editTask.zul:65 msgid "Task properties" msgstr "Propiedades da tarefa" @@ -1769,8 +1784,8 @@ msgstr "Non hai ningún tipo de parte de traballo con este código" msgid "Sum of direct imputed hours" msgstr "Suma de horas imputadas directamente" -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:28 #: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:35 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:28 msgid "Surname" msgstr "Apelidos" @@ -1778,28 +1793,28 @@ msgstr "Apelidos" msgid "Exception Day Types List" msgstr "Lista de tipos de día de excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:375 -msgid "the name must be not null or not empty" -msgstr "o nome non pode ser nulo ou baleiro" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:750 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:394 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:154 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:68 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:131 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:69 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 +#: libreplan-webapp/src/main/webapp/planner/order.zul:107 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:69 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:87 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:32 -#: libreplan-webapp/src/main/webapp/planner/order.zul:107 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:48 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:41 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:41 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:41 msgid "Date" msgstr "Data" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java:375 +msgid "the name must be not null or not empty" +msgstr "o nome non pode ser nulo ou baleiro" + #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:42 msgid "Add From Template" msgstr "Engadir a partir de modelo" @@ -1809,42 +1824,42 @@ msgstr "Engadir a partir de modelo" msgid "Assigned resources for this task will be deleted. Are you sure?" msgstr "Os recursos asignados para esta tarefa serán borrados. Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:678 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:670 msgid "" "format prefix invalid. It cannot be empty or contain '_' or whitespaces." msgstr "" -"formato de prefixo inválido. Non pode estar baliero ou conter '_' ou espazos " -"en branco." +"formato de prefixo inválido. Non pode estar baliero ou conter '_' ou espazos" +" en branco." #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:41 msgid "Filter by month" msgstr "Filtrar por mes" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322 -msgid "The criterion and its type cannot be null" -msgstr "O criterio e o seu tipo non poden ser nulos" - -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:422 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:321 msgid "The quality form must have an item with 100% value to report progress" msgstr "" "O formulario de calidaed debe ter un ítem con valor 100% para notificar " "progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 -msgid "July" -msgstr "Xullo" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:361 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:351 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:322 +msgid "The criterion and its type cannot be null" +msgstr "O criterio e o seu tipo non poden ser nulos" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:156 msgid "The code is not valid. There is another unit type with the same code" msgstr "O código non é válido. Hai outro tipo de unidade co mesmo código" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:242 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 +msgid "July" +msgstr "Xullo" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:255 msgid "Enable LDAP authentication" msgstr "Habilitar a autenticación LDAP" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:490 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:493 msgid "( max: {0} )" msgstr "( máx: {0} )" @@ -1856,16 +1871,16 @@ msgstr "Erro ao borrar elemento: " msgid "January" msgstr "Xaneiro" -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60 -msgid "Cannot calculate charts for current data" -msgstr "Non se poden calcular gráficos para os datos actuais" - #: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:54 msgid "Select queue" msgstr "Seleccionar cola" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1499 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:60 +msgid "Cannot calculate charts for current data" +msgstr "Non se poden calcular gráficos para os datos actuais" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:173 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1498 msgid "project name already being used" msgstr "o nome de proxecto xa está sendo usado" @@ -1873,27 +1888,27 @@ msgstr "o nome de proxecto xa está sendo usado" msgid "Work description" msgstr "Descrición do traballo" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:61 msgid "Split assignment" msgstr "Dividir asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:519 -msgid "There are not any assigned progress to current task" -msgstr "Non hai ningún progreso asignado á tarefa actual" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:118 msgid "You can not remove the default scenario called \"{0}\"" msgstr "Non se pode borrar o escenario por defecto, chamado \"{0}\"" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:522 +msgid "There are not any assigned progress to current task" +msgstr "Non hai ningún progreso asignado á tarefa actual" + #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:180 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:181 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:220 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:209 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:88 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:161 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:188 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:158 msgid "direct link" msgstr "enlace directo" @@ -1901,17 +1916,17 @@ msgstr "enlace directo" msgid "Down" msgstr "Abaixo" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:842 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:844 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:48 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:122 msgid "Label" msgstr "Etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:869 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:870 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" @@ -1928,8 +1943,8 @@ msgstr "falta tipo de horas de traballo nunha liña do parte" msgid "Quality forms" msgstr "Formularios de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:467 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:477 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:482 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:492 msgid "Repeated Hours Group code {0} in Project {1}" msgstr "Código {0} de groupo de horas repetido no proxecto {1}" @@ -1954,19 +1969,19 @@ msgstr "Estimación de custo total actual" msgid "cost assignment's start date not specified" msgstr "data de inicio da asignación de custo non especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1192 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1193 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:45 msgid "Direct" msgstr "Directo" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:828 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:104 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:245 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:266 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:51 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:86 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:201 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:253 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:274 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:34 msgid "Op." msgstr "Op." @@ -1978,7 +1993,7 @@ msgstr "Pesimista" msgid "Limiting resource assignation" msgstr "Asignación de recursos limitantes" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1224 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1260 msgid "" "This progress can not be removed, because it is spread. It is necessary to " "select another progress as spread." @@ -1986,7 +2001,7 @@ msgstr "" "Este progreso non se pode eliminar porque é propagado. Cómpre seleccionar " "outro progreso como propagado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:119 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:127 msgid "Work week" msgstr "Semana de traballo" @@ -2020,7 +2035,7 @@ msgstr "O recurso non pode ser nulo" msgid "Total Hours" msgstr "Horas totais" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:374 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:385 msgid "LibrePlan Role" msgstr "Rol LibrePlan" @@ -2032,12 +2047,12 @@ msgstr "Crear novo tipo de progreso" msgid "Confirm cancel" msgstr "Confirmar cancelación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:344 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:37 msgid "Work And Progress Per Task" msgstr "Traballo e progreso por tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1523 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1522 msgid "project code already being used" msgstr "o código do proxecto xa está sendo usado" @@ -2045,22 +2060,22 @@ msgstr "o código do proxecto xa está sendo usado" msgid "WBS (tasks)" msgstr "EDT (tarefas)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:455 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:843 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:878 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 -msgid "Error on showing removing element: " -msgstr "Erro ao mostrar o elemento a borrar: " - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:728 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:720 msgid "Deleting sequence" msgstr "Borrando secuencia" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1234 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:465 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:150 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:457 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:208 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:840 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:875 +msgid "Error on showing removing element: " +msgstr "Erro ao mostrar o elemento a borrar: " + #: libreplan-webapp/src/main/webapp/common/layout/template.zul:88 msgid "Select scenario" msgstr "Seleccionar escenario" @@ -2081,7 +2096,7 @@ msgstr "Editar grupo de traballadores virtuais: {0}" msgid "Criterion requirement" msgstr "Criterios requiridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1404 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1405 msgid "Only the last activation period allows to delete end date." msgstr "Só o último periodo de activación permite borrar a data de fin." @@ -2095,8 +2110,8 @@ msgstr "Planificación gardada" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:192 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:171 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:70 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:28 msgid "Add new row" msgstr "Engadir nova fila" @@ -2117,20 +2132,20 @@ msgstr "falta código no calendario de recursos" msgid "Overload" msgstr "Sobrecarga" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 #: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:30 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:68 msgid "Assignment log" msgstr "Histórico de asignacións" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:334 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 +msgid "Work Report Models" +msgstr "Modelos de partes de traballo" + #: libreplan-webapp/src/main/java/org/libreplan/web/print/CutyCaptTimeout.java:45 msgid "CutycaptTimeout thread exception" msgstr "Excepción no thread CutycaptTimeout" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:22 -msgid "Work Report Models" -msgstr "Modelos de partes de traballo" - #: libreplan-webapp/src/main/webapp/materials/materials.zul:73 msgid "New" msgstr "Novo" @@ -2151,7 +2166,7 @@ msgstr "LibrePlan: Empresas" msgid "LibrePlan: Progress Report" msgstr "LibrePlan: Informe de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:417 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:419 msgid "" "Calendar cannot be removed because it still has children. Some other " "calendar is derived from this one." @@ -2159,7 +2174,7 @@ msgstr "" "O calendario non se pudo borrar porque aínda ten fillos. Algún outro " "calendario deriva deste." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:907 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:925 msgid "Value is not valid, the type must be not empty" msgstr "O valor non é válido, o tipo non pode estar baleiro" @@ -2171,7 +2186,7 @@ msgstr "o nome de tipo de criterio está sendo usado" msgid "Task code cannot be null" msgstr "O código da tarefa non pode ser nulo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:517 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java:520 msgid "It is not allowed to consolidate progress." msgstr "Non se pode borrar progreso consolidado." @@ -2186,17 +2201,17 @@ msgstr "Empresa externa" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:66 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:30 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:28 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:60 +#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:101 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:131 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:27 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:30 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:44 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:68 msgid "Actions" msgstr "Accións" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:118 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:126 msgid "Exceptions" msgstr "Excepcións" @@ -2216,18 +2231,18 @@ msgstr "Asignar materiais" msgid "Over assignable" msgstr "Sobreasignable" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29 +msgid "ID" +msgstr "NIF" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:231 msgid "format filters are not valid" msgstr "o formato dos filtros non é válido" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:29 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:37 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:76 -msgid "ID" -msgstr "NIF" - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:349 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:351 msgid "Settings" msgstr "Preferencias" @@ -2240,16 +2255,16 @@ msgstr "A data de inicio non pode ser baleira" msgid "Our company password" msgstr "Contrasinal da nosa empresa" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:136 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:307 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:174 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:174 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:131 msgid "This label has already been added." msgstr "Esta etiqueta xa fora engadida." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80 #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceServiceREST.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java:80 msgid "Could not get code, please try again later" msgstr "Non se puido obter o código, por favor volva intentalo máis tarde" @@ -2265,11 +2280,11 @@ msgstr "" msgid "Hours Group" msgstr "Grupo de horas" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:823 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:825 msgid "Unallocated name" msgstr "Nome no asignado" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:923 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:924 msgid "Move up" msgstr "Mover arriba" @@ -2281,11 +2296,11 @@ msgstr "BCWP" msgid "Subcontract communication date" msgstr "Data de comunicación da subcontratación" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:365 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:131 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java:134 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:281 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:269 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:367 msgid "Scheduling" msgstr "Planificación" @@ -2293,7 +2308,7 @@ msgstr "Planificación" msgid "Dependencies have priority" msgstr "As dependencias teñen prioridade" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:516 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:518 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:901 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:126 msgid "Create {0}" @@ -2311,21 +2326,21 @@ msgstr "Total custo planificado" msgid "Assign Label" msgstr "Asignar etiqueta" -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23 -msgid "Create new project" -msgstr "Crear novo proxecto" - #: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:73 msgid "Page up" msgstr "Páxina arriba" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:23 +msgid "Create new project" +msgstr "Crear novo proxecto" + +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:921 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:910 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:53 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:161 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:35 msgid "State" msgstr "Estado" @@ -2337,14 +2352,10 @@ msgstr "Debe empezar despois" msgid "Confirm change" msgstr "Confirmar cambio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:848 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:845 msgid "You don't have permissions to edit this project" msgstr "Non ten permisos para editar este proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192 -msgid "missing date in a calendar exception" -msgstr "falta a data nunha excepción de calendario" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:440 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:145 msgid "" @@ -2353,6 +2364,10 @@ msgstr "" "O tipo de horas está baleiro. Por favor, cree algún tipo de horas antes de " "proceder" +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:192 +msgid "missing date in a calendar exception" +msgstr "falta a data nunha excepción de calendario" + #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:108 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:172 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:437 @@ -2360,8 +2375,8 @@ msgstr "" msgid "There is no resource with this ID" msgstr "Non hai un recurso con este NIF" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:195 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:198 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:195 msgid "Send" msgstr "Enviar" @@ -2390,17 +2405,17 @@ msgstr "Usuario asociado" msgid "Type name" msgstr "Nome do tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:687 -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27 -msgid "All" -msgstr "Todo" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/advances/AdvanceAssignmentPlanningCommand.java:69 msgid "Progress assignment" msgstr "Asignacións de progreso" +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:205 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:181 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:689 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:27 +msgid "All" +msgstr "Todo" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:463 #: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:77 msgid "Manual" @@ -2418,28 +2433,28 @@ msgstr "Data de recepción" msgid "Cannot be higher than Ending date" msgstr "Non pode ser posterior á data de fin" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:269 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:277 msgid "Create activation period" msgstr "Crear período de activación" -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:22 -msgid "Workers List" -msgstr "Lista de traballadores" - #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:31 msgid "Personal details" msgstr "Detalles persoais" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1190 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:217 -msgid "Inherited" -msgstr "Herdado" +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:22 +msgid "Workers List" +msgstr "Lista de traballadores" #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:355 msgid "Delete project template. Are you sure?" msgstr "Borrar modelo de proxecto. ¿Está seguro?" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1191 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java:48 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225 +msgid "Inherited" +msgstr "Herdado" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:521 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:599 msgid "" @@ -2447,10 +2462,11 @@ msgid "" "resource allocation criteria at any interval of time" msgstr "" "Non se pode asignar o elemento seleccionado. Non hai ningunha cola que " -"coincida cos criterios de asignación de recursos en ningún intervalo de tempo" +"coincida cos criterios de asignación de recursos en ningún intervalo de " +"tempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:287 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:890 msgid "Worker" msgstr "Traballador" @@ -2468,7 +2484,7 @@ msgid "Value is not valid, the default max value must not be empty " msgstr "" "O valor non é válido, o valor máximo por defecto non debe estar baleiro " -#: libreplan-webapp/src/main/webapp/common/configuration.zul:349 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:362 msgid "Role property" msgstr "Propiedade do rol" @@ -2489,7 +2505,7 @@ msgstr "Autorizar" msgid "Recommended allocation" msgstr "Asignación recomendada" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:241 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:254 msgid "Activation" msgstr "Activación" @@ -2501,15 +2517,7 @@ msgstr "Escenarios" msgid "Materials saved" msgstr "Materiais gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1238 -msgid "" -"This progress measurement can not be in current date, because it is " -"consolidated. it is necessary to select other date." -msgstr "" -"Esta medida de progreso non pode estar na data actual, porque está " -"consolidada. Débese seleccionar outra data." - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:340 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:342 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:37 msgid "Total Worked Hours By Resource In A Month" msgstr "Total horas traballadas por recurso nun mes" @@ -2526,8 +2534,8 @@ msgstr "Buffer de tarefas de entrada" msgid "At least one {0} sequence must be active" msgstr "Polo menos unha secuencia de {0} debe estar activa" -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:26 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:130 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:42 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:66 msgid "Profile name" @@ -2549,7 +2557,7 @@ msgstr "Debe seleccionar un escenario de orixe" msgid "At least one {0} sequence is needed" msgstr "Necesítase polo menos unha secuencia de {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:37 msgid "Estimated/Planned Hours Per Task" msgstr "Horas estimadas/planificadas por tarefa" @@ -2562,7 +2570,7 @@ msgstr "LibrePlan: Categorías de custo" msgid "Assigned" msgstr "Asignado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:244 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:257 msgid "Use LDAP roles" msgstr "Utilizar roles do LDAP" @@ -2574,14 +2582,22 @@ msgstr "Detalles" msgid "LibrePlan: Units" msgstr "LibrePlan: Unidades" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 -msgid "Communication" -msgstr "Comunicación" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:104 +msgid "" +"Check this option to send this information to LibrePlan developers in order " +"to generate usage statistics" +msgstr "" +"Marca esta opción para enviar información aos desenvolvedores de LibrePlan " +"para xerar estatísticas de uso" #: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:36 msgid "More options" msgstr "Máis opcións" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:45 +msgid "Communication" +msgstr "Comunicación" + #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesModel.java:219 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java:179 msgid "Error: {0}" @@ -2591,7 +2607,7 @@ msgstr "Erro: {0}" msgid "Confirm create template" msgstr "Confirmar a creación do modelo" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:238 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:246 msgid "Parent" msgstr "Pai" @@ -2599,27 +2615,27 @@ msgstr "Pai" msgid "Earliest date" msgstr "Data máis cedo" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:352 +msgid "Change Password" +msgstr "Cambiar o contrasinal" + #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:21 msgid "LibrePlan: Work And Progress Per Task" msgstr "LibrePlan: Traballo e progreso por tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 -msgid "Change Password" -msgstr "Cambiar o contrasinal" - #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:48 msgid "Projects" msgstr "Proxectos" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1047 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:269 +msgid "Confirm exit dialog" +msgstr "Diálogo para confirmar a salida" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/converters/ConverterFactory.java:64 msgid "Not found converter for {0}" msgstr "Non se atopou un conversor para {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:272 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1024 -msgid "Confirm exit dialog" -msgstr "Diálogo para confirmar a salida" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:70 msgid "Material assignments" msgstr "Asignacións de materiais" @@ -2632,32 +2648,24 @@ msgstr "Decembro" msgid "Change password" msgstr "Cambiar o contrasinal" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:830 -msgid "Text field" -msgstr "Campo de texto" - #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:81 msgid "" "Value is not valid, the Precision value must be less than the defalt max " "value." msgstr "" -"O valor non é válido, o valor de precisión debe ser menor que o valor máximo " -"por defecto." +"O valor non é válido, o valor de precisión debe ser menor que o valor máximo" +" por defecto." + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:832 +msgid "Text field" +msgstr "Campo de texto" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:97 msgid "Question" msgstr "Pregunta" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1235 -msgid "" -"This progress measurement can not be changed or removed, because it is " -"consolidated. It is needed to remove its consolidation." -msgstr "" -"Esta medida de progreso non pode ser cambiada ou borrada, porque está " -"consolidada. Débese borrar a consolidación." - #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:23 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:225 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:233 msgid "Create new work week" msgstr "Crear nova semana de traballo" @@ -2696,14 +2704,14 @@ msgstr "Vista expandida" msgid "Work record" msgstr "Rexistro de traballo" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:204 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:166 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:167 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:204 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:197 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:74 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:147 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:174 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:145 msgid "Output format" msgstr "Formato de saída" @@ -2727,40 +2735,40 @@ msgstr "o tipo de recurso non permite criterios habilitados" msgid "Effort cannot be null" msgstr "O esforzo non pode ser nulo" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1038 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:52 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:1015 -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 +#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:211 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:38 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:191 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 +#: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 +#: libreplan-webapp/src/main/webapp/planner/order.zul:131 +#: libreplan-webapp/src/main/webapp/planner/order.zul:166 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 #: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:58 #: libreplan-webapp/src/main/webapp/calendars/calendars.zul:47 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:103 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94 #: libreplan-webapp/src/main/webapp/resources/criterions/criterions.zul:45 -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:106 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:116 -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:41 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:137 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:70 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:97 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:80 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:98 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:157 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:94 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:49 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:88 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:141 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:139 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:135 #: libreplan-webapp/src/main/webapp/common/layout/template.zul:100 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:387 -#: libreplan-webapp/src/main/webapp/planner/reassign.zul:50 -#: libreplan-webapp/src/main/webapp/planner/order.zul:131 -#: libreplan-webapp/src/main/webapp/planner/order.zul:166 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:91 -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:42 -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:48 -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:81 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:398 msgid "Cancel" msgstr "Cancelar" @@ -2784,16 +2792,16 @@ msgstr "Gráfico de horas acumuladas" msgid "Machines List" msgstr "Lista de máquinas" +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:320 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:692 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:904 +msgid "You don't have read access to this project" +msgstr "Non ten acceso de lectura a este proxecto" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:130 msgid "CPI" msgstr "CPI" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:695 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:907 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:318 -msgid "You don't have read access to this project" -msgstr "Non ten acceso de lectura a este proxecto" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:96 msgid "" "Disable hierarchy will cause criteria tree to be flattened. Are you sure?" @@ -2801,18 +2809,18 @@ msgstr "" "Dehabilitar a xerarquía fará que se aplane a árbore de criterios. ¿Está " "seguro?" -#: libreplan-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 -msgid "Units" -msgstr "Unidades" - -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:48 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:41 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:43 msgid "Dates" msgstr "Datas" +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:29 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:28 +#: libreplan-webapp/src/main/webapp/orders/_splitMaterialAssignmentDlg.zul:38 +msgid "Units" +msgstr "Unidades" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:168 msgid "At least one stretch is needed" msgstr "Necesítase alo menos un tramo" @@ -2821,14 +2829,14 @@ msgstr "Necesítase alo menos un tramo" msgid "a day is not valid" msgstr "un día non é válido" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:87 -msgid "Autocomplete login form" -msgstr "Autocompletar o formulario de inicio de sesión" - #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:21 msgid "LibrePlan: Project Costs Per Resource" msgstr "LibrePlan: Custos de proxectos por recurso" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:87 +msgid "Autocomplete login form" +msgstr "Autocompletar o formulario de inicio de sesión" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesCommand.java:61 msgid "Task Properties" msgstr "Propiedades da tarefa" @@ -2841,9 +2849,9 @@ msgstr "tipo de horas" msgid "LibrePlan: Task Scheduling Status In Project" msgstr "LibrePlan: Estado de planificación de proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:229 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:214 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java:222 msgid "" "End date is not valid, the new end date must be greater than the start date" msgstr "" @@ -2853,23 +2861,29 @@ msgstr "" msgid "name" msgstr "nome" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1283 +msgid "" +"Value must be a multiple of the precision value of the progress type: {0}" +msgstr "" +"O valor debe ser un múltiplo do valor de precisión do tipo de progreso: {0}" + #: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:75 msgid "Delete selected task" msgstr "Borrar tarefa seleccionada" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:126 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesModel.java:129 msgid "{0} (max: {1})" msgstr "{0} (máx: {1})" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 -msgid "end" -msgstr "fin" - #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:529 msgid "Cost Category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:357 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:471 +msgid "end" +msgstr "fin" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:369 msgid "Role search query" msgstr "Consulta para a búsqueda de roles" @@ -2881,8 +2895,8 @@ msgstr "Diario" msgid "Authorizations" msgstr "Autorizacións" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:49 #: libreplan-webapp/src/main/webapp/common/concurrent_modification.zul:36 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:49 msgid "Continue" msgstr "Continuar" @@ -2890,8 +2904,8 @@ msgstr "Continuar" msgid "Edit task {0}" msgstr "Editar tarefa: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:210 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:236 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:210 msgid "Start date cannot be null" msgstr "A data de inicio non pode ser nula" @@ -2903,10 +2917,6 @@ msgstr "Subcontratación" msgid "references" msgstr "referencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1264 -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 " - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/GenericAllocationRow.java:55 msgid "Generic" msgstr "Xenérico" @@ -2923,31 +2933,31 @@ msgstr "Valor máximo por defecto" msgid "Add criterion requirement" msgstr "Engadir criterio requirido" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:863 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:860 msgid "" "You can not remove the project \"{0}\" because of any of its tasks are " "already in use in some work reports and the project just exists in the " "current scenario" msgstr "" -"Non se pode borrar o proxecto \"{0}\" porque algunha das súas tarefas estase " -"usando nalgún parte de traballo e o proxecto só existe no escenario actual" +"Non se pode borrar o proxecto \"{0}\" porque algunha das súas tarefas estase" +" usando nalgún parte de traballo e o proxecto só existe no escenario actual" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:86 msgid "Percentage of estimated budget hours / hours consumed" msgstr "Porcentaxe de horas presupostadas / horas consumidas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44 -msgid "Criterion Name" -msgstr "Nome do criterio" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:502 msgid "Automatic" msgstr "Automático" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44 +msgid "Criterion Name" +msgstr "Nome do criterio" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:93 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:23 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:133 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:48 msgid "Task" msgstr "Tarefa" @@ -2956,12 +2966,12 @@ msgstr "Tarefa" msgid "LibrePlan: Change password" msgstr "LibrePlan: Cambiar o contrasinal" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java:130 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:302 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:169 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java:168 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java:125 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:85 msgid "please, select a label" msgstr "por favor, seleccione unha etiqueta" @@ -2973,21 +2983,21 @@ msgstr "Engadir perfil" msgid "LibrePlan: Scenarios Management" msgstr "LibrePlan: Xestión de escenarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220 -msgid "filter already exists" -msgstr "o filtro xa existe" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:225 msgid "missing code in a calendar data version" msgstr "falta código nos datos de versión dun calendario" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/bandboxsearch/BandboxMultipleSearch.java:220 +msgid "filter already exists" +msgstr "o filtro xa existe" + #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:40 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 #: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:27 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:46 msgid "Criterion name" msgstr "Nome do criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:127 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:126 msgid "values are not valid, the values must not be null" msgstr "os valores non son válidos, non deben ser nulos" @@ -2996,8 +3006,8 @@ msgid "Apply changes and go back to scheduling" msgstr "Aplicar cambios e volver á planificación" #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:78 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:50 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:32 msgid "Task name" msgstr "Nome da tarefa" @@ -3005,11 +3015,11 @@ msgstr "Nome da tarefa" msgid "cost assignment's resource not specified" msgstr "recurso da asignación de custo non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:129 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:64 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:45 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:132 #: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java:73 msgid "Project" msgstr "Proxecto" @@ -3030,7 +3040,7 @@ msgstr "Custo presupostado do traballo realizado" msgid "Change the password" msgstr "Cambiar o contrasinal" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:115 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:128 msgid "Work report" msgstr "Parte de traballo" @@ -3039,28 +3049,28 @@ msgid "the name must be not empty" msgstr "o nome non pode ser baleiro" #: libreplan-webapp/src/main/webapp/materials/materials.zul:85 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:27 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:72 msgid "Disabled" msgstr "Deshabilitado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:701 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:326 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:707 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:324 msgid "Earned value" msgstr "Valor gañado" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:151 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:35 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:159 msgid "Overtime Effort" msgstr "Esforzo extra" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:219 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:227 msgid "Inherited from parent calendar" msgstr "Herdado do calendario pai" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:149 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:187 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:213 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:157 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:195 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:221 msgid "Normal Effort" msgstr "Esforzo normal" @@ -3070,16 +3080,14 @@ msgstr "Finalizadas {0} reasignacións" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:250 msgid "" -"Templates can only be created out of existent tasks.You are trying to create " -"a template out of a new task.\n" +"Templates can only be created out of existent tasks.You are trying to create a template out of a new task.\n" "Please save your project before proceeding." msgstr "" -"Os modelos só poden ser creados a partir de tarefas existentes. Está " -"tentando crear un modelo a partir dunha tarefa nova.\n" +"Os modelos só poden ser creados a partir de tarefas existentes. Está tentando crear un modelo a partir dunha tarefa nova.\n" "Por favor garde o seu proxecto antes de continuar." -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1109 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1124 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1120 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:1135 msgid "{0} not supported yet" msgstr "{0} aínda non soportado" @@ -3087,20 +3095,26 @@ msgstr "{0} aínda non soportado" msgid "is not supported for its use with LibrePlan." msgstr "no está soportado para o seu uso con LibrePlan." +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1320 +msgid "" +"Date is not valid, it must be greater than the last progress consolidation" +msgstr "" +"A data non é válida, debe ser maior que a última consolidación de progreso" + #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:53 msgid "New entry" msgstr "Entrada nova" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 -msgid "Some sequences to remove not existed" -msgstr "Algunhas secuencias para borrar non existen" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:100 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/ResourcesLoadTabCreator.java:109 msgid "Resources Load" msgstr "Carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:241 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java:220 +msgid "Some sequences to remove not existed" +msgstr "Algunhas secuencias para borrar non existen" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:233 msgid "Changes have been canceled" msgstr "Cambios cancelados" @@ -3108,7 +3122,7 @@ msgstr "Cambios cancelados" msgid "LibrePlan: Hours Worked Per Worker In A Month" msgstr "LibrePlan: Horas traballadas por traballador nun mes" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:312 msgid "Authentication" msgstr "Autenticación" @@ -3128,16 +3142,16 @@ msgstr "Asignación apropiativa" msgid "Assigned criterion requirements" msgstr "Criterios requiridos asignados" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:115 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:115 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:153 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:144 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:123 msgid "Filter by criteria" msgstr "Filtrar por criterios" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:37 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:43 msgid "Max value" msgstr "Valor máximo" @@ -3157,12 +3171,12 @@ msgstr "Horas a asignar" msgid "A category must be selected" msgstr "Debe seleccionar unha categoría" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:137 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:145 msgid "Period" msgstr "Periodo" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:38 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:47 msgid "Spread" msgstr "Propagación" @@ -3170,16 +3184,16 @@ msgstr "Propagación" msgid "Select start date" msgstr "Seleccionar data de inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:885 -msgid "Removed {0}" -msgstr "{0} borrado" - #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java:106 #: libreplan-webapp/src/main/java/org/libreplan/web/users/ProfileCRUDController.java:152 msgid "Error on showing warning message removing typeOfWorkHours: " msgstr "" "Erro ao mostrar mensaxe de advertencia borrando tipo de horas de traballo: " +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:882 +msgid "Removed {0}" +msgstr "{0} borrado" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 msgid "Confirm deleting this worker. Are you sure?" msgstr "Confirmar o borrado deste traballador. ¿Está seguro?" @@ -3197,11 +3211,6 @@ msgstr "Nome do rol" msgid "This worker was already removed by other user" msgstr "Este traballador xa foi borrado por outro usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:791 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:474 -msgid "h" -msgstr "h" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:620 msgid "Create Work Report" msgstr "Crear parte de traballo" @@ -3210,6 +3219,11 @@ msgstr "Crear parte de traballo" msgid "Value is not valid, the precision value must not be empty" msgstr "O valor non é válido, o valor de precisión non debe estar baleiro" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:814 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:472 +msgid "h" +msgstr "h" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:363 msgid "Workable capacity for this period " msgstr "Capacidade de traballo para este período " @@ -3219,7 +3233,7 @@ msgstr "Capacidade de traballo para este período " msgid "Cannot be null or empty" msgstr "Non pode ser nulo ou baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:440 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:339 msgid "Quality Form" msgstr "Formulario de calidade" @@ -3235,7 +3249,7 @@ msgstr "Asignar elementos seleccionados" msgid "init" msgstr "inicio" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1201 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1237 msgid "Add new progress measurement" msgstr "Engadir nova medida de progreso" @@ -3243,14 +3257,14 @@ msgstr "Engadir nova medida de progreso" msgid "Select for automatic queuing" msgstr "Seleccione para encolar automáticamente" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 -msgid "Scenarios Management" -msgstr "Administración de escenarios" - #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersController.java:192 msgid "Project {0} transfered" msgstr "Proxecto {0} transferido" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:311 +msgid "Scenarios Management" +msgstr "Administración de escenarios" + #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:96 msgid "Create & Assign" msgstr "Crear e asignar" @@ -3263,21 +3277,21 @@ msgstr "Non configurable" msgid "Advanced allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/webapp/planner/order.zul:108 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:93 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:96 +#: libreplan-webapp/src/main/webapp/planner/order.zul:108 msgid "Consolidated" msgstr "Consolidado" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:145 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:158 msgid "Work report types" msgstr "Tipos de partes de traballo" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:174 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:187 msgid "MonteCarlo method" msgstr "Método de Montecarlo" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1220 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1221 msgid "derived exception can not be removed" msgstr "a excepción derivada non se pode borrar" @@ -3294,11 +3308,11 @@ msgstr "falta o código nun material" msgid "LibrePlan: User access" msgstr "LibrePlan: Acceso de usuarios" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:67 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:32 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:111 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:32 msgid "Customer" msgstr "Cliente" @@ -3313,7 +3327,7 @@ msgstr "Tipo de horas" msgid "criterion type name not specified" msgstr "nome do tipo de criterio non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:273 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:265 msgid "Cannot connect to LDAP server" msgstr "Non se pode conectar ao servidor de LDAP" @@ -3321,11 +3335,11 @@ msgstr "Non se pode conectar ao servidor de LDAP" msgid "Add Exception" msgstr "Engadir excepción" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:303 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:324 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:220 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:202 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:223 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:247 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:378 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:219 msgid "cannot be empty" msgstr "non pode ser baleiro" @@ -3354,18 +3368,18 @@ msgstr "Tipo de progreso" msgid "Task {0} : Project is incompatible type with {1}" msgstr "Tarefa {0} : O proxecto ten un tipo incompatible con {1}" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:35 -msgid "Expand taskgroups" -msgstr "Expandir grupos de tarefas" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:155 msgid "" -"Time period contains non valid data. Ending data must be older than starting " -"date" +"Time period contains non valid data. Ending data must be older than starting" +" date" msgstr "" "O período de tempo contén datos inválidos. A data de fin debe ser maior cá " "de inicio" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:35 +msgid "Expand taskgroups" +msgstr "Expandir grupos de tarefas" + #: libreplan-webapp/src/main/webapp/orders/_ordersTab.zul:33 msgid "Save Project" msgstr "Gardar proxecto" @@ -3375,8 +3389,8 @@ msgstr "Gardar proxecto" msgid "Day is not valid" msgstr "O día non é válido" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:619 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1256 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:621 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1257 msgid "You should select a start date for the exception" msgstr "Debe seleccionar unha data de inicio para a excepción" @@ -3388,98 +3402,98 @@ msgstr "Axuda" msgid "Variance At Completion" msgstr "Desviación ao custo final" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:64 -msgid "Exportation options" -msgstr "Opcións de exportación" - #: libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsController.java:92 msgid "Settings saved" msgstr "Preferencias gardadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160 -msgid "" -"Could not save time period. Time period overlaps with another non-compatible " -"time period" -msgstr "" -"Non se puido gardar o período de tiempo. O período solápase con outro " -"período de tempo incompatible" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:64 +msgid "Exportation options" +msgstr "Opcións de exportación" +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:376 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ScenarioBandboxFinder.java:46 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/BaseCalendarBandboxFinder.java:46 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ExternalCompanyBandboxFinder.java:51 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:443 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:930 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:94 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 +#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 +#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:58 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:43 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:134 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:156 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39 -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 -#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:27 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:26 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:42 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:77 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:58 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 -#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:27 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:34 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:50 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:66 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:76 -#: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:32 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:52 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:50 -#: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:31 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 +#: libreplan-webapp/src/main/webapp/scenarios/_list.zul:27 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:51 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:28 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:80 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:27 -#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:52 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:36 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:42 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:83 #: libreplan-webapp/src/main/webapp/planner/main.zul:49 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:32 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:81 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:90 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:134 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:175 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:96 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:137 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:96 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:137 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:85 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:124 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:166 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:104 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:145 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:115 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:94 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:40 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:80 +#: libreplan-webapp/src/main/webapp/templates/_list.zul:27 +#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:48 #: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:45 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:40 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:28 +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:34 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:53 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:108 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:35 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:56 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:39 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:25 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:27 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:45 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:41 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:35 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:72 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:28 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:116 +#: libreplan-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul:90 msgid "Name" msgstr "Nome" +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java:160 +msgid "" +"Could not save time period. Time period overlaps with another non-compatible" +" time period" +msgstr "" +"Non se puido gardar o período de tiempo. O período solápase con outro " +"período de tempo incompatible" + #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:168 msgid "Delete task" msgstr "Borrar tarefa" @@ -3492,14 +3506,14 @@ msgstr "Segundos" msgid "please, select an item" msgstr "por favor, seleccione un elemento" +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:220 +msgid "Day of week" +msgstr "Día da semana" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:397 msgid "Time Start cannot be null" msgstr "A hora de inicio non pode ser nula" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:212 -msgid "Day of week" -msgstr "Día da semana" - #: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:22 msgid "Companies List" msgstr "Lista de empresas" @@ -3508,7 +3522,7 @@ msgstr "Lista de empresas" msgid "Stretches with Interpolation" msgstr "Tramos con interpolación" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:37 msgid "Hours Worked Per Resource" msgstr "Horas traballadas por recurso" @@ -3523,15 +3537,15 @@ msgstr "a asignación de custo ten data de fin anterior á de inicio" #: libreplan-webapp/src/main/webapp/common/configuration.zul:91 msgid "" -"Enable/Disable autocomplete property in login form, if the admin password is " -"still in default" +"Enable/Disable autocomplete property in login form, if the admin password is" +" still in default" msgstr "" "Habilitar/Deshabilitar a propiedade de autocompletado no formulario de " "inicio de sesión, se o contrasinal de admin tovadía é o contrasinal por " "defecto" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:26 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:36 msgid "Category name" msgstr "Nome da categoría" @@ -3544,6 +3558,12 @@ msgstr "Non é o mesmo material, imposible actualizar" msgid "Filter work report by" msgstr "Filtrar parte de traballo por" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:99 +msgid "Show a notification when new LibrePlan versions are released" +msgstr "" +"Mostrar unha notificación cando unha nova versión de LibrePlan sexa " +"publicada" + #: libreplan-webapp/src/main/webapp/common/layout/template.zul:65 msgid "Main menu" msgstr "Menú principal" @@ -3556,7 +3576,7 @@ msgstr "Montecarlo" msgid "Duration" msgstr "Duración" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:585 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587 msgid "Exception: {0}" msgstr "Excepción: {0}" @@ -3581,8 +3601,8 @@ msgstr "Planificar" msgid "Unexpected: {0}" msgstr "Inesperado: {0}" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50 #: libreplan-webapp/src/main/webapp/planner/main.zul:61 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:50 msgid "Notes" msgstr "Notas" @@ -3598,25 +3618,34 @@ msgstr "Asignación: [{0},{1}]" msgid "Virtual Workers Group" msgstr "Grupo de traballadores virtuais" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:225 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:217 msgid "Changes saved" msgstr "Cambios gardados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1266 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1263 msgid "See scheduling" msgstr "Ver planificación" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:328 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:107 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java:110 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:329 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:332 msgid "Progress measurements" msgstr "Medidas de progreso" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1200 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1236 msgid "Add measure" msgstr "Engadir medida" +#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 +msgid "Found resources" +msgstr "Recursos atopados" + +#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27 +#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 +msgid "Relationship" +msgstr "Relación" + #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:258 msgid "Work report saved" msgstr "Parte de traballo gardado" @@ -3627,22 +3656,13 @@ msgstr "Parte de traballo gardado" msgid "Subcontract" msgstr "Subcontratar" -#: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:52 -msgid "Found resources" -msgstr "Recursos atopados" - -#: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:27 -#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30 -msgid "Relationship" -msgstr "Relación" - -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41 #: libreplan-webapp/src/main/webapp/planner/main.zul:57 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:41 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:121 msgid "End" msgstr "Fin" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1346 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1378 msgid "The date is not valid, the date must be not empty" msgstr "A data non é válida, non debe ser baleira" @@ -3651,7 +3671,7 @@ msgid "User login name" msgstr "Nome de usuario" #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:534 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 msgid "Cost Categories" msgstr "Categorías de custo" @@ -3676,12 +3696,12 @@ msgid "Users List" msgstr "Lista de usuarios" #: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:27 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 #: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:56 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:55 msgid "Task quality forms" msgstr "Formularios de calidade de tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:593 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:595 msgid "Not working day" msgstr "Día non laborable" @@ -3690,11 +3710,11 @@ msgid "Progress Types" msgstr "Tipos de progreso" #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:155 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:168 msgid "Cost category" msgstr "Categoría de custo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:727 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:719 msgid "It can not be deleted. At least one sequence is necessary." msgstr "Non se pode borrar. Polo menos unha secuencia é necesaria." @@ -3710,7 +3730,7 @@ msgstr "Cantidade de traballo" msgid "please, select a quality form" msgstr "por favor, seleccione un formulario de calidade" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:522 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:524 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:907 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:132 msgid "Edit {0}: {1}" @@ -3728,14 +3748,14 @@ msgstr "Filtrar formularios de calidade por" msgid "Unindent selected task" msgstr "Desindentar tarefa seleccionada" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 -msgid "Customer reference code" -msgstr "Código de referencia do cliente" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:62 msgid "Constraint" msgstr "Restrición" +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:44 +msgid "Customer reference code" +msgstr "Código de referencia do cliente" + #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:150 msgid "Add New Label Type Field" msgstr "Engadir novo campo de tipo de etiqueta" @@ -3748,22 +3768,22 @@ msgstr "A hora de fin non pode ser nula" msgid "Customer reference" msgstr "Referencia del cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:696 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:849 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:899 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:908 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:935 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:320 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java:360 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:309 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:319 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/historicalAssignment/OrderElementHistoricalAssignmentComponent.java:146 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:311 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:693 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:846 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:896 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:905 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:932 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:333 msgid "Information" msgstr "Información" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:934 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:931 msgid "Sorry, you do not have permissions to access this project" msgstr "Sentímolo, non ten permisos para acceder a este proxecto" @@ -3783,27 +3803,27 @@ msgstr "non se pode pasar mentres o elemento anterior non sexa pasado." msgid "New hours group " msgstr "novo grupo de horas " -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 -msgid "Please remember that only saved changes will be printed" -msgstr "Por favor lembra que só os cambios gardados serán impresos" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:464 msgid "Assign element to queue manually" msgstr "Asignar elemento á cola manualmente" -#: libreplan-webapp/src/main/webapp/templates/templates.zul:55 -msgid "Edit Template" -msgstr "Editar modelo" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:45 +msgid "Please remember that only saved changes will be printed" +msgstr "Por favor lembra que só os cambios gardados serán impresos" + +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:259 +msgid "percentage cannot be duplicated" +msgstr "a porcentaxe non pode estar duplicada" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:218 msgid "Resource: {0} " msgstr "Recurso: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:360 -msgid "percentage cannot be duplicated" -msgstr "a porcentaxe non pode estar duplicada" +#: libreplan-webapp/src/main/webapp/templates/templates.zul:55 +msgid "Edit Template" +msgstr "Editar modelo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:331 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:333 msgid "Work Hours" msgstr "Horas de traballo" @@ -3811,7 +3831,7 @@ msgstr "Horas de traballo" msgid "Heading" msgstr "Cabeceira" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:165 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:166 msgid "Company ID already used. It has to be be unique" msgstr "NIF da empresa xa está sendo usado. Debe ser único" @@ -3827,8 +3847,8 @@ msgstr "As porcentaxes deberían sumar 100" msgid "The calendar exception type not found" msgstr "Tipo de excepción de calendario non atopado" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:106 +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:81 msgid "Unable to convert value to {0} type" msgstr "No se puido convertir o valor a tipo {0}" @@ -3840,26 +3860,26 @@ msgstr "O traballador non debe ser nulo" msgid "Some criterion satisfactions overlap in time" msgstr "Algúns criterios satisfeitos solápanse no tempo" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 -msgid "Value last progress measurement" -msgstr "Valor da última medida de progreso" - #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:21 msgid "LibrePlan: Materials Needs At Date" msgstr "LibrePlan: Necesidades de materiais en data" +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:49 +msgid "Value last progress measurement" +msgstr "Valor da última medida de progreso" + #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:44 msgid "Worker assignments" msgstr "Asignacións de traballador" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:610 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeCRUDController.java:270 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:154 #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:182 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsModel.java:173 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:307 -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:328 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java:221 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:206 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:227 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:603 msgid "{0} already exists" msgstr "{0} xa existe" @@ -3867,14 +3887,14 @@ msgstr "{0} xa existe" msgid "Create Worker" msgstr "Crear traballador" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:587 -msgid "Exception: {0} (Inh)" -msgstr "Excepción: {0} (Her)" - #: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:38 msgid "Code " msgstr "Código" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:589 +msgid "Exception: {0} (Inh)" +msgstr "Excepción: {0} (Her)" + #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:66 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:66 msgid "Password confirmation" @@ -3889,13 +3909,13 @@ msgid "Work Report" msgstr "Parte de traballo" #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:189 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:135 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:332 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:148 msgid "Unit Measures" msgstr "Unidades de medida" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:39 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:72 msgid "Show progress" msgstr "Mostrar progreso" @@ -3903,7 +3923,7 @@ msgstr "Mostrar progreso" msgid "Work" msgstr "Traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:298 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 msgid "" "Error saving the project\n" "{0}" @@ -3923,11 +3943,11 @@ msgstr "" msgid "LibrePlan: Machines" msgstr "LibrePlan: Máquinas" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:299 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:300 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:1305 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:630 msgid "Error" msgstr "Erro" @@ -3935,6 +3955,10 @@ msgstr "Erro" msgid "Cost Performance Index" msgstr "Eficiencia en custo" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:129 +msgid "ETC" +msgstr "ETC" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:182 msgid "" "Criterion is not valid, the criterion overlap other criterionSatisfaction " @@ -3943,10 +3967,6 @@ msgstr "" "Criterion non é válido, outro criterionSatisfaction solápase co mesmo " "criterion" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:129 -msgid "ETC" -msgstr "ETC" - #: libreplan-webapp/src/main/webapp/common/layout/template.zul:105 msgid "Log out" msgstr "Saír" @@ -3959,6 +3979,11 @@ msgstr "engadir nova unidade de configuración" msgid "Main preferences" msgstr "Preferencias principais" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 +#: libreplan-webapp/src/main/webapp/planner/order.zul:80 +msgid "Progress consolidation" +msgstr "Consolidación de progreso" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:180 msgid "" "Criterion is not valid, it overlaps other criterionSatisfaction with the " @@ -3967,21 +3992,16 @@ msgstr "" "Criterion non válido, outro criterionSatisfaction solápase co mesmo " "criterionType" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationCommand.java:67 -#: libreplan-webapp/src/main/webapp/planner/order.zul:80 -msgid "Progress consolidation" -msgstr "Consolidación de progreso" +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47 +msgid "Add new worker assignment" +msgstr "Engadir nova asignación de traballador" #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:406 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:556 msgid "missing field name in a description value" msgstr "falta o nome de campo nun valor de descrición" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:47 -msgid "Add new worker assignment" -msgstr "Engadir nova asignación de traballador" - -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:688 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:690 msgid "Show all elements" msgstr "Mostrar todos os elementos" @@ -3997,7 +4017,7 @@ msgstr "Recursos limitantes" msgid "Task Information" msgstr "Información da tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:145 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:142 msgid "Hours Group at " msgstr "Grupo de horas en " @@ -4007,23 +4027,23 @@ msgstr "" "A súa sesión expirou tras un tiempo de inactividade. Por favor, inicie " "sesión de novo." +#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:309 +msgid "a day is empty" +msgstr "un día está baleiro" + #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:165 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:190 msgid "SPREAD" msgstr "PROPAGACIÓN" -#: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:309 -msgid "a day is empty" -msgstr "un día está baleiro" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 +msgid "Changes applied" +msgstr "Cambios aplicados" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:122 msgid "Budgeted Cost Work Scheduled" msgstr "Custo de traballo presupostado planificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:712 -msgid "Changes applied" -msgstr "Cambios aplicados" - #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:58 msgid "Name cannot be null or empty" msgstr "O nome non pode ser nulo ou baleiro" @@ -4036,7 +4056,7 @@ msgstr "Configuración do LDAP" msgid "Queue Element Information" msgstr "Información de elemento de cola" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:139 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:147 msgid "Start Date" msgstr "Data de inicio" @@ -4052,9 +4072,9 @@ msgstr "Desviación en custo" msgid "criterion type does not allow resource hierarchy" msgstr "o tipo de criterio non permite xerarquía de recursos" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:92 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:95 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:152 msgid "Total" msgstr "Total" @@ -4075,30 +4095,30 @@ msgstr "Editar tarefa: {0}" msgid "Select destination" msgstr "Seleccionar destino" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274 +msgid "must be greater than the previous date." +msgstr "debe ser maior cá data anterior." + #: libreplan-webapp/src/main/webapp/planner/order.zul:89 #: libreplan-webapp/src/main/webapp/planner/order.zul:95 msgid "Check consolidated progresses" msgstr "Marcar progresos consolidados" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementModel.java:274 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:530 -msgid "must be greater than the previous date." -msgstr "debe ser maior cá data anterior." - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1469 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportModel.java:585 msgid "Show all" msgstr "Mostrar todo" -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 -msgid "Estimated hours" -msgstr "Horas estimadas" - #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:28 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:59 msgid "Default price" msgstr "Prezo por defecto" +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:38 +msgid "Estimated hours" +msgstr "Horas estimadas" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:121 msgid "Apply tab changes" msgstr "Aplicar cambios da pestana" @@ -4108,7 +4128,7 @@ msgstr "Aplicar cambios da pestana" msgid "passwords don't match" msgstr "os contrasinais non coinciden" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:88 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:96 msgid "Day properties" msgstr "Propiedades do día" @@ -4120,6 +4140,14 @@ msgstr "Grupos de horas" msgid "Transfer" msgstr "Transferir" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:903 +msgid "" +"Spread progress cannot be changed if there is a consolidation in any " +"progress assignment" +msgstr "" +"O progreso que propaga non se pode cambiar se hai algunha consolidación " +"nalgunha asignación de progreso" + #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:22 msgid "Work Hours Types List" msgstr "Lista de tipos de horas de traballo" @@ -4132,6 +4160,14 @@ msgstr "novo fito" msgid "Value last progress reported" msgstr "Valor último progreso notificado" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:103 +msgid "" +"Help project developers to collect information about which LibrePlan version" +" you are using" +msgstr "" +"Axude aos desenvolvedores do proxecto a recoller información sobre que " +"versión de LibrePlan está usando" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:306 msgid "Report Progress" msgstr "Notificar progreso" @@ -4140,7 +4176,7 @@ msgstr "Notificar progreso" msgid "Show dependencies" msgstr "Mostrar dependencias" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:344 msgid "Schedule from start to deadline" msgstr "Planificar dende o principio á data límite" @@ -4150,8 +4186,8 @@ msgstr "Planificar dende o principio á data límite" msgid "Estimated days" msgstr "Días estimadas" -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:51 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:51 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:61 msgid "Reference date" msgstr "Data de referencia" @@ -4160,14 +4196,14 @@ msgstr "Data de referencia" msgid "LibrePlan: Estimated/Planned Hours Per Task" msgstr "LibrePlan: Horas estimadas/planificadas por tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 -msgid "From chosen date" -msgstr "A partir da data escollida" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:81 msgid "Progress Evolution" msgstr "Evolución do progreso" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:55 +msgid "From chosen date" +msgstr "A partir da data escollida" + #: libreplan-webapp/src/main/webapp/excetiondays/exceptionDays.zul:22 msgid "LibrePlan: Exception Days" msgstr "LibrePlan: Días de excepción" @@ -4176,24 +4212,32 @@ msgstr "LibrePlan: Días de excepción" msgid "LibrePlan: Work Hours" msgstr "LibrePlan: Horas de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 -msgid "LibrePlan Configuration" -msgstr "LibrePlan: Configuración" - #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:118 msgid "Complete, Partially or Not Scheduled. (Drag and drop to move tasks)" msgstr "" "Completa, parcialmente ou non planificada. (Pinche e arrastre para mover " "tarefas)" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 -msgid "Original" -msgstr "Orixinal" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:317 +msgid "LibrePlan Configuration" +msgstr "LibrePlan: Configuración" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/chart/EarnedValueChartFiller.java:125 msgid "CV" msgstr "CV" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:91 +msgid "Original" +msgstr "Orixinal" + +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:163 +msgid "" +"A new version of LibrePlan is available. Please check next link for more " +"information:" +msgstr "" +"Unha nova versión de LibrePlan está dispoñible. Por favor comprobe a " +"seguinte ligazón para más información:" + #: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:31 msgid "Stretches function configuration" msgstr "Configuración da función de tramos" @@ -4203,22 +4247,22 @@ msgstr "Configuración da función de tramos" msgid "Not indentable" msgstr "Non indentable" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 -msgid "Resource allocation type" -msgstr "Tipo de asignación de recursos" - #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:493 #: libreplan-webapp/src/main/webapp/materials/materials.zul:71 msgid "List of materials for all categories (select one to filter)" msgstr "" "Lista de materiais paa tódalas categorías (seleccione unha para filtrar)" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:69 +msgid "Resource allocation type" +msgstr "Tipo de asignación de recursos" + #: libreplan-webapp/src/main/webapp/common/layout/login.zul:103 msgid "User disabled" msgstr "Usuario deshabilitado" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:35 #: libreplan-webapp/src/main/webapp/common/error.zul:40 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:35 msgid "Exception type" msgstr "Tipo de excepción" @@ -4234,8 +4278,8 @@ msgstr "Asociación con perfís" msgid "Task {0} : Duplicate code in DB" msgstr "Tarefa {0} : Código duplicado en BD" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:25 #: libreplan-webapp/src/main/webapp/common/error.zul:30 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:25 msgid "Message - {0}" msgstr "Mensaxe - {0}" @@ -4247,8 +4291,8 @@ msgstr "LibrePlan: Preferencias" msgid "worker's surname not specified" msgstr "apelidos do traballador non especificados" -#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:48 +#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:41 msgid "Save changes" msgstr "Gardar cambios" @@ -4260,10 +4304,14 @@ msgstr "Preferencias da aplicación" msgid "Average of estimated hours" msgstr "Media de horas estimadas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:272 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:285 msgid "Base" msgstr "Base" +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203 +msgid "Total dedication" +msgstr "Dedicación total" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:683 msgid "" "You can not remove the task \"{0}\" because of this or any of its children " @@ -4272,10 +4320,6 @@ msgstr "" "Non se pode borrar a tarefa \"{0}\" porque algún dos seus fillos está a " "usarse nalgún parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:203 -msgid "Total dedication" -msgstr "Dedicación total" - #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:44 msgid "Select source" msgstr "Seleccionar orixe" @@ -4284,7 +4328,7 @@ msgstr "Seleccionar orixe" msgid "Worker deleted" msgstr "Traballador borrado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:760 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:752 msgid "Select entity, please" msgstr "Seleccionar entidade, por favor" @@ -4301,15 +4345,15 @@ msgstr "LibrePlan: Perfís" msgid "Subcontratation date" msgstr "Data de subcontratación" +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:104 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:193 +msgid "Day" +msgstr "Día" + #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:22 msgid "LibrePlan: Subcontracted Tasks" msgstr "LibrePlan: Tarefas subcontratadas" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:96 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:185 -msgid "Day" -msgstr "Día" - #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:54 msgid "Current password" msgstr "Contrasinal actual" @@ -4324,20 +4368,20 @@ msgstr "Por favor, seleccione un elemento" msgid "Cannot be higher than finish hour" msgstr "Non pode ser posterior á data de fin" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:204 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:223 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:217 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:236 msgid "Prefix" msgstr "Prefixo" +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:64 +msgid "New Template element" +msgstr "Novo elemento de modelo" + #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul:56 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:49 msgid "Subcontracted code" msgstr "Código subcontratado" -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:64 -msgid "New Template element" -msgstr "Novo elemento de modelo" - #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:251 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:325 msgid "The base calendar parent not found" @@ -4364,11 +4408,7 @@ msgstr "LibrePlan: Grupos de traballadores virtuais" msgid "{0} \"{1}\" can not be deleted because of it is being used" msgstr "{0} \"{1}\" non se pode borrar porque está sendo usado" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445 -msgid "Edit limiting resource element" -msgstr "Editar elemento de recurso limitante" - -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:770 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:772 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" @@ -4379,29 +4419,33 @@ msgstr "O nome do campo debe ser único, non nulo e non baleiro" msgid "Position" msgstr "Posición" +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:445 +msgid "Edit limiting resource element" +msgstr "Editar elemento de recurso limitante" + #: libreplan-webapp/src/main/webapp/common/layout/login.zul:108 msgid "Incorrect authentication" msgstr "Identificación incorrecta" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:35 -#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42 -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:53 -msgid "Edit task" -msgstr "Editar tarefa" - #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:112 msgid "Edit work report" msgstr "Editar parte de traballo" +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:53 +#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:42 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:35 +msgid "Edit task" +msgstr "Editar tarefa" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:44 msgid "Limiting resources (project)" msgstr "Recursos limitantes (proxecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:672 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:674 msgid "A description field of the same name already exists." msgstr "Xa existe un campo de descrición co mesmo nome." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1163 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1189 msgid "" "Progress measurements that are reported by quality forms can not be removed" msgstr "" @@ -4416,8 +4460,8 @@ msgstr "Valor actual" msgid "Duplicate progress assignment for task " msgstr "Asignación de progreso duplicada para a tarefa" -#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:94 +#: libreplan-webapp/src/main/webapp/calendars/calendars.zul:46 msgid "Save and Continue" msgstr "Gardar e continuar" @@ -4448,12 +4492,12 @@ msgstr "Datos do perfil" #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33 #: libreplan-webapp/src/main/webapp/common/configuration.zul:35 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:250 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:263 msgid "Configuration" msgstr "Configuración" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:496 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:528 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:489 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:521 msgid "This date can not be empty" msgstr "A data non pode ser baleira" @@ -4465,28 +4509,34 @@ msgstr "LibrePlan: Traballadores" msgid "Create Virtual Workers Group" msgstr "Crear grupo de traballadores virtuais" +#: libreplan-webapp/src/main/webapp/common/configuration.zul:100 +msgid "Enable/Disable warning about new LibrePlan versions available" +msgstr "" +"Habilitar/Deshabilitar a advertencia sobre novas versións de LibrePlan " +"dispoñibles" + #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:95 msgid "Select type" msgstr "Seleccione tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:678 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:906 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:917 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:680 msgid "Hours invested" msgstr "Horas invertidas" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:326 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:339 msgid "Authorization" msgstr "Autorización" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:320 +msgid "Project saved" +msgstr "Proxecto gardado" + #: libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java:119 msgid "" "The name is not valid, there is another progress type with the same name. " msgstr "O nome non é válido, xa hai outro tipo de progreso co mesmo nome. " -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:319 -msgid "Project saved" -msgstr "Proxecto gardado" - #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:44 msgid "task" msgstr "tarefa" @@ -4511,7 +4561,7 @@ msgstr "Máquinas" msgid "Unit Measures List" msgstr "Lista de unidades de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:149 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:148 msgid "Couldn't find element: {0}" msgstr "Non se puido atopar o elemento: {0}" @@ -4524,7 +4574,7 @@ msgstr "Debe seleccionar un escenario de destino" msgid "unit type code not found" msgstr "código de tipo de unidade non atopado" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:350 msgid "My account" msgstr "A miña conta" @@ -4540,7 +4590,7 @@ msgstr "Vista da compañía" msgid "Both" msgstr "Ambos" -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:764 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:765 msgid "Not editable for containing more that an hours group." msgstr "Non editable por conter máis dun grupo de horas." @@ -4548,8 +4598,8 @@ msgstr "Non editable por conter máis dun grupo de horas." msgid "Filter by" msgstr "Filtrar por" -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:80 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:46 msgid "Limiting resource" msgstr "Recurso limitante" @@ -4569,9 +4619,9 @@ msgstr "" "tarefa" #: libreplan-webapp/src/main/webapp/materials/materials.zul:84 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:32 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:119 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:33 msgid "Category" msgstr "Categoría" @@ -4592,7 +4642,7 @@ msgstr "Datos de categoría" msgid "Search" msgstr "Buscar" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:242 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:250 msgid "Valid until" msgstr "Válido ata" @@ -4600,7 +4650,7 @@ msgstr "Válido ata" msgid "Add New Complementary Field" msgstr "Engadir novo campo complementario" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:232 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240 msgid "Work weeks list" msgstr "Lista de semanas de traballo" @@ -4620,33 +4670,33 @@ msgstr "LibrePlan: Transferir proxectos entre escenarios" msgid "%" msgstr "%" -#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:43 #: libreplan-webapp/src/main/webapp/resources/worker/_calendar.zul:50 +#: libreplan-webapp/src/main/webapp/resources/machine/_calendar.zul:43 msgid "Remove calendar" msgstr "Borrar calendario" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1536 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1700 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1331 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:337 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:251 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:271 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:141 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:651 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:425 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:670 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1328 msgid "must be lower than finish date" msgstr "debe ser anterior á data de fin" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:766 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:158 +#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:41 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:70 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:135 -#: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:81 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:33 msgid "Resource" msgstr "Recurso" @@ -4655,23 +4705,23 @@ msgstr "Recurso" msgid "Total task hours" msgstr "Total de horas de tarefa" -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 -msgid "Date last progress reported" -msgstr "Data último progreso notificado" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/entrypoints/RedirectorSynthetiser.java:125 msgid "Could not load any resource" msgstr "Non se puido cargar un recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:341 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:46 +msgid "Date last progress reported" +msgstr "Data último progreso notificado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:343 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:37 msgid "Work And Progress Per Project" msgstr "Traballo e progreso por proxecto" #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerModel.java:386 msgid "" -"You must allow multiple active criteria for this type to use this assignment " -"strategy" +"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" @@ -4695,41 +4745,41 @@ msgid "Specific Allocations" msgstr "Asignacións específicas" #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:225 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:119 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java:120 msgid "error doing reassignation: {0}" msgstr "Erro realizando reasignación: {0}" -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:423 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:425 msgid "Time filter" msgstr "Filtrado de tempo" +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 +msgid "Move selected task up" +msgstr "Mover tarefa seleccionada cara arriba" + #: libreplan-webapp/src/main/webapp/resources/search/allocation_selector.zul:27 msgid "Select criteria set or specific resources for allocation" msgstr "" "Seleccione conxunto de criterios ou recursos específicos para asignación" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:63 -msgid "Move selected task up" -msgstr "Mover tarefa seleccionada cara arriba" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:348 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:350 msgid "Create copy" msgstr "Crear copia" -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33 -msgid "Work Report Lines List" -msgstr "Lista de liñas de parte de traballo" - #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:28 msgid "Company data" msgstr "Datos da empresa" +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:33 +msgid "Work Report Lines List" +msgstr "Lista de liñas de parte de traballo" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java:151 msgid "Unit type code cannot be empty" msgstr "O código de tipo de unidade non pode ser baleiro" #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:183 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:318 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:320 msgid "Users" msgstr "Usuarios" @@ -4746,14 +4796,14 @@ msgid "" "Please use some of the compatible browsers: Chrome, Firefox, Safari or " "Epiphany." msgstr "" -"Por favor utilice algún dos navegadores compatibles: Chrome, Firefox, Safari " -"ou Epiphany." +"Por favor utilice algún dos navegadores compatibles: Chrome, Firefox, Safari" +" ou Epiphany." #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/NewAllocationSelector.java:94 msgid "specific allocation" msgstr "asignación específica" -#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:148 +#: libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java:149 msgid "company name has to be unique. It is already used" msgstr "o nome da empresa debe ser único. Xa está a ser usado" @@ -4773,7 +4823,8 @@ msgstr "Modelo gardado" #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:565 msgid "work report have not any description value with this field name" msgstr "" -"o parte de traballo non ten ningún valor de descrición con ees valor de campo" +"o parte de traballo non ten ningún valor de descrición con ees valor de " +"campo" #: libreplan-webapp/src/main/webapp/common/configuration.zul:23 msgid "LibrePlan: Configuration" @@ -4798,8 +4849,8 @@ msgstr "Cálculo de horas imputadas" msgid ": code not found" msgstr ": código non atopado" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:51 #: libreplan-webapp/src/main/webapp/common/error.zul:55 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:51 msgid "Exit session" msgstr "Saír da sesión" @@ -4810,6 +4861,20 @@ msgstr "Saír da sesión" msgid "Group" msgstr "Grupo" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116 +msgid "Please, enter a valid effort" +msgstr "Por favor, introduza un esforzo válido" + +#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58 +#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 +#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28 +msgid "Enabled" +msgstr "Activado" + #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:111 msgid "Apply filter to" msgstr "Aplicar filtro a" @@ -4818,25 +4883,11 @@ msgstr "Aplicar filtro a" msgid "Statistics list " msgstr "Lista de estatísticas" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1116 -msgid "Please, enter a valid effort" -msgstr "Por favor, introduza un esforzo válido" - -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:28 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:61 -#: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:28 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:29 -#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:27 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:65 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:58 -msgid "Enabled" -msgstr "Activado" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222 msgid "All resources must be limiting. " msgstr "Todos os recursos deben ser limitantes. " -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:525 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:527 msgid "Filter by worker" msgstr "Filtrar por traballadores" @@ -4848,56 +4899,56 @@ msgstr "Carga debido ao proxecto actual" msgid "You are going to change the assignment function. Are you sure?" msgstr "Vai cambiar a función de asignación. ¿Está seguro?" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 -msgid "Exception Days" -msgstr "Días de excepción" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java:183 msgid "There must be at least 2 stretches for doing interpolation" msgstr "Debe haber alo menos dous tramos para facer interpolación" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:330 +msgid "Exception Days" +msgstr "Días de excepción" + #: libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceConverter.java:296 msgid "Incompatible update: stored resource is not of type: {0}" msgstr "Actualización incompatible: i recurso almacenado non é de tipo: {0}" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:114 -#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/advance/advanceTypes.zul:38 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:104 +#: libreplan-webapp/src/main/webapp/materials/unitTypes.zul:40 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:207 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:37 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:187 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:67 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:96 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:78 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:134 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:83 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:155 #: libreplan-webapp/src/main/webapp/templates/templates.zul:137 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:118 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:100 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:92 msgid "Save & Continue" msgstr "Gardar e continuar" -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 -msgid "LibrePlan: Work And Progress Per Project" -msgstr "LibrePlan: Traballo e progreso por proxecto" - #: libreplan-webapp/src/main/webapp/orders/_edition.zul:92 msgid "Scheduling mode" msgstr "Modo de planificación" #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:53 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:54 -#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 #: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:29 +#: libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul:51 #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:34 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:23 msgid "Filter" msgstr "Filtrar" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:943 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:21 +msgid "LibrePlan: Work And Progress Per Project" +msgstr "LibrePlan: Traballo e progreso por proxecto" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:945 msgid "Work Report Type" msgstr "Tipo de parte de traballo" @@ -4924,8 +4975,8 @@ msgstr "ACWP" msgid "The periods available depend on the resource's calendar." msgstr "Os períodos dispoñibles dependen do calendario do recurso." -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:29 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:83 msgid "Authentication type" msgstr "Tipo de autenticación" @@ -4933,7 +4984,7 @@ msgstr "Tipo de autenticación" msgid "START" msgstr "INICIO" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:350 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 msgid "Schedule from the deadline to start" msgstr "Planificar dende a data límite ao principio" @@ -4945,10 +4996,10 @@ msgstr "asignación xenérica de máquinas" msgid "Non limiting resource assignation" msgstr "Asignación de recursos non limitantes" -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 -#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 -#: libreplan-webapp/src/main/webapp/planner/order.zul:70 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:68 +#: libreplan-webapp/src/main/webapp/planner/order.zul:70 +#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:75 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:86 msgid "Back" msgstr "Atrás" @@ -4964,13 +5015,13 @@ msgstr "Administración" #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1519 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1682 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1314 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java:318 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:234 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java:254 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:634 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:408 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:237 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:652 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1311 msgid "must be greater than start date" msgstr "debe ser maior que a data de inicio" @@ -4978,8 +5029,8 @@ msgstr "debe ser maior que a data de inicio" msgid "Cancel and return" msgstr "Cancelar e volver" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31 #: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:34 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:31 msgid "Assign quality form" msgstr "Asignar formulario de calidade" @@ -4987,15 +5038,15 @@ msgstr "Asignar formulario de calidade" msgid "Delete item {0}. Are you sure?" msgstr "Borrar elemento {0}. ¿Está seguro?" -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 -msgid "worked hours" -msgstr "horas traballadas" - #: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:51 msgid "Unit measure name" msgstr "Nome da unidade de medida" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:140 +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:39 +msgid "worked hours" +msgstr "horas traballadas" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:139 msgid "cannot include a progress of the same progress type twice" msgstr "non se pode asignar un progreso do mesmo tipo dúas veces" @@ -5008,6 +5059,11 @@ msgstr "unha liña de parte de traballo non ten este tipo de etiqueta asignado" msgid "Allocations" msgstr "Asignacións" +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 +msgid "Capacity" +msgstr "Capacidade" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:52 msgid "Task code" msgstr "Código da tarefa" @@ -5017,13 +5073,8 @@ msgstr "Código da tarefa" msgid "Length" msgstr "Lonxitude" -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:35 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:89 -msgid "Capacity" -msgstr "Capacidade" - -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:331 #: libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java:133 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:333 msgid "Create derived" msgstr "Crear derivado" @@ -5039,24 +5090,24 @@ msgstr "debe ser maior que cero" msgid "must be a real positive number" msgstr "debe ser un número real positivo" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33 -msgid "No Allocations have been done" -msgstr "Non se fixeron asignacións" - #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:111 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:122 msgid "Total hours task" msgstr "Total de horas de tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:441 +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:33 +msgid "No Allocations have been done" +msgstr "Non se fixeron asignacións" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:443 msgid "Removed calendar \"{0}\"" msgstr "Borrado calendario \"{0}\"" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1071 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1068 msgid "Create project" msgstr "Crear proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:542 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:535 msgid "This date can not include the whole next work week" msgstr "Esta data non pode incluír á próxima semana de traballo completa" @@ -5066,7 +5117,11 @@ msgid "" msgstr "" "Permitir múltiples valores deste tipo de criterio no mesmo período de tempo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1280 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1198 +msgid "Consolidated progress measurement can not be removed" +msgstr "A medida de progreso consolidada non se pode borrar" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1300 msgid "" "The date is not valid, the date must be unique for this progress assignment" msgstr "A data non é válida, debe ser única para esta asignación de progreso" @@ -5094,8 +5149,8 @@ msgstr "" msgid "New work report" msgstr "Novo parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "yes" msgstr "si" @@ -5103,11 +5158,15 @@ msgstr "si" msgid "Root calendar" msgstr "Calendario raíz" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:265 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:278 msgid "Port" msgstr "Porto" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:870 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 +msgid "Select gap" +msgstr "Seleccionar intervalo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:867 msgid "" "Deleting this subcontracted project, you are going to lose the relation to " "report progress. Are you sure?" @@ -5115,10 +5174,6 @@ msgstr "" "Borrando este proxecto subcontrado, perderá a relación para notificar " "progresos. ¿Está seguro?" -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:113 -msgid "Select gap" -msgstr "Seleccionar intervalo" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:63 msgid "Date Finish" msgstr "Data de fin" @@ -5132,13 +5187,13 @@ msgstr "Validar" msgid "This resource has already been added." msgstr "Este recurso xa fora engadido." -#: libreplan-webapp/src/main/webapp/common/configuration.zul:149 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:162 msgid "Calendar exception types" msgstr "Tipos de excepcións de calendario" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34 -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:36 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:25 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:34 msgid "Cost category assignment" msgstr "Asignación de categoría de custo" @@ -5146,7 +5201,7 @@ msgstr "Asignación de categoría de custo" msgid "missing code in a hour cost" msgstr "falta código nun custo por hora" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:858 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:869 msgid "All workers" msgstr "Todos os traballadores" @@ -5158,60 +5213,61 @@ msgstr "Seleccione criterios ou recursos" #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:24 #: libreplan-webapp/src/main/webapp/orders/_orderFilter.zul:24 msgid "Select required criteria set and press filter button" -msgstr "Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" +msgstr "" +"Seleccione conxunto de criterios requeridos e pulse o botón de filtrar" + +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:632 +msgid "Hours Group {0} : Duplicate code in DB" +msgstr "Grupo de horas {0} : Clave duplicada en BD" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:990 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1181 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1438 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:121 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:123 #: libreplan-webapp/src/main/java/org/libreplan/web/externalcompanies/ExternalCompanyCRUDController.java:125 #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:311 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:207 #: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:307 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1492 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1516 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:992 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1182 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1439 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:135 #: libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java:168 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:765 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43 -#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java:115 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1491 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1515 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:757 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:45 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:53 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:89 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:94 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:92 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:94 -#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:43 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:54 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:43 +#: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:50 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:92 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:94 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:134 +#: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:34 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:44 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:55 #: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:61 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:44 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:54 #: libreplan-webapp/src/main/webapp/users/_editProfile.zul:43 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:46 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:43 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:58 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:50 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:129 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:48 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:46 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:74 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:37 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:45 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:39 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:96 msgid "cannot be null or empty" msgstr "non pode ser nulo ou baleiro" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java:632 -msgid "Hours Group {0} : Duplicate code in DB" -msgstr "Grupo de horas {0} : Clave duplicada en BD" - #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:43 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTree.java:52 msgid "New code" @@ -5225,7 +5281,7 @@ msgstr "O tipo de progreso non pode ser modificado" msgid "Calculate Resources per Day" msgstr "Calcular recursos por día" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:904 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:906 msgid "The index fields and labels must be uniques and consecutives" msgstr "Os campos de índice e as etiquetas deben ser únicas e consecutivas" @@ -5234,9 +5290,9 @@ msgid "Estimate To Complete" msgstr "Estimación do custo pendente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:83 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:29 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:117 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:30 msgid "Unit type" msgstr "Tipo de unidade" @@ -5276,27 +5332,27 @@ msgstr "Lista de etiquetas" msgid "Criterion Requirements" msgstr "Criterios requiridos" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:188 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:215 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:76 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:196 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:223 msgid "Extra Effort" msgstr "Esforzo extra" -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59 -msgid "Move selected task down" -msgstr "Mover tarefa seleccionada cara abaixo" - #: libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java:269 msgid "Already exists other label with the same name" msgstr "Xa existe outra etiqueta co mesmo nome" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:32 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:59 +msgid "Move selected task down" +msgstr "Mover tarefa seleccionada cara abaixo" + #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:32 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:32 msgid "Customer Reference" msgstr "Referencia do cliente" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:130 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:129 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:142 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" @@ -5321,7 +5377,18 @@ msgstr "Nome de usuario da nosa empresa" msgid "Filter work reports" msgstr "Filtrar partes de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:427 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:914 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:679 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:328 +#: libreplan-webapp/src/main/webapp/templates/templates.zul:63 +#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 +#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 +msgid "Progress" +msgstr "Progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:429 msgid "" "Default calendar cannot be removed. Please, change the default calendar in " "the Configuration window before." @@ -5329,26 +5396,25 @@ msgstr "" "O calendario por defecto non se pode borrar. Por favor, cambie antes o " "calendario por defecto na ventá de configuración." -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:601 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:677 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:326 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java:903 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_editOrderElement.zul:48 -#: libreplan-webapp/src/main/webapp/templates/templates.zul:63 -#: libreplan-webapp/src/main/webapp/templates/_editTemplateWindow.zul:49 -msgid "Progress" -msgstr "Progreso" - #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java:257 msgid "" -"This criterion type cannot be deleted because it has assignments to projects " -"or resources" +"This criterion type cannot be deleted because it has assignments to projects" +" or resources" msgstr "" "Este tipo de criterio non se pode borrar porque ten asignacións a proxectos " "ou recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1210 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:321 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1068 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1128 +msgid "" +"This progress measurement cannot be deleted or changed because it is " +"consolidated" +msgstr "" +"Esta medida de progreso non se pode borrar ou cambiar porque está " +"consolidada" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1246 msgid "All progress types have already been assigned." msgstr "Xa se asignaron todos os tipos de progreso." @@ -5356,14 +5422,14 @@ msgstr "Xa se asignaron todos os tipos de progreso." msgid "Price per hour" msgstr "Prezo por hora" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:323 +msgid "Calendars" +msgstr "Calendarios" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:211 msgid "Project: {0} " msgstr "Proxecto: {0} " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:321 -msgid "Calendars" -msgstr "Calendarios" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:360 msgid "The date cannot be null" msgstr "A data non pode ser nula" @@ -5380,24 +5446,24 @@ msgstr "" msgid "options" msgstr "opcións" -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 -msgid "Latest date" -msgstr "Data máis tardía" +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 +msgid "LibrePlan: Work Reports" +msgstr "LibrePlan: Partes de traballo" + +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 +msgid "Error on showing delete confirm" +msgstr "Erro ao mostrar a confirmación de borrado" #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:32 msgid "Show only current satisfied criteria" msgstr "Mostrar só os criterios satisfeitos actualmente" -#: libreplan-webapp/src/main/webapp/workreports/workReportTypes.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:23 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:23 -msgid "LibrePlan: Work Reports" -msgstr "LibrePlan: Partes de traballo" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:393 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:373 -msgid "Error on showing delete confirm" -msgstr "Erro ao mostrar a confirmación de borrado" +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:92 +msgid "Latest date" +msgstr "Data máis tardía" #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:625 msgid "Sum of all rows" @@ -5427,30 +5493,43 @@ msgstr "" "O último tramo debe ter 100% de porcentaxes de lonxitude e cantidade de " "traballo" -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:60 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:60 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:71 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:96 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:41 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:75 msgid "Filter by projects" msgstr "Filtrar por proxectos" -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:23 -msgid "Criteria of selected type " -msgstr "Criterios do tipo seleccionado " +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:293 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:494 +msgid "" +"This progress assignment cannot be deleted or changed because it has some " +"progress consolidation" +msgstr "" +"Está asignación de progreso non se puede borrar ou cambiar porque ten " +"algunha consolidación de progreso" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:730 +msgid "Consolidated progress can not be removed" +msgstr "A consolidación de progreso non se pode borrar" #: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:33 msgid "Each worker configuration unit name" msgstr "Nome da unidade de configuración de cada traballador" -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:23 +msgid "Criteria of selected type " +msgstr "Criterios do tipo seleccionado " + #: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:44 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:221 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:43 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:234 msgid "Active" msgstr "Activo" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1247 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1265 msgid "This progress measurement can not be in " msgstr "Esta medida de progreso non pode estar en " @@ -5458,22 +5537,13 @@ msgstr "Esta medida de progreso non pode estar en " msgid "Inherited labels" msgstr "Etiquetas herdadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1232 -msgid "" -"This progress can not be changed or removed, because it has got consolidated " -"progress. It is needed to remove the consolidation on all its progress." -msgstr "" -"Este progreso non se pode cambiar ou borrar, porque ten progreso " -"consolidado. Débense borrar as consolidacións de todas as súas medidas de " -"progreso." - +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:946 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:945 msgid "Unindent" msgstr "Desindentar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:921 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1370 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:939 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1405 msgid "Value is not valid, the current value must be not empty" msgstr "O valor non é válido, o valor actual non debe estar baleiro" @@ -5501,37 +5571,41 @@ msgstr "Precisión" msgid "missing code in a work report line" msgstr "falta código nunha liña de parte de traballo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 -msgid "Efforts" -msgstr "Esforzos" - #: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:41 msgid "Show all reported hours" msgstr "Mostrar todas as horas notificadas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java:937 +msgid "Efforts" +msgstr "Esforzos" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:102 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java:113 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:276 msgid "Projects List" msgstr "Listado de proxectos" +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:60 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:136 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:60 +#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 #: libreplan-webapp/src/main/webapp/calendars/_edition.zul:60 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52 #: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:50 #: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:76 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:52 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:56 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:60 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:45 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:44 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:46 -#: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:45 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:46 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:82 msgid "Generate code" msgstr "Xerar código" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:505 +msgid "The code sequence is already in use and it can not be updated." +msgstr "O código da secuencia xa está en uso e non se pode actualizar." + #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:116 msgid "Scheduling state" msgstr "Estado de planificación" @@ -5540,10 +5614,6 @@ msgstr "Estado de planificación" msgid "This template can not be removed because it has applications." msgstr "Este modelo non pode borrarse porque ten aplicacións." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:513 -msgid "The code sequence is already in use and it can not be updated." -msgstr "O código da secuencia xa está en uso e non se pode actualizar." - #: libreplan-webapp/src/main/webapp/settings/settings.zul:43 msgid "Personal Data" msgstr "Datos persoais" @@ -5560,14 +5630,14 @@ msgstr "LibrePlan: Horas traballadas por recurso" msgid "Number of iterations should be between 1 and " msgstr "O número de iteracións debe estar entre 1 e " -#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:149 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java:145 msgid "Scenarios must be enabled as more elements than master exist" msgstr "" "Os escenarios deben estar habilitados xa que existen máis elementos que " "master" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:50 #: libreplan-webapp/src/main/webapp/common/error.zul:54 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:50 msgid "Reload" msgstr "Recargar" @@ -5576,30 +5646,30 @@ msgstr "Recargar" msgid "Task {0} : Task group is incompatible type with {1}" msgstr "Tarefa {0} : O grupo de tarefas ten un tipo incompatible con {1}" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 -msgid "Profiles authorization" -msgstr "Autorización de perfís" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:299 msgid "Virtual Workers Groups" msgstr "Grupos de traballadores virtuais" -#: libreplan-webapp/src/main/webapp/settings/settings.zul:95 -msgid "Planning charts expanded" -msgstr "Gráficas de planificación expandidas" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:26 +msgid "Profiles authorization" +msgstr "Autorización de perfís" #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:71 msgid "Assignation" msgstr "Asignación" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:694 -msgid "Inh" -msgstr "Her" +#: libreplan-webapp/src/main/webapp/settings/settings.zul:95 +msgid "Planning charts expanded" +msgstr "Gráficas de planificación expandidas" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:339 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:341 msgid "Not deletable" msgstr "Imborrable" +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:696 +msgid "Inh" +msgstr "Her" + #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:28 msgid "Administrator" msgstr "Administrador" @@ -5608,7 +5678,7 @@ msgstr "Administrador" msgid "Doing {0} reassignations" msgstr "Realizando {0} reasignacións" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:195 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:208 msgid "Select entity" msgstr "Seleccione entidade" @@ -5620,7 +5690,18 @@ msgstr "código non especificado" msgid "Projects list" msgstr "Lista de proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:973 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:181 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:182 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:221 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:210 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:89 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:162 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:189 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:159 +msgid "if the report is not opened automatically" +msgstr "se o informe non se abre de forma automática" + +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:975 msgid "" "Cannot delete work report type. There are some work reports bound to it." msgstr "" @@ -5631,7 +5712,7 @@ msgstr "" msgid "Criterion Type List" msgstr "Lista de tipos de criterio" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:702 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:708 msgid "Overall progress" msgstr "Progreso global" @@ -5646,7 +5727,7 @@ msgstr "Todos os proxectos" #: libreplan-webapp/src/main/webapp/settings/changePassword.zul:41 #: libreplan-webapp/src/main/webapp/users/_editUser.zul:61 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:83 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:286 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:299 msgid "Password" msgstr "Contrasinal" @@ -5655,20 +5736,24 @@ msgstr "Contrasinal" msgid "Observations" msgstr "Observacións" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:950 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:947 msgid "Edit project" msgstr "Editar proxecto" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25 #: libreplan-webapp/src/main/webapp/templates/_advances.zul:27 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:25 msgid "Progress assignments" msgstr "Asignación de progreso" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:240 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:262 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:248 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:270 msgid "Valid from" msgstr "Válido desde" +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53 +msgid "Month" +msgstr "Mes" + #: libreplan-webapp/src/main/java/org/libreplan/ws/calendars/impl/CalendarConverter.java:206 msgid "exception date already exists" msgstr "a data de excepción xa existe" @@ -5677,16 +5762,12 @@ msgstr "a data de excepción xa existe" msgid "There exists other template with the same name." msgstr "Xa existe outro modelo co mesmo nome." -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:53 -msgid "Month" -msgstr "Mes" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java:911 msgid "{0} could not be allocated. Cannot allocate more than one resource" msgstr "Non se puido asignar {0}. Non se pode asignar máis que un recurso" -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:32 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:58 msgid "Color" msgstr "Cor" @@ -5704,36 +5785,36 @@ msgstr "" msgid "criterion satisfaction's start date not specified" msgstr "data de inicio do criterio satisfeito non especificada" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405 -msgid "Only {0} resources per day were achieved for current allocation" -msgstr "Só se lograon {0} recursos por día para a asignación actual" - #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:311 msgid "Delete {0} \"{1}\". Are you sure?" msgstr "Borrar {0} \"{1}\". ¿Está seguro?" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java:405 +msgid "Only {0} resources per day were achieved for current allocation" +msgstr "Só se lograon {0} recursos por día para a asignación actual" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/assigntemplates/TemplateFinderPopup.java:51 -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 -#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 +#: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 #: libreplan-webapp/src/main/webapp/planner/reassign.zul:48 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 +#: libreplan-webapp/src/main/webapp/planner/main.zul:66 #: libreplan-webapp/src/main/webapp/planner/order.zul:128 #: libreplan-webapp/src/main/webapp/planner/order.zul:163 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:89 -#: libreplan-webapp/src/main/webapp/planner/editTask.zul:79 -#: libreplan-webapp/src/main/webapp/planner/main.zul:66 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:86 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:133 +#: libreplan-webapp/src/main/webapp/common/layout/template.zul:98 msgid "Accept" msgstr "Aceptar" #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:81 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:261 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:268 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:275 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:282 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:310 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:345 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:353 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:361 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:274 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:281 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:288 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:295 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:323 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:358 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:365 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:372 msgid "Example: {0}" msgstr "Exemplo: {0}" @@ -5757,7 +5838,7 @@ msgstr "Calculado" msgid "Completed: {0}% " msgstr "Completado: {0}% " -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1167 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 msgid "Calculated progress measurement can not be removed" msgstr "As medidas de progreso calculadas non se poden borrar" @@ -5774,17 +5855,6 @@ msgstr "Acceso ao sistema" msgid "Probability" msgstr "Probabilidade" -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:86 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:207 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:218 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:179 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:156 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:178 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:186 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:159 -msgid "Click on " -msgstr "Click en" - #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:112 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:115 msgid "Report data" @@ -5798,23 +5868,23 @@ msgstr "Carga externa" msgid "Progress sent successfully" msgstr "O progreso enviouse con éxito" +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73 +msgid "Priority" +msgstr "Prioridade" + #: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/InstanceNotFoundRecoverableErrorException.java:46 msgid "instance not found" msgstr "instancia non atopada" -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:73 -msgid "Priority" -msgstr "Prioridade" +#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 +msgid "Apply changes and continue edition" +msgstr "Aplicar cambios e continuar a edición" #: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:219 #: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:80 msgid "Infinitely Over Assignable" msgstr "Sobreasignable infinitamente" -#: libreplan-webapp/src/main/webapp/planner/advance_allocation.zul:47 -msgid "Apply changes and continue edition" -msgstr "Aplicar cambios e continuar a edición" - #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java:426 msgid "criterion names must be unique inside a criterion type" msgstr "o nome do criterio debe ser único dentro dun tipo de criterio" @@ -5828,48 +5898,48 @@ msgstr "" "recursos e os seus calendarios." #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:824 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:85 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:31 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:31 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:59 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:80 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:65 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:131 #: libreplan-webapp/src/main/webapp/workreports/_editWorkReportType.zul:54 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:189 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:264 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71 -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38 -#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:27 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:49 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:79 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:59 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:80 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:65 #: libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul:75 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:51 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:38 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 -#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:40 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:78 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:29 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 +#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:26 +#: libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul:40 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 #: libreplan-webapp/src/main/webapp/templates/templates.zul:85 #: libreplan-webapp/src/main/webapp/templates/_list.zul:26 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:28 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:86 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:91 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:95 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:116 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:54 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:197 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:272 +#: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:47 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:38 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:37 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:45 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:71 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:26 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:42 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:41 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:26 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:77 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:29 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:115 msgid "Code" msgstr "Código" @@ -5877,49 +5947,49 @@ msgstr "Código" msgid "Add stretch" msgstr "Engadir tramo" -#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:33 -msgid "Show resource assignments" -msgstr "Mostrar asignacións de recursos" - #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:70 msgid "Assignation type" msgstr "Tipo de asignación" +#: libreplan-webapp/src/main/webapp/planner/print_configuration.zul:33 +msgid "Show resource assignments" +msgstr "Mostrar asignacións de recursos" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:369 msgid "Calculate Workable Days" msgstr "Calcular días laborais" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:214 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:241 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:214 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" -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 #: libreplan-webapp/src/main/webapp/planner/montecarlo_function.zul:42 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:92 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:51 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:53 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:96 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:117 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54 msgid "Start date" msgstr "Data de inicio" -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:171 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:179 msgid "Update exception" msgstr "Actualizar excepción" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 +msgid "Budget" +msgstr "Presuposto" + #: libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java:253 msgid "Operation cannot be done" msgstr "Non se pode realizar a operación" -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:140 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:52 -msgid "Budget" -msgstr "Presuposto" - #: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java:44 msgid "May" msgstr "Maio" @@ -5932,27 +6002,27 @@ msgstr "Xa existe outro criterio co mesmo nome" msgid "Unit name" msgstr "Nome da unidade" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44 +#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 +#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 +msgid "Project code" +msgstr "Código de proxecto" + #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:32 #: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:57 msgid "Write" msgstr "Escribir" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderBandboxFinder.java:44 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/templates/_historicalAssignment.zul:35 -#: libreplan-webapp/src/main/webapp/subcontract/reportAdvances.zul:43 -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:48 -msgid "Project code" -msgstr "Código de proxecto" +#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:39 +msgid "Number of applications" +msgstr "Número de aplicacións" #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java:503 msgid "Assign element to queue automatically" msgstr "Asignar elemento á cola automáticamente" -#: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:39 -msgid "Number of applications" -msgstr "Número de aplicacións" - #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:82 msgid "" "Date which the task must start after (press enter in textbox to open " @@ -5961,7 +6031,7 @@ msgstr "" "Data despois da cal a tarefa debe empezar (presione enter no cadro de texto " "para abrir o calendario ou escriba a data directamente)" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:596 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:598 #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:43 msgid "Normal" msgstr "Normal" @@ -5981,7 +6051,7 @@ msgstr "Vista de proxecto" msgid "Task Code" msgstr "Código da tarefa" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:655 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:657 msgid "This label type already is assigned to the work report type." msgstr "Este tipo de etiqueta xa está asignado ao tipo de parte de traballo." @@ -5991,31 +6061,31 @@ msgstr "Este tipo de etiqueta xa está asignado ao tipo de parte de traballo." msgid "Probability %" msgstr "Probabilidade %" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:706 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:323 +#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:815 +#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 +msgid "Load" +msgstr "Carga" + #: libreplan-webapp/src/main/webapp/resources/_criterions.zul:27 #: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:28 msgid "New criterion" msgstr "Criterio novo" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:700 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:325 -#: libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadController.java:813 -#: libreplan-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul:49 -msgid "Load" -msgstr "Carga" - -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:682 -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java:684 #: libreplan-webapp/src/main/webapp/materials/materials.zul:81 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 #: libreplan-webapp/src/main/webapp/scenarios/_edition.zul:43 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:37 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:49 #: libreplan-webapp/src/main/webapp/templates/templates.zul:101 #: libreplan-webapp/src/main/webapp/templates/_list.zul:32 #: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:51 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:36 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:62 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:67 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:59 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:122 msgid "Description" msgstr "Descrición" @@ -6037,24 +6107,28 @@ msgstr "xa existe unha asignación para os criterios {0}" msgid "Project Templates" msgstr "Modelos de proxectos" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:344 msgid "Forward" msgstr "Adiante" -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469 -msgid "Invalid queue element" -msgstr "Elemento de cola inválido" - #: libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul:43 msgid "Number of finished applications" msgstr "Número de aplicacións finalizadas" +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:469 +msgid "Invalid queue element" +msgstr "Elemento de cola inválido" + #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:575 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:584 #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/ManualAllocationController.java:592 msgid "Unnasigned" msgstr "Non asignado" +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 +msgid "At least one HoursGroup is needed" +msgstr "É necesario alo menos un HoursGroup" + #: libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java:178 #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:63 #: libreplan-webapp/src/main/webapp/common/layout/login.zul:74 @@ -6062,10 +6136,6 @@ msgstr "Non asignado" msgid "User" msgstr "Usuario" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/criterionrequirements/AssignedCriterionRequirementController.java:405 -msgid "At least one HoursGroup is needed" -msgstr "É necesario alo menos un HoursGroup" - #: libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:71 msgid "Interacts with applications" msgstr "Interactúa con aplicacións" @@ -6082,14 +6152,14 @@ msgstr "A porcentaxe de duración debería estar entre 0 e 100" msgid "Multiple values per resource" msgstr "Múltiples valores por recurso" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:58 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:60 msgid "Split" msgstr "Dividir" -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java:106 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java:107 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java:100 msgid "please, select a project" msgstr "por favor, seleccione un proxecto" @@ -6097,16 +6167,16 @@ msgstr "por favor, seleccione un proxecto" msgid "Supported Chrome, Firefox, Safari and Epiphany browsers" msgstr "Compatible cos navegadores Chrome, Firefox, Safari e Epiphany" -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:41 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:33 #: libreplan-webapp/src/main/webapp/resources/worker/_localizations.zul:68 #: libreplan-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25 #: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:41 #: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:56 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:30 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:45 #: libreplan-webapp/src/main/webapp/orders/_edition.zul:96 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:51 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:30 msgid "Starting date" msgstr "Data de inicio" @@ -6123,56 +6193,56 @@ msgstr "Carga 100%" msgid "Function" msgstr "Función" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:745 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:364 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:768 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java:362 msgid "date in future" msgstr "data no futuro" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:855 -msgid "New project version" -msgstr "Nova versión de proxecto" - -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135 #: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:156 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:157 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:194 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:187 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul:64 #: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:137 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:164 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:135 msgid "Format" msgstr "Formato" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:364 -#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1234 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:870 +msgid "New project version" +msgstr "Nova versión de proxecto" + #: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java:77 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:366 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java:484 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1231 +#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:478 #: libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java:537 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 +#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 +#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:78 #: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:37 #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:104 -#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28 -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 -#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:44 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:37 -#: libreplan-webapp/src/main/webapp/materials/_editUnitType.zul:25 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:26 -#: libreplan-webapp/src/main/webapp/excetiondays/_editExceptionDayType.zul:26 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:42 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:37 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:47 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:41 +#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:35 #: libreplan-webapp/src/main/webapp/templates/_list.zul:48 +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:47 +#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:42 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:28 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:40 +#: libreplan-webapp/src/main/webapp/resources/criterions/_workers.zul:33 msgid "Edit" msgstr "Editar" -#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:81 +#: libreplan-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37 msgid "Init date" msgstr "Data de inicio" @@ -6184,7 +6254,7 @@ msgstr "Responsable" msgid "New password" msgstr "Novo contrasinal" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:354 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:253 msgid "percentage must be in range (0,100]" msgstr "a porcentaxe debe estar no rango (0,100]" @@ -6200,8 +6270,8 @@ msgstr "" "os códigos das asignacións de recursos a unha categoría de custo deben ser " "únicos dentro dun recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:161 #: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java:165 +#: libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java:161 msgid "XML" msgstr "XML" @@ -6213,8 +6283,8 @@ msgstr "" "CriterionType non válido, o criterionType solápase con outro " "criterionSatisfaction co mesmo criterionType" -#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61 #: libreplan-webapp/src/main/java/org/libreplan/ws/calendarexceptiontypes/impl/CalendarExceptionTypeColorConverter.java:85 +#: libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/ResourceEnumConverter.java:61 msgid "Unable to convert {0} value to {1} type" msgstr "Non se puido convertir o valor {0} ao tipo {1}" @@ -6223,21 +6293,21 @@ msgid "Tree {0} sucessfully flattened" msgstr "Árobre {0} aplanada satisfatoriamente" #: libreplan-webapp/src/main/webapp/materials/materials.zul:82 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 #: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:30 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:118 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:31 msgid "Unit price" msgstr "Prezo da unidade" +#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 +msgid "Communication date" +msgstr "Data de comunicación" + #: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:72 #: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:64 msgid "Project Code" msgstr "Código do proxecto" -#: libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul:46 -msgid "Communication date" -msgstr "Data de comunicación" - #: libreplan-webapp/src/main/webapp/planner/reassign.zul:30 msgid "Reassigning" msgstr "Reasignando" @@ -6255,44 +6325,44 @@ msgstr "Unidade de medida" msgid "Label Types List" msgstr "Lista de tipos de etiqueta" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/QualityFormBandboxFinder.java:51 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 -#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/LabelBandboxFinder.java:52 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java:44 +#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:42 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:64 #: libreplan-webapp/src/main/webapp/workreports/workReport.zul:127 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47 -#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:101 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27 -#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 -#: libreplan-webapp/src/main/webapp/advance/_editAdvanceTypes.zul:61 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:35 +#: libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:51 #: libreplan-webapp/src/main/webapp/costcategories/_editCostCategory.zul:79 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 -#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:25 -#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 -#: libreplan-webapp/src/main/webapp/templates/_advances.zul:36 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:33 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:83 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:123 #: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:165 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:133 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:174 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:95 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:136 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:95 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:136 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:103 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:144 +#: libreplan-webapp/src/main/webapp/templates/_list.zul:25 +#: libreplan-webapp/src/main/webapp/templates/_assignedQualityForms.zul:49 +#: libreplan-webapp/src/main/webapp/templates/_advances.zul:36 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:47 +#: libreplan-webapp/src/main/webapp/calendars/_edition.zul:109 +#: libreplan-webapp/src/main/webapp/resources/criterions/_edition.zul:44 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:27 +#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:28 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:47 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:153 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul:48 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul:42 msgid "Type" msgstr "Tipo" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:347 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java:348 msgid "{0} projects reassignation remaining" msgstr "quedan {0} proxectos por reasignar" @@ -6312,11 +6382,11 @@ msgstr "Novembro" msgid "Enable/Disable" msgstr "Habilitar/Deshabilitar" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1268 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1290 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1288 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1310 msgid "" -"Value is not valid, the value must be greater than the value of the previous " -"progress." +"Value is not valid, the value must be greater than the value of the previous" +" progress." msgstr "" "O valor non é válido, o valor debe ser maior có valor do progreso previo." @@ -6332,8 +6402,8 @@ msgstr " no directorio especificado." msgid "criterion satisfaction codes must be unique inside a resource" msgstr "o código do criterio debe ser único dentro dun recurso" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 #: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:865 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineCRUDController.java:578 msgid "no" msgstr "non" @@ -6341,13 +6411,13 @@ msgstr "non" msgid "missing code in a work report." msgstr "falta código nun parte de traballo." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java:29 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java:30 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementFilterEnum.java:36 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java:30 #: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskElementFilterEnum.java:34 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/TaskGroupFilterEnum.java:30 -#: libreplan-webapp/src/main/webapp/common/configuration.zul:105 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:118 msgid "Criterion" msgstr "Criterio" @@ -6355,17 +6425,17 @@ msgstr "Criterio" msgid "unl" msgstr "ili" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:292 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:305 msgid "Test LDAP connection" msgstr "Probar a conexión co LDAP" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:96 +#: libreplan-webapp/src/main/webapp/common/configuration.zul:109 msgid "Generate code for" msgstr "Xerar código para" +#: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:384 #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:468 -#: libreplan-webapp/src/main/java/org/libreplan/ws/labels/impl/LabelConverter.java:103 msgid "missing code in a label" msgstr "falta o código nunha etiqueta" @@ -6373,7 +6443,7 @@ msgstr "falta o código nunha etiqueta" msgid "Actual Cost Work Performed" msgstr "Custo de traballo realizado" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:177 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:174 msgid "Create project from Template" msgstr "Crear proxecto a partir de modelo" @@ -6395,62 +6465,62 @@ msgstr "Debe seleccionar un tipo de autorización" msgid "Must start after (days since beginning project)" msgstr "Debe empezar despois de (días desde o inicio do proxecto)" -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:854 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java:869 msgid "" "Confirm creating a new project version for this scenario and derived. Are " "you sure?" msgstr "" -"Confirmar a creación dunha nova versión do proxecto para este escenario e os " -"seus derivados. ¿Está seguro?" +"Confirmar a creación dunha nova versión do proxecto para este escenario e os" +" seus derivados. ¿Está seguro?" #: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java:156 -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29 -#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:72 #: libreplan-webapp/src/main/webapp/materials/materials.zul:45 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:59 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:66 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:80 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:122 #: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:163 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:84 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:125 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:84 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:125 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:73 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:92 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:133 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:84 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:29 +#: libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:30 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:35 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:166 msgid "Add" msgstr "Engadir" -#: libreplan-webapp/src/main/webapp/common/event_error.zul:43 #: libreplan-webapp/src/main/webapp/common/error.zul:48 +#: libreplan-webapp/src/main/webapp/common/event_error.zul:43 msgid "Stacktrace" msgstr "Stacktrace" #: libreplan-webapp/src/main/webapp/materials/materials.zul:48 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:43 #: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul:82 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:120 msgid "Unselect" msgstr "Deseleccionar" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:609 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:611 msgid "You should select the type of exception" msgstr "Debe seleccionar o tipo de excepción" #: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:93 -#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 -#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:31 -#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:46 +#: libreplan-webapp/src/main/webapp/orders/_projectDetails.zul:62 +#: libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul:52 +#: libreplan-webapp/src/main/webapp/orders/_edition.zul:101 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:31 msgid "Deadline" msgstr "data límite" @@ -6458,14 +6528,14 @@ msgstr "data límite" msgid "Tasks" msgstr "Tarefas" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 -msgid "Subcontracted Tasks" -msgstr "Tarefas subcontratadas" - #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:118 msgid "Filter by categories or materials" msgstr "Filtrar por categorías ou materiais" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:305 +msgid "Subcontracted Tasks" +msgstr "Tarefas subcontratadas" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:389 msgid "Amount work percentage should be between 0 and 100" msgstr "A porcentaxe de cantidade de traballo debe estar entre 0 y 100" @@ -6484,15 +6554,15 @@ msgstr "VAC" msgid "Label type" msgstr "Tipo de etiqueta" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 +msgid "Administration / Management" +msgstr "Administración / Xestión" + #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:156 #: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/AdvancedAllocationTabCreator.java:236 msgid "Advanced Allocation" msgstr "Asignación avanzada" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:316 -msgid "Administration / Management" -msgstr "Administración / Xestión" - #: libreplan-webapp/src/main/webapp/montecarlo/_montecarlo.zul:93 msgid "Number of iterations" msgstr "Número de iteracións" @@ -6519,8 +6589,8 @@ msgstr "código pai inconsistente." msgid "effort is not properly calculated based on clock" msgstr "o esforzo non está ben calculado baseándose no reloxo" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 #: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:63 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:33 msgid "Status" msgstr "Estado" @@ -6528,33 +6598,41 @@ msgstr "Estado" msgid "Resource load view" msgstr "Vista de carga de recursos" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 -#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82 -#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 -#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:84 -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 -#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 -#: libreplan-webapp/src/main/webapp/orders/_list.zul:34 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72 -#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 -#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 -msgid "Hours" -msgstr "Horas" - -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:733 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java:756 msgid "the date must be inside the visualization area" msgstr "a data debe estar dentro da área de visualización" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:816 +#: libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java:82 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java:70 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/components/EffortDurationPicker.java:62 +#: libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul:84 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:72 +#: libreplan-webapp/src/main/webapp/planner/stretches_function.zul:81 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_taskInformation.zul:34 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul:72 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul:54 +#: libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul:82 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:154 +#: libreplan-webapp/src/main/webapp/orders/_list.zul:34 +#: libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul:36 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul:35 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:37 +msgid "Hours" +msgstr "Horas" + #: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:56 msgid "Quality form type" msgstr "Tipo de formulario de calidade" +#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318 +msgid "{0} \"{1}\" deleted" +msgstr "{0} \"{1}\" borrado" + +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523 +msgid "date not specified." +msgstr "data non especificada." + #: libreplan-webapp/src/main/java/org/libreplan/ws/workreports/impl/WorkReportConverter.java:392 msgid "work report has not this label type assigned" msgstr "o parte de traballo non ten este tipo de etiqueta asignado" @@ -6563,28 +6641,20 @@ msgstr "o parte de traballo non ten este tipo de etiqueta asignado" msgid "Limiting assignment" msgstr "Asignación limitante" -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:523 -msgid "date not specified." -msgstr "data non especificada." - -#: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:318 -msgid "{0} \"{1}\" deleted" -msgstr "{0} \"{1}\" borrado" - #: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:364 msgid " hours" msgstr " horas" +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 +msgid "Limiting Resources Planning" +msgstr "Planificación de recursos limitantes" + #: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeModel.java:344 msgid "The name of the criterion is empty." msgstr "O nome do criterio está baleiro." -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:288 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:132 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java:145 -msgid "Limiting Resources Planning" -msgstr "Planificación de recursos limitantes" - #: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:69 msgid "New label" msgstr "Nova etiqueta" @@ -6593,22 +6663,22 @@ msgstr "Nova etiqueta" msgid "Worker ID cannot be empty" msgstr "NIF do traballador non especificado" -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352 -msgid "The start date cannot be null" -msgstr "A data de inicio non pode ser nula" - #: libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/Type.java:31 #: libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java:188 msgid "All project tasks" msgstr "Todas as tarefas do proxecto" -#: libreplan-webapp/src/main/webapp/common/configuration.zul:375 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java:352 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java:343 +msgid "The start date cannot be null" +msgstr "A data de inicio non pode ser nula" + +#: libreplan-webapp/src/main/webapp/common/configuration.zul:386 msgid "LDAP Roles (separated by ;)" msgstr "Roles do LDAP (separados por ;)" -#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 #: libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul:27 +#: libreplan-webapp/src/main/webapp/limitingresources/manualAllocation.zul:78 msgid "Allocation configuration" msgstr "Configuración de asignación" @@ -6625,8 +6695,8 @@ msgstr "Prezo de subcontratación" msgid "Resources per day are zero" msgstr "Hai cero recursos por día" -#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 #: libreplan-webapp/src/main/webapp/resources/worker/_edition.zul:32 +#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:31 msgid "Assigned criteria" msgstr "Criterios asignados" @@ -6634,14 +6704,14 @@ msgstr "Criterios asignados" msgid "Help on authentication (opens a new window)" msgstr "Axuda sobre a identificación (abre unha ventana nova)" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:778 -msgid "The length must be greater than 0, and not null." -msgstr "A lonxitude debe ser maior que cero e non nula." - #: libreplan-webapp/src/main/java/org/libreplan/web/common/EffortDurationBox.java:49 msgid "Not a valid effort duration" msgstr "Non é unha duración de esforzo válida" +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:780 +msgid "The length must be greater than 0, and not null." +msgstr "A lonxitude debe ser maior que cero e non nula." + #: libreplan-webapp/src/main/java/org/libreplan/web/exceptionDays/CalendarExceptionTypeCRUDController.java:199 msgid "Cannot remove the predefined Exception Day Type \"{0}\"" msgstr "Non se pode borrar o tipo de día de excepción predefinido \"{0}\"" @@ -6650,7 +6720,7 @@ msgstr "Non se pode borrar o tipo de día de excepción predefinido \"{0}\"" msgid "Base calendar type" msgstr "Tipo de calendario base" -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:613 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java:606 msgid "Could not save new calendar" msgstr "Non se puido gardar o calendario novo" @@ -6672,47 +6742,47 @@ msgstr "Non se puido atopar o criterio {0}" msgid "Apply filtering to tasks satisfying required criteria" msgstr "Aplicar filtrado ás tarefas que satisfán os criterios requeridos" -#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:345 +#: libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java:347 #: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:37 msgid "Task Scheduling Status In Project" msgstr "Estado de planificación de tarefas en proxecto" -#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:263 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:871 +#: libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java:162 #: libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java:356 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:868 #: libreplan-webapp/src/main/java/org/libreplan/web/common/BaseCRUDController.java:313 msgid "Confirm" msgstr "Confirmar" -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 -#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 -#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 -#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52 -#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 #: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:48 -#: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 #: libreplan-webapp/src/main/webapp/advance/_listAdvanceTypes.zul:33 #: libreplan-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul:40 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:57 +#: libreplan-webapp/src/main/webapp/materials/_listUnitTypes.zul:32 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:56 #: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:55 #: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:49 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:58 #: libreplan-webapp/src/main/webapp/users/_listUsers.zul:54 +#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:49 +#: libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul:55 +#: libreplan-webapp/src/main/webapp/calendars/_list.zul:35 +#: libreplan-webapp/src/main/webapp/resources/worker/_list.zul:45 +#: libreplan-webapp/src/main/webapp/resources/machine/_listMachines.zul:43 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:52 msgid "Create" msgstr "Crear" -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 -msgid "Permissions" -msgstr "Permisos" - #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1716 #: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1722 msgid "please, select a work report type" msgstr "por favor, seleccione un tipo de parte de traballo" +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:43 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:67 +msgid "Permissions" +msgstr "Permisos" + #: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:487 msgid "List of materials for category: {0}" msgstr "Lista de materiais para a categoría: {0}" @@ -6721,86 +6791,114 @@ msgstr "Lista de materiais para a categoría: {0}" msgid "Cancel edition" msgstr "Cancelar a edición" -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 #: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:32 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:31 msgid "Total price" msgstr "Prezo total" +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 +#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 +#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:346 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:984 +#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:990 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 +#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 +#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 +#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:888 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1208 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1455 +#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:453 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 +#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1229 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 +#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1247 +#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 +#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 +#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 +#: libreplan-webapp/src/main/webapp/materials/materials.zul:104 +#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 +#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 +#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 +#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 +#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 +#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105 +#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105 +#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143 +#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133 +#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 +#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113 +#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 +#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 +#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 +#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 +#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 +#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 +#: libreplan-webapp/src/main/webapp/templates/_list.zul:53 +#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 +#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 +#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 +#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118 +#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133 +#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45 +#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 +#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 +#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 +#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 +msgid "Delete" +msgstr "Borrar" + #: libreplan-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul:46 msgid "Labels without inheritance" msgstr "Etiquetas sen herdanza" -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java:344 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1214 -#: libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java:1226 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:886 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1207 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java:1454 -#: libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java:451 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeController.java:324 -#: libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java:821 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:271 -#: libreplan-webapp/src/main/java/org/libreplan/web/materials/MaterialsController.java:292 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:289 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java:457 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:143 -#: libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java:163 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java:1250 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java:388 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1193 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:201 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:333 -#: libreplan-webapp/src/main/java/org/libreplan/web/orders/AssignedTaskQualityFormsToOrderElementController.java:406 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java:648 -#: libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionController.java:408 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:983 -#: libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java:989 -#: libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java:264 -#: libreplan-webapp/src/main/webapp/workreports/workReport.zul:84 -#: libreplan-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul:43 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:70 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:118 -#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:133 -#: libreplan-webapp/src/main/webapp/resources/_criterions.zul:88 -#: libreplan-webapp/src/main/webapp/resources/criterions/_list.zul:45 -#: libreplan-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:52 -#: libreplan-webapp/src/main/webapp/resources/worker/_workRelationships.zul:46 -#: libreplan-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul:49 -#: libreplan-webapp/src/main/webapp/labels/_listLabelTypes.zul:42 -#: libreplan-webapp/src/main/webapp/labels/_editLabelType.zul:99 -#: libreplan-webapp/src/main/webapp/materials/materials.zul:104 -#: libreplan-webapp/src/main/webapp/qualityforms/_editQualityForm.zul:116 -#: libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul:52 -#: libreplan-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul:47 -#: libreplan-webapp/src/main/webapp/costcategories/_listCostCategories.zul:42 -#: libreplan-webapp/src/main/webapp/users/_editProfile.zul:68 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:109 -#: libreplan-webapp/src/main/webapp/users/_editUser.zul:139 -#: libreplan-webapp/src/main/webapp/users/_listProfiles.zul:40 -#: libreplan-webapp/src/main/webapp/users/_listUsers.zul:46 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul:79 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:91 -#: libreplan-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:212 -#: libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:102 -#: libreplan-webapp/src/main/webapp/orders/_assignmentsBox.zul:57 -#: libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul:67 -#: libreplan-webapp/src/main/webapp/templates/_list.zul:53 -#: libreplan-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:55 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:133 -#: libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul:175 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:102 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:143 -#: libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul:184 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:105 -#: libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul:146 -#: libreplan-webapp/src/main/webapp/reports/timeLineMaterialReport.zul:106 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:105 -#: libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul:146 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:113 -#: libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul:154 -#: libreplan-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:127 -msgid "Delete" -msgstr "Borrar" +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32 +msgid "RECEIVED" +msgstr "RECIBIDO" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:33 +msgid "PENDING" +msgstr "PENDENTE" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:34 +msgid "ORDERED" +msgstr "SOLICITADO" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:35 +msgid "PROCESSING" +msgstr "PROCESANDO" + +#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:36 +msgid "CANCELED" +msgstr "CANCELADO" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34 +msgid "heading" +msgstr "cabeceira" + +#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34 +msgid "line" +msgstr "liña" #: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java:31 msgid "Number of assigned hours" @@ -6814,13 +6912,25 @@ msgstr "Número de horas calculadas por reloxo" msgid "Number of assigned hours and the time" msgstr "Número de horas asignadas e hora" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34 -msgid "heading" -msgstr "cabeceira" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109 +msgid "Hours cost type cannot be empty or null" +msgstr "O tipo de coste de horas non pode ser baleiro ou nulo" -#: libreplan-business/src/main/java/org/libreplan/business/workreports/entities/PositionInWorkReportEnum.java:34 -msgid "line" -msgstr "liña" +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118 +msgid "Init date cannot be empty or null" +msgstr "A data de inicio non pode ser baleira ou nula" + +#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123 +msgid "End date cannot be empty or null" +msgstr "A data de fin non pode ser baleira ou nula" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29 +msgid "by percentage" +msgstr "por porcentaxe" + +#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29 +msgid "by items" +msgstr "por ítems" #: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:34 msgid "Use browser language configuration" @@ -6846,37 +6956,155 @@ msgstr "Ruso" msgid "Portuguese" msgstr "Portugués" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 -msgid "unlimited" -msgstr "ilimitado" +#: libreplan-business/src/main/java/org/libreplan/business/settings/entities/Language.java:40 +msgid "Italian" +msgstr "Italiano" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 -msgid "Monday" -msgstr "Luns" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:410 +msgid "Stretches must sum 100%" +msgstr "Os tramos deben sumar 100%" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 -msgid "Tuesday" -msgstr "Martes" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76 +msgid "Flat" +msgstr "Plano" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 -msgid "Wednesday" -msgstr "Mércores" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78 +msgid "Stretches" +msgstr "Tramos" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 -msgid "Thursday" -msgstr "Xoves" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 +msgid "Interporlation" +msgstr "Interpolación" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 -msgid "Friday" -msgstr "Venres" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 +msgid "Sigmoid" +msgstr "Sigmoide" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 -msgid "Saturday" -msgstr "Sábado" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30 +msgid "Pending" +msgstr "Pendente" -#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101 -msgid "Sunday" -msgstr "Domingo" +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 +msgid "Failed sent" +msgstr "Envío fallido" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:33 +msgid "Success sent" +msgstr "Envío exitoso" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:95 +msgid "There are no days available due to not satisfying the criteria." +msgstr "Non hai días dispoñibles debido a que non se satisfacen os criterios." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96 +msgid "" +"Another possibility is that the resources don't have days available due to " +"their calendars." +msgstr "" +"Outra posibilidade é que os recursos non teñan días dispoñibles debido aos " +"seus calendarios." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:102 +msgid "" +"There are no days available in the days marked available by the task " +"calendar." +msgstr "" +"Non hai días dispoñibles nos días marcados como dispoñibles polo calendario " +"da tarefa." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103 +msgid "Maybe the criteria are not satisfied in those days." +msgstr "Pode que os criterios non se satisfagan neses días." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 +msgid "" +"The resource's calendar has no available days starting from the start of the" +" task." +msgstr "" +"O calendario do recurso non ten días dispoñibles comezando dende o principio" +" da tarefa." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 +msgid "" +"There are no days available at resource's calendar in the days marked " +"available by the task's calendar." +msgstr "" +"Non hai días dispoñibles no calendario do recurso nos días marcados como " +"dispoñibles polo clanedario da tarefa." + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28 +msgid "Finished" +msgstr "Finalizado" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29 +msgid "In progress" +msgstr "En progreso" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31 +msgid "Blocked" +msgstr "Bloqueado" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:29 +msgid "as soon as possible" +msgstr "tan pronto como sexa posible" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:41 +msgid "start not earlier than" +msgstr "empezar non antes de" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:53 +msgid "start in fixed date" +msgstr "comezar en data fixa" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:65 +msgid "as late as possible" +msgstr "tan tarde como sexa posible" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:77 +msgid "finish not later than" +msgstr "acabar non despois de" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java:53 +msgid "Hour should be a value between 0 and 23" +msgstr "A hora debería ter un valor entre 0 e 23" + +#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java:170 +msgid "A queue dependency has to have an origin different from destiny" +msgstr "" +"Unha dependencia da cola ten que ter unha orixe diferente do seu destino" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33 +msgid "Read authorization" +msgstr "Autorización de lectura" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34 +msgid "Write authorization" +msgstr "Autorización de escritura" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:34 +msgid "Web service reader" +msgstr "Lector do servizo web" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35 +msgid "Web service writer" +msgstr "Escritor do servizo web" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:36 +msgid "All projects read allowed" +msgstr "Permiso de lectura para todos os proxectos" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37 +msgid "All projects edition allowed" +msgstr "Permiso de edición para todos os proxectos" + +#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:38 +msgid "Project creation allowed" +msgstr "Permiso de creación de proxectos" + +#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:122 +msgid "Line" +msgstr "Liña" #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionTypeColor.java:31 msgid "red (default)" @@ -6914,6 +7142,38 @@ msgstr "laranxa" msgid "purple" msgstr "púrpura" +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/Capacity.java:172 +msgid "unlimited" +msgstr "ilimitado" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 +msgid "Monday" +msgstr "Luns" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 +msgid "Tuesday" +msgstr "Martes" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:99 +msgid "Wednesday" +msgstr "Mércores" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 +msgid "Thursday" +msgstr "Xoves" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 +msgid "Friday" +msgstr "Venres" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:100 +msgid "Saturday" +msgstr "Sábado" + +#: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarData.java:101 +msgid "Sunday" +msgstr "Domingo" + #: libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarExceptionType.java:139 msgid "Yes" msgstr "Si" @@ -6922,6 +7182,10 @@ msgstr "Si" msgid "No" msgstr "Non" +#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207 +msgid "[generic all machines]" +msgstr "[xenérico todas as máquinas]" + #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java:35 msgid "STRATEGIC RESOURCE" msgstr "RECURSO ESTRATÉXICO" @@ -6938,10 +7202,6 @@ msgstr "CATEGORÍA" msgid "SKILL" msgstr "HABILIDADE" -#: libreplan-business/src/main/java/org/libreplan/business/resources/entities/Criterion.java:207 -msgid "[generic all machines]" -msgstr "[xenérico todas as máquinas]" - #: libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceEnum.java:32 msgid "WORKER" msgstr "TRABALLADOR" @@ -6950,136 +7210,6 @@ msgstr "TRABALLADOR" msgid "MACHINE" msgstr "MÁQUINA" -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:32 -msgid "RECEIVED" -msgstr "RECIBIDO" - -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:33 -msgid "PENDING" -msgstr "PENDENTE" - -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:34 -msgid "ORDERED" -msgstr "SOLICITADO" - -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:35 -msgid "PROCESSING" -msgstr "PROCESANDO" - -#: libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialStatusEnum.java:36 -msgid "CANCELED" -msgstr "CANCELADO" - -#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29 -msgid "by percentage" -msgstr "por porcentaxe" - -#: libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityFormType.java:29 -msgid "by items" -msgstr "por ítems" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:109 -msgid "Hours cost type cannot be empty or null" -msgstr "O tipo de coste de horas non pode ser baleiro ou nulo" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:118 -msgid "Init date cannot be empty or null" -msgstr "A data de inicio non pode ser baleira ou nula" - -#: libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java:123 -msgid "End date cannot be empty or null" -msgstr "A data de fin non pode ser baleira ou nula" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:34 -msgid "Web service reader" -msgstr "Lector do servizo web" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:35 -msgid "Web service writer" -msgstr "Escritor do servizo web" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:36 -msgid "All projects read allowed" -msgstr "Permiso de lectura para todos os proxectos" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:37 -msgid "All projects edition allowed" -msgstr "Permiso de edición para todos os proxectos" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java:38 -msgid "Project creation allowed" -msgstr "Permiso de creación de proxectos" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:33 -msgid "Read authorization" -msgstr "Autorización de lectura" - -#: libreplan-business/src/main/java/org/libreplan/business/users/entities/OrderAuthorizationType.java:34 -msgid "Write authorization" -msgstr "Autorización de escritura" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java:260 -msgid "workHours should be greater or equals to 0" -msgstr "As horas de traballo deberían ser maiores ou igual a 0" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java:272 -msgid "" -"\"workHours\" value is not valid, taking into account the current list of " -"HoursGroup" -msgstr "" -"O valor das horas de traballo non é válido, tendo en conta a lista actual de " -"grupos de horas" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 -msgid "" -"Some ancestor has the same label assigned, so this element is already " -"inheriting this label" -msgstr "" -"Algún ancestro ten a misma etiqueta asignada, polo que este elemento xa está " -"herdando esa etiqueta" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 -msgid "Cannot spread two progress in the same task" -msgstr "Non poden propagar dous progresos na mesma tarefa" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 -msgid "Duplicate Progress Assignment For Task" -msgstr "Asignación de progreso duplicada para a tarefa" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 -msgid "Quality form already exists" -msgstr "O formulario de calidade xa existe" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:180 -msgid "Working hours shouldn't be negative" -msgstr "As horas de traballo non deberían ser negativas" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:209 -msgid "Total percentage should be less than 100%" -msgstr "A porcentaxe total debería ser menor do 100%" - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:257 -msgid "" -"The criterion can not be assigned to this hoursGroup because its resource " -"type is diferent" -msgstr "" -"O criterio non se pode asignar a este grupo de horas porque o seu tipo de " -"recurso é diferente." - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:261 -msgid "" -"The criterion can not be assigned to this hoursGroup because it already " -"exist into the hoursGroup" -msgstr "" -"O criterio non se pode asignar a este grupo de horas porque xa existe no " -"grupo de horas." - -#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539 -msgid "The criterion already exist into other task" -msgstr "O criterio xa existe noutra tarefa" - #: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderStatusEnum.java:33 msgid "OFFERED" msgstr "OFERTADO" @@ -7140,14 +7270,67 @@ msgstr "P" msgid "U" msgstr "S" -#: libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderLineTemplate.java:122 -msgid "Line" -msgstr "Liña" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:618 +msgid "" +"Some ancestor has the same label assigned, so this element is already " +"inheriting this label" +msgstr "" +"Algún ancestro ten a misma etiqueta asignada, polo que este elemento xa está" +" herdando esa etiqueta" -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:90 -#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:131 -msgid "You can not modifiy this entity sequence, it is already in use" -msgstr "Non pode modificar esta secuencia de entidade, xa está en uso" +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:717 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java:963 +msgid "Cannot spread two progress in the same task" +msgstr "Non poden propagar dous progresos na mesma tarefa" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:741 +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:767 +msgid "Duplicate Progress Assignment For Task" +msgstr "Asignación de progreso duplicada para a tarefa" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java:1094 +msgid "Quality form already exists" +msgstr "O formulario de calidade xa existe" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java:260 +msgid "workHours should be greater or equals to 0" +msgstr "As horas de traballo deberían ser maiores ou igual a 0" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java:272 +msgid "" +"\"workHours\" value is not valid, taking into account the current list of " +"HoursGroup" +msgstr "" +"O valor das horas de traballo non é válido, tendo en conta a lista actual de" +" grupos de horas" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:180 +msgid "Working hours shouldn't be negative" +msgstr "As horas de traballo non deberían ser negativas" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:209 +msgid "Total percentage should be less than 100%" +msgstr "A porcentaxe total debería ser menor do 100%" + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:257 +msgid "" +"The criterion can not be assigned to this hoursGroup because its resource " +"type is diferent" +msgstr "" +"O criterio non se pode asignar a este grupo de horas porque o seu tipo de " +"recurso é diferente." + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java:261 +msgid "" +"The criterion can not be assigned to this hoursGroup because it already " +"exist into the hoursGroup" +msgstr "" +"O criterio non se pode asignar a este grupo de horas porque xa existe no " +"grupo de horas." + +#: libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java:539 +msgid "The criterion already exist into other task" +msgstr "O criterio xa existe noutra tarefa" #: libreplan-business/src/main/java/org/libreplan/business/common/entities/ProgressType.java:36 msgid "Spreading progress" @@ -7165,120 +7348,11 @@ msgstr "Progreso coas tarefas no camiño crítico por horas" msgid "Progress with critical path tasks by duration" msgstr "Progreso coas tarefas do camiño crítico por duración" +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:90 +#: libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java:131 +msgid "You can not modifiy this entity sequence, it is already in use" +msgstr "Non pode modificar esta secuencia de entidade, xa está en uso" + #: libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java:82 msgid "You can not remove this entity sequence, it is already in use" msgstr "Non pode borrar esta secuencia de entidade, xa está en uso" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:30 -msgid "Pending" -msgstr "Pendente" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:32 -msgid "Failed sent" -msgstr "Envío fallido" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java:33 -msgid "Success sent" -msgstr "Envío exitoso" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:76 -msgid "Flat" -msgstr "Plano" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:78 -msgid "Stretches" -msgstr "Tramos" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:79 -msgid "Interporlation" -msgstr "Interpolación" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/AssignmentFunction.java:80 -msgid "Sigmoid" -msgstr "Sigmoide" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:95 -msgid "There are no days available due to not satisfying the criteria." -msgstr "Non hai días dispoñibles debido a que non se satisfacen os criterios." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:96 -msgid "" -"Another possibility is that the resources don't have days available due to " -"their calendars." -msgstr "" -"Outra posibilidade é que os recursos non teñan días dispoñibles debido aos " -"seus calendarios." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:102 -msgid "" -"There are no days available in the days marked available by the task " -"calendar." -msgstr "" -"Non hai días dispoñibles nos días marcados como dispoñibles polo calendario " -"da tarefa." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:103 -msgid "Maybe the criteria are not satisfied in those days." -msgstr "Pode que os criterios non se satisfagan neses días." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:170 -msgid "" -"The resource's calendar has no available days starting from the start of the " -"task." -msgstr "" -"O calendario do recurso non ten días dispoñibles comezando dende o principio " -"da tarefa." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java:175 -msgid "" -"There are no days available at resource's calendar in the days marked " -"available by the task's calendar." -msgstr "" -"Non hai días dispoñibles no calendario do recurso nos días marcados como " -"dispoñibles polo clanedario da tarefa." - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:28 -msgid "Finished" -msgstr "Finalizado" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:29 -msgid "In progress" -msgstr "En progreso" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskStatusEnum.java:31 -msgid "Blocked" -msgstr "Bloqueado" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:29 -msgid "as soon as possible" -msgstr "tan pronto como sexa posible" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:41 -msgid "start not earlier than" -msgstr "empezar non antes de" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:53 -msgid "start in fixed date" -msgstr "comezar en data fixa" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:65 -msgid "as late as possible" -msgstr "tan tarde como sexa posible" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/PositionConstraintType.java:77 -msgid "finish not later than" -msgstr "acabar non despois de" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java:416 -msgid "Stretches must sum 100%" -msgstr "Os tramos deben sumar 100%" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java:53 -msgid "Hour should be a value between 0 and 23" -msgstr "A hora debería ter un valor entre 0 e 23" - -#: libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/LimitingResourceQueueDependency.java:170 -msgid "A queue dependency has to have an origin different from destiny" -msgstr "" -"Unha dependencia da cola ten que ter unha orixe diferente do seu destino"